Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow streams on index table #6827

Merged
merged 1 commit into from
Jul 18, 2024
Merged

Allow streams on index table #6827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions ydb/core/protos/flat_scheme_op.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,10 +920,6 @@ message TCreateCdcStream {
optional TCdcStreamDescription StreamDescription = 2;
optional uint64 RetentionPeriodSeconds = 3 [default = 86400]; // 1d by default
optional uint32 TopicPartitions = 4;
oneof IndexMode {
google.protobuf.Empty AllIndexes = 5; // Create topic per each index
string IndexName = 6;
}
}

message TAlterCdcStream {
Expand Down Expand Up @@ -1650,7 +1646,6 @@ message TIndexBuildControl {

message TLockConfig {
optional string Name = 1;
optional bool AllowIndexImplLock = 2;
}

message TLockGuard {
Expand Down
35 changes: 22 additions & 13 deletions ydb/core/tx/schemeshard/schemeshard__operation_alter_cdc_stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,12 @@ class TAlterCdcStream: public TSubOperation {
.NotDeleted()
.IsTable()
.NotAsyncReplicaTable()
.IsCommonSensePath()
.NotUnderOperation();

if (checks && !tablePath.IsInsideTableIndexPath()) {
checks.IsCommonSensePath();
}

if (!checks) {
result->SetError(checks.GetStatus(), checks.GetError());
return result;
Expand Down Expand Up @@ -370,10 +373,13 @@ class TAlterCdcStreamAtTable: public TSubOperation {
.NotDeleted()
.IsTable()
.NotAsyncReplicaTable()
.IsCommonSensePath()
.NotUnderDeleting()
.NotUnderOperation();

if (checks && !tablePath.IsInsideTableIndexPath()) {
checks.IsCommonSensePath();
}

if (!checks) {
result->SetError(checks.GetStatus(), checks.GetError());
return result;
Expand Down Expand Up @@ -476,10 +482,10 @@ class TAlterCdcStreamAtTable: public TSubOperation {
} // anonymous

std::variant<TStreamPaths, ISubOperation::TPtr> DoAlterStreamPathChecks(
const TOperationId& opId,
const TPath& workingDirPath,
const TString& tableName,
const TString& streamName)
const TOperationId& opId,
const TPath& workingDirPath,
const TString& tableName,
const TString& streamName)
{
const auto tablePath = workingDirPath.Child(tableName);
{
Expand All @@ -492,9 +498,12 @@ std::variant<TStreamPaths, ISubOperation::TPtr> DoAlterStreamPathChecks(
.NotDeleted()
.IsTable()
.NotAsyncReplicaTable()
.IsCommonSensePath()
.NotUnderOperation();

if (checks && !tablePath.IsInsideTableIndexPath()) {
checks.IsCommonSensePath();
}

if (!checks) {
return CreateReject(opId, checks.GetStatus(), checks.GetError());
}
Expand All @@ -521,11 +530,11 @@ std::variant<TStreamPaths, ISubOperation::TPtr> DoAlterStreamPathChecks(
}

void DoAlterStream(
const NKikimrSchemeOp::TAlterCdcStream& op,
const TOperationId& opId,
const TPath& workingDirPath,
const TPath& tablePath,
TVector<ISubOperation::TPtr>& result)
TVector<ISubOperation::TPtr>& result,
const NKikimrSchemeOp::TAlterCdcStream& op,
const TOperationId& opId,
const TPath& workingDirPath,
const TPath& tablePath)
{
{
auto outTx = TransactionTemplate(tablePath.PathString(), NKikimrSchemeOp::EOperationType::ESchemeOpAlterCdcStreamImpl);
Expand Down Expand Up @@ -601,7 +610,7 @@ TVector<ISubOperation::TPtr> CreateAlterCdcStream(TOperationId opId, const TTxTr

TVector<ISubOperation::TPtr> result;

DoAlterStream(op, opId, workingDirPath, tablePath, result);
DoAlterStream(result, op, opId, workingDirPath, tablePath);

if (op.HasGetReady()) {
auto outTx = TransactionTemplate(workingDirPath.PathString(), NKikimrSchemeOp::EOperationType::ESchemeOpDropLock);
Expand Down
6 changes: 3 additions & 3 deletions ydb/core/tx/schemeshard/schemeshard__operation_alter_cdc_stream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "schemeshard__operation_create_cdc_stream.h" // for TStreamPaths
#include "schemeshard__operation_common.h"
#include "schemeshard__operation_create_cdc_stream.h" // for TStreamPaths
#include "schemeshard__operation_part.h"
#include "schemeshard_impl.h"

Expand All @@ -17,10 +17,10 @@ std::variant<TStreamPaths, ISubOperation::TPtr> DoAlterStreamPathChecks(
const TString& streamName);

void DoAlterStream(
TVector<ISubOperation::TPtr>& result,
const NKikimrSchemeOp::TAlterCdcStream& op,
const TOperationId& opId,
const TPath& workingDirPath,
const TPath& tablePath,
TVector<ISubOperation::TPtr>& result);
const TPath& tablePath);

} // namespace NKikimr::NSchemesShard::NCdc
7 changes: 3 additions & 4 deletions ydb/core/tx/schemeshard/schemeshard__operation_alter_continuous_backup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#include "schemeshard__operation_part.h"
#include "schemeshard__operation_alter_cdc_stream.h"
#include "schemeshard__operation_common.h"
#include "schemeshard__operation_part.h"
#include "schemeshard_impl.h"

#include "schemeshard__operation_alter_cdc_stream.h"

#include <ydb/core/tx/schemeshard/backup/constants.h>

#include <ydb/core/engine/mkql_proto.h>
Expand Down Expand Up @@ -111,7 +110,7 @@ TVector<ISubOperation::TPtr> CreateAlterContinuousBackup(TOperationId opId, cons

TVector<ISubOperation::TPtr> result;

NCdc::DoAlterStream(alterCdcStreamOp, opId, workingDirPath, tablePath, result);
NCdc::DoAlterStream(result, alterCdcStreamOp, opId, workingDirPath, tablePath);

if (cbOp.GetActionCase() == NKikimrSchemeOp::TAlterContinuousBackup::kTakeIncrementalBackup) {
DoCreateIncBackupTable(opId, backupTablePath, schema, result);
Expand Down
Loading
Loading