Skip to content

Support DDL in QueryService for TIER & TIERING_RULE objects #846

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

Merged
UgnineSirdis merged 1 commit into from
Jan 4, 2024
Merged

Support DDL in QueryService for TIER & TIERING_RULE objects #846

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
12 changes: 0 additions & 12 deletions ydb/core/tx/tiering/rule/manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,4 @@ NMetadata::NModifications::TOperationParsingResult TTieringRulesManager::DoBuild
return result;
}

NMetadata::NModifications::IOperationsManager::TYqlConclusionStatus TTieringRulesManager::DoPrepare(NKqpProto::TKqpSchemeOperation& /*schemeOperation*/, const NYql::TObjectSettingsImpl& /*settings*/,
const NMetadata::IClassBehaviour::TPtr& /*manager*/, NMetadata::NModifications::IOperationsManager::TInternalModificationContext& /*context*/) const {
return NMetadata::NModifications::IOperationsManager::TYqlConclusionStatus::Fail(
"Prepare operations for TIERING_RULE objects are not supported");
}

NThreading::TFuture<NMetadata::NModifications::IOperationsManager::TYqlConclusionStatus> TTieringRulesManager::ExecutePrepared(const NKqpProto::TKqpSchemeOperation& /*schemeOperation*/,
const ui32 /*nodeId*/, const NMetadata::IClassBehaviour::TPtr& /*manager*/, const IOperationsManager::TExternalModificationContext& /*context*/) const {
return NThreading::MakeFuture(NMetadata::NModifications::IOperationsManager::TYqlConclusionStatus::Fail(
"Execution of prepare operations for TIERING_RULE objects is not supported"));
}

}
6 changes: 0 additions & 6 deletions ydb/core/tx/tiering/rule/manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ class TTieringRulesManager: public NMetadata::NModifications::TGenericOperations

virtual NMetadata::NModifications::TOperationParsingResult DoBuildPatchFromSettings(const NYql::TObjectSettingsImpl& settings,
TInternalModificationContext& context) const override;

virtual IOperationsManager::TYqlConclusionStatus DoPrepare(NKqpProto::TKqpSchemeOperation& schemeOperation, const NYql::TObjectSettingsImpl& settings,
const NMetadata::IClassBehaviour::TPtr& manager, IOperationsManager::TInternalModificationContext& context) const override;

virtual NThreading::TFuture<IOperationsManager::TYqlConclusionStatus> ExecutePrepared(const NKqpProto::TKqpSchemeOperation& schemeOperation,
const ui32 nodeId, const NMetadata::IClassBehaviour::TPtr& manager, const IOperationsManager::TExternalModificationContext& context) const override;
};

}
12 changes: 0 additions & 12 deletions ydb/core/tx/tiering/tier/manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,4 @@ void TTiersManager::DoPrepareObjectsBeforeModification(std::vector<TTierConfig>&
TActivationContext::Register(new TTierPreparationActor(std::move(patchedObjects), controller, context));
}

NMetadata::NModifications::IOperationsManager::TYqlConclusionStatus TTiersManager::DoPrepare(NKqpProto::TKqpSchemeOperation& /*schemeOperation*/, const NYql::TObjectSettingsImpl& /*settings*/,
const NMetadata::IClassBehaviour::TPtr& /*manager*/, NMetadata::NModifications::IOperationsManager::TInternalModificationContext& /*context*/) const {
return NMetadata::NModifications::IOperationsManager::TYqlConclusionStatus::Fail(
"Prepare operations for TIER objects are not supported");
}

NThreading::TFuture<NMetadata::NModifications::IOperationsManager::TYqlConclusionStatus> TTiersManager::ExecutePrepared(const NKqpProto::TKqpSchemeOperation& /*schemeOperation*/,
const ui32 /*nodeId*/, const NMetadata::IClassBehaviour::TPtr& /*manager*/, const IOperationsManager::TExternalModificationContext& /*context*/) const {
return NThreading::MakeFuture(NMetadata::NModifications::IOperationsManager::TYqlConclusionStatus::Fail(
"Execution of prepare operations for TIER objects is not supported"));
}

}
6 changes: 0 additions & 6 deletions ydb/core/tx/tiering/tier/manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ class TTiersManager: public NMetadata::NModifications::TGenericOperationsManager

virtual NMetadata::NModifications::TOperationParsingResult DoBuildPatchFromSettings(const NYql::TObjectSettingsImpl& settings,
TInternalModificationContext& context) const override;

virtual IOperationsManager::TYqlConclusionStatus DoPrepare(NKqpProto::TKqpSchemeOperation& schemeOperation, const NYql::TObjectSettingsImpl& settings,
const NMetadata::IClassBehaviour::TPtr& manager, IOperationsManager::TInternalModificationContext& context) const override;

virtual NThreading::TFuture<IOperationsManager::TYqlConclusionStatus> ExecutePrepared(const NKqpProto::TKqpSchemeOperation& schemeOperation,
const ui32 nodeId, const NMetadata::IClassBehaviour::TPtr& manager, const IOperationsManager::TExternalModificationContext& context) const override;
public:
};

Expand Down
21 changes: 18 additions & 3 deletions ydb/core/tx/tiering/ut/ut_tiers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,19 +395,23 @@ Y_UNIT_TEST_SUITE(ColumnShardTiers) {
}
}

Y_UNIT_TEST(DSConfigs) {
void DSConfigsImpl(bool useQueryService) {
TPortManager pm;

ui32 grpcPort = pm.GetPort();
ui32 msgbPort = pm.GetPort();

NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);

Tests::TServerSettings serverSettings(msgbPort);
serverSettings.Port = msgbPort;
serverSettings.GrpcPort = grpcPort;
serverSettings.SetDomainName("Root")
.SetUseRealThreads(false)
.SetEnableMetadataProvider(true)
.SetForceColumnTablesCompositeMarks(true);
.SetForceColumnTablesCompositeMarks(true)
.SetAppConfig(appConfig);

Tests::TServer::TPtr server = new Tests::TServer(serverSettings);
server->EnableGRpc(grpcPort);
Expand All @@ -418,6 +422,8 @@ Y_UNIT_TEST_SUITE(ColumnShardTiers) {
auto sender = runtime.AllocateEdgeActor();
server->SetupRootStoragePools(sender);
TLocalHelper lHelper(*server);
lHelper.SetUseQueryService(useQueryService);

lHelper.CreateTestOlapTable("olapTable");

runtime.SetLogPriority(NKikimrServices::TX_DATASHARD, NLog::PRI_NOTICE);
Expand All @@ -436,7 +442,7 @@ Y_UNIT_TEST_SUITE(ColumnShardTiers) {
}

lHelper.StartSchemaRequest("CREATE OBJECT tier2 (TYPE TIER) WITH tierConfig = `" + GetConfigProtoWithName("abc2") + "`");
lHelper.StartSchemaRequest("CREATE OBJECT tiering1 (TYPE TIERING_RULE) "
lHelper.StartSchemaRequest("CREATE OBJECT IF NOT EXISTS tiering1 (TYPE TIERING_RULE) "
"WITH (defaultColumn = timestamp, description = `" + ConfigTiering1Str + "`)");
lHelper.StartSchemaRequest("CREATE OBJECT tiering2 (TYPE TIERING_RULE) "
"WITH (defaultColumn = timestamp, description = `" + ConfigTiering2Str + "` )", true, false);
Expand Down Expand Up @@ -473,6 +479,15 @@ Y_UNIT_TEST_SUITE(ColumnShardTiers) {
//runtime.SetLogPriority(NKikimrServices::TX_PROXY, NLog::PRI_TRACE);
//runtime.SetLogPriority(NKikimrServices::KQP_YQL, NLog::PRI_TRACE);
}

Y_UNIT_TEST(DSConfigs) {
DSConfigsImpl(false);
}

Y_UNIT_TEST(DSConfigsWithQueryServiceDdl) {
DSConfigsImpl(true);
}

//#define S3_TEST_USAGE
#ifdef S3_TEST_USAGE
const TString TierConfigProtoStr =
Expand Down
12 changes: 0 additions & 12 deletions ydb/services/ext_index/metadata/manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,4 @@ NModifications::TOperationParsingResult TManager::DoBuildPatchFromSettings(const
}
}

NMetadata::NModifications::IOperationsManager::TYqlConclusionStatus TManager::DoPrepare(NKqpProto::TKqpSchemeOperation& /*schemeOperation*/, const NYql::TObjectSettingsImpl& /*settings*/,
const NMetadata::IClassBehaviour::TPtr& /*manager*/, NMetadata::NModifications::IOperationsManager::TInternalModificationContext& /*context*/) const {
return NMetadata::NModifications::IOperationsManager::TYqlConclusionStatus::Fail(
"Prepare operations for CS_EXT_INDEX objects are not supported");
}

NThreading::TFuture<NMetadata::NModifications::IOperationsManager::TYqlConclusionStatus> TManager::ExecutePrepared(const NKqpProto::TKqpSchemeOperation& /*schemeOperation*/,
const ui32 /*nodeId*/, const NMetadata::IClassBehaviour::TPtr& /*manager*/, const IOperationsManager::TExternalModificationContext& /*context*/) const {
return NThreading::MakeFuture(NMetadata::NModifications::IOperationsManager::TYqlConclusionStatus::Fail(
"Execution of prepare operations for CS_EXT_INDEX objects is not supported"));
}

}
6 changes: 0 additions & 6 deletions ydb/services/ext_index/metadata/manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@ class TManager: public NModifications::TGenericOperationsManager<TObject> {
virtual NModifications::TOperationParsingResult DoBuildPatchFromSettings(
const NYql::TObjectSettingsImpl& settings, TInternalModificationContext& context) const override;

virtual IOperationsManager::TYqlConclusionStatus DoPrepare(NKqpProto::TKqpSchemeOperation& schemeOperation, const NYql::TObjectSettingsImpl& settings,
const NMetadata::IClassBehaviour::TPtr& manager, IOperationsManager::TInternalModificationContext& context) const override;

virtual NThreading::TFuture<IOperationsManager::TYqlConclusionStatus> ExecutePrepared(const NKqpProto::TKqpSchemeOperation& schemeOperation,
const ui32 nodeId, const NMetadata::IClassBehaviour::TPtr& manager, const IOperationsManager::TExternalModificationContext& context) const override;

public:
};

Expand Down
12 changes: 0 additions & 12 deletions ydb/services/metadata/initializer/manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,4 @@ NModifications::TOperationParsingResult TManager::DoBuildPatchFromSettings(
return result;
}

NMetadata::NModifications::IOperationsManager::TYqlConclusionStatus TManager::DoPrepare(NKqpProto::TKqpSchemeOperation& /*schemeOperation*/, const NYql::TObjectSettingsImpl& /*settings*/,
const NMetadata::IClassBehaviour::TPtr& /*manager*/, NMetadata::NModifications::IOperationsManager::TInternalModificationContext& /*context*/) const {
return NMetadata::NModifications::IOperationsManager::TYqlConclusionStatus::Fail(
"Prepare operations for INITIALIZATION objects are not supported");
}

NThreading::TFuture<NMetadata::NModifications::IOperationsManager::TYqlConclusionStatus> TManager::ExecutePrepared(const NKqpProto::TKqpSchemeOperation& /*schemeOperation*/,
const ui32 /*nodeId*/, const NMetadata::IClassBehaviour::TPtr& /*manager*/, const IOperationsManager::TExternalModificationContext& /*context*/) const {
return NThreading::MakeFuture(NMetadata::NModifications::IOperationsManager::TYqlConclusionStatus::Fail(
"Execution of prepare operations for INITIALIZATION objects is not supported"));
}

}
6 changes: 0 additions & 6 deletions ydb/services/metadata/initializer/manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@ class TManager: public NModifications::TGenericOperationsManager<TDBInitializati
virtual NModifications::TOperationParsingResult DoBuildPatchFromSettings(const NYql::TObjectSettingsImpl& /*settings*/,
TInternalModificationContext& context) const override;

virtual IOperationsManager::TYqlConclusionStatus DoPrepare(NKqpProto::TKqpSchemeOperation& schemeOperation, const NYql::TObjectSettingsImpl& settings,
const NMetadata::IClassBehaviour::TPtr& manager, IOperationsManager::TInternalModificationContext& context) const override;

virtual NThreading::TFuture<IOperationsManager::TYqlConclusionStatus> ExecutePrepared(const NKqpProto::TKqpSchemeOperation& schemeOperation,
const ui32 nodeId, const NMetadata::IClassBehaviour::TPtr& manager, const IOperationsManager::TExternalModificationContext& context) const override;

public:
};

Expand Down
1 change: 1 addition & 0 deletions ydb/services/metadata/secret/ut/ut_secret.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ Y_UNIT_TEST_SUITE(Secret) {
lHelper.StartSchemaRequest("ALTER OBJECT secret1 (TYPE SECRET) SET value = `abcde`");
lHelper.StartSchemaRequest("CREATE OBJECT `secret1:test@test1` (TYPE SECRET_ACCESS)");
lHelper.StartSchemaRequest("CREATE OBJECT `secret2:test@test1` (TYPE SECRET_ACCESS)", false);
lHelper.StartSchemaRequest("CREATE OBJECT IF NOT EXISTS `secret1:test@test1` (TYPE SECRET_ACCESS)");
lHelper.StartSchemaRequest("DROP OBJECT `secret1` (TYPE SECRET)", false);
lHelper.StartDataRequest("SELECT * FROM `/Root/.metadata/secrets/values`", false);
{
Expand Down