diff options
author | azevaykin <145343289+azevaykin@users.noreply.github.com> | 2025-04-17 09:15:04 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-04-17 09:15:04 +0300 |
commit | e0dd26b008e94d0d214e2190d356054b8a958564 (patch) | |
tree | c9d92a31ec6de97451c68aaecfaaaef49de078e8 | |
parent | 1b951addfb937d7d1ded2b0dfcd8843ba84ea2af (diff) | |
download | ydb-e0dd26b008e94d0d214e2190d356054b8a958564.tar.gz |
Feature flags for columns types should be read from AppData() (#17289)
7 files changed, 12 insertions, 21 deletions
diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_sequence.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_sequence.cpp index d2da3b45f85..cd43d916b24 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_sequence.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_sequence.cpp @@ -488,7 +488,7 @@ public: const NScheme::TTypeRegistry* typeRegistry = AppData()->TypeRegistry; auto description = GetAlterSequenceDescription( - sequenceInfo->Description, sequenceAlter, *typeRegistry, context.SS->EnableTablePgTypes, errStr); + sequenceInfo->Description, sequenceAlter, *typeRegistry, AppData()->FeatureFlags.GetEnableTablePgTypes(), errStr); if (!description) { status = NKikimrScheme::StatusInvalidParameter; result->SetError(status, errStr); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_table.cpp index 155b5e1339e..792d461e8a1 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_table.cpp @@ -145,9 +145,9 @@ TTableInfo::TAlterDataPtr ParseParams(const TPath& path, TTableInfo::TPtr table, const TSubDomainInfo& subDomain = *path.DomainInfo(); const TSchemeLimits& limits = subDomain.GetSchemeLimits(); const TTableInfo::TCreateAlterDataFeatureFlags featureFlags = { - .EnableTablePgTypes = context.SS->EnableTablePgTypes, - .EnableTableDatetime64 = context.SS->EnableTableDatetime64, - .EnableParameterizedDecimal = context.SS->EnableParameterizedDecimal, + .EnableTablePgTypes = AppData()->FeatureFlags.GetEnableTablePgTypes(), + .EnableTableDatetime64 = AppData()->FeatureFlags.GetEnableTableDatetime64(), + .EnableParameterizedDecimal = AppData()->FeatureFlags.GetEnableParameterizedDecimal(), }; diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_copy_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_copy_table.cpp index 5c3bfb8047c..4323da5a457 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_copy_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_copy_table.cpp @@ -579,10 +579,10 @@ public: const NScheme::TTypeRegistry* typeRegistry = AppData()->TypeRegistry; const TSchemeLimits& limits = domainInfo->GetSchemeLimits(); const TTableInfo::TCreateAlterDataFeatureFlags featureFlags = { - .EnableTablePgTypes = context.SS->EnableTablePgTypes, - .EnableTableDatetime64 = context.SS->EnableTableDatetime64, - .EnableParameterizedDecimal = context.SS->EnableParameterizedDecimal, - }; + .EnableTablePgTypes = AppData()->FeatureFlags.GetEnableTablePgTypes(), + .EnableTableDatetime64 = AppData()->FeatureFlags.GetEnableTableDatetime64(), + .EnableParameterizedDecimal = AppData()->FeatureFlags.GetEnableParameterizedDecimal(), + }; TTableInfo::TAlterDataPtr alterData = TTableInfo::CreateAlterData(nullptr, schema, *typeRegistry, limits, *domainInfo, featureFlags, errStr, LocalSequences); if (!alterData.Get()) { diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_sequence.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_sequence.cpp index 0e23348c088..9fdb1e8d66b 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_sequence.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_sequence.cpp @@ -508,7 +508,7 @@ public: TSequenceInfo::TPtr alterData = sequenceInfo->CreateNextVersion(); const NScheme::TTypeRegistry* typeRegistry = AppData()->TypeRegistry; auto description = FillSequenceDescription( - descr, *typeRegistry, context.SS->EnableTablePgTypes, errStr); + descr, *typeRegistry, AppData()->FeatureFlags.GetEnableTablePgTypes(), errStr); if (!description) { status = NKikimrScheme::StatusInvalidParameter; result->SetError(status, errStr); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp index d43c27aee88..ec28d65e188 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp @@ -578,9 +578,9 @@ public: const NScheme::TTypeRegistry* typeRegistry = AppData()->TypeRegistry; const TSchemeLimits& limits = domainInfo->GetSchemeLimits(); const TTableInfo::TCreateAlterDataFeatureFlags featureFlags = { - .EnableTablePgTypes = context.SS->EnableTablePgTypes, - .EnableTableDatetime64 = context.SS->EnableTableDatetime64, - .EnableParameterizedDecimal = context.SS->EnableParameterizedDecimal, + .EnableTablePgTypes = AppData()->FeatureFlags.GetEnableTablePgTypes(), + .EnableTableDatetime64 = AppData()->FeatureFlags.GetEnableTableDatetime64(), + .EnableParameterizedDecimal = AppData()->FeatureFlags.GetEnableParameterizedDecimal(), }; TTableInfo::TAlterDataPtr alterData = TTableInfo::CreateAlterData( nullptr, diff --git a/ydb/core/tx/schemeshard/schemeshard_impl.cpp b/ydb/core/tx/schemeshard/schemeshard_impl.cpp index 2fbc0a89465..87e03e53afb 100644 --- a/ydb/core/tx/schemeshard/schemeshard_impl.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_impl.cpp @@ -4701,14 +4701,11 @@ void TSchemeShard::OnActivateExecutor(const TActorContext &ctx) { EnableAlterDatabaseCreateHiveFirst = appData->FeatureFlags.GetEnableAlterDatabaseCreateHiveFirst(); EnablePQConfigTransactionsAtSchemeShard = appData->FeatureFlags.GetEnablePQConfigTransactionsAtSchemeShard(); EnableStatistics = appData->FeatureFlags.GetEnableStatistics(); - EnableTablePgTypes = appData->FeatureFlags.GetEnableTablePgTypes(); EnableServerlessExclusiveDynamicNodes = appData->FeatureFlags.GetEnableServerlessExclusiveDynamicNodes(); EnableAddColumsWithDefaults = appData->FeatureFlags.GetEnableAddColumsWithDefaults(); EnableReplaceIfExistsForExternalEntities = appData->FeatureFlags.GetEnableReplaceIfExistsForExternalEntities(); EnableTempTables = appData->FeatureFlags.GetEnableTempTables(); - EnableTableDatetime64 = appData->FeatureFlags.GetEnableTableDatetime64(); EnableVectorIndex = appData->FeatureFlags.GetEnableVectorIndex(); - EnableParameterizedDecimal = appData->FeatureFlags.GetEnableParameterizedDecimal(); EnableDataErasure = appData->FeatureFlags.GetEnableDataErasure(); ConfigureCompactionQueues(appData->CompactionConfig, ctx); @@ -7342,16 +7339,13 @@ void TSchemeShard::ApplyConsoleConfigs(const NKikimrConfig::TFeatureFlags& featu EnableAlterDatabaseCreateHiveFirst = featureFlags.GetEnableAlterDatabaseCreateHiveFirst(); EnablePQConfigTransactionsAtSchemeShard = featureFlags.GetEnablePQConfigTransactionsAtSchemeShard(); EnableStatistics = featureFlags.GetEnableStatistics(); - EnableTablePgTypes = featureFlags.GetEnableTablePgTypes(); EnableServerlessExclusiveDynamicNodes = featureFlags.GetEnableServerlessExclusiveDynamicNodes(); EnableAddColumsWithDefaults = featureFlags.GetEnableAddColumsWithDefaults(); EnableTempTables = featureFlags.GetEnableTempTables(); EnableReplaceIfExistsForExternalEntities = featureFlags.GetEnableReplaceIfExistsForExternalEntities(); - EnableTableDatetime64 = featureFlags.GetEnableTableDatetime64(); EnableResourcePoolsOnServerless = featureFlags.GetEnableResourcePoolsOnServerless(); EnableVectorIndex = featureFlags.GetEnableVectorIndex(); EnableExternalDataSourcesOnServerless = featureFlags.GetEnableExternalDataSourcesOnServerless(); - EnableParameterizedDecimal = featureFlags.GetEnableParameterizedDecimal(); EnableDataErasure = featureFlags.GetEnableDataErasure(); } diff --git a/ydb/core/tx/schemeshard/schemeshard_impl.h b/ydb/core/tx/schemeshard/schemeshard_impl.h index 9b4a405f96d..b1bf42759fb 100644 --- a/ydb/core/tx/schemeshard/schemeshard_impl.h +++ b/ydb/core/tx/schemeshard/schemeshard_impl.h @@ -334,16 +334,13 @@ public: bool EnableAlterDatabaseCreateHiveFirst = false; bool EnablePQConfigTransactionsAtSchemeShard = false; bool EnableStatistics = false; - bool EnableTablePgTypes = false; bool EnableServerlessExclusiveDynamicNodes = false; bool EnableAddColumsWithDefaults = false; bool EnableReplaceIfExistsForExternalEntities = false; bool EnableTempTables = false; - bool EnableTableDatetime64 = false; bool EnableResourcePoolsOnServerless = false; bool EnableVectorIndex = false; bool EnableExternalDataSourcesOnServerless = false; - bool EnableParameterizedDecimal = false; bool EnableDataErasure = false; TShardDeleter ShardDeleter; |