Skip to content

Commit e0dd26b

Browse files
authored
Feature flags for columns types should be read from AppData() (#17289)
1 parent 1b951ad commit e0dd26b

7 files changed

+12
-21
lines changed

ydb/core/tx/schemeshard/schemeshard__operation_alter_sequence.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ class TAlterSequence: public TSubOperation {
488488

489489
const NScheme::TTypeRegistry* typeRegistry = AppData()->TypeRegistry;
490490
auto description = GetAlterSequenceDescription(
491-
sequenceInfo->Description, sequenceAlter, *typeRegistry, context.SS->EnableTablePgTypes, errStr);
491+
sequenceInfo->Description, sequenceAlter, *typeRegistry, AppData()->FeatureFlags.GetEnableTablePgTypes(), errStr);
492492
if (!description) {
493493
status = NKikimrScheme::StatusInvalidParameter;
494494
result->SetError(status, errStr);

ydb/core/tx/schemeshard/schemeshard__operation_alter_table.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ TTableInfo::TAlterDataPtr ParseParams(const TPath& path, TTableInfo::TPtr table,
145145
const TSubDomainInfo& subDomain = *path.DomainInfo();
146146
const TSchemeLimits& limits = subDomain.GetSchemeLimits();
147147
const TTableInfo::TCreateAlterDataFeatureFlags featureFlags = {
148-
.EnableTablePgTypes = context.SS->EnableTablePgTypes,
149-
.EnableTableDatetime64 = context.SS->EnableTableDatetime64,
150-
.EnableParameterizedDecimal = context.SS->EnableParameterizedDecimal,
148+
.EnableTablePgTypes = AppData()->FeatureFlags.GetEnableTablePgTypes(),
149+
.EnableTableDatetime64 = AppData()->FeatureFlags.GetEnableTableDatetime64(),
150+
.EnableParameterizedDecimal = AppData()->FeatureFlags.GetEnableParameterizedDecimal(),
151151
};
152152

153153

ydb/core/tx/schemeshard/schemeshard__operation_copy_table.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -579,10 +579,10 @@ class TCopyTable: public TSubOperation {
579579
const NScheme::TTypeRegistry* typeRegistry = AppData()->TypeRegistry;
580580
const TSchemeLimits& limits = domainInfo->GetSchemeLimits();
581581
const TTableInfo::TCreateAlterDataFeatureFlags featureFlags = {
582-
.EnableTablePgTypes = context.SS->EnableTablePgTypes,
583-
.EnableTableDatetime64 = context.SS->EnableTableDatetime64,
584-
.EnableParameterizedDecimal = context.SS->EnableParameterizedDecimal,
585-
};
582+
.EnableTablePgTypes = AppData()->FeatureFlags.GetEnableTablePgTypes(),
583+
.EnableTableDatetime64 = AppData()->FeatureFlags.GetEnableTableDatetime64(),
584+
.EnableParameterizedDecimal = AppData()->FeatureFlags.GetEnableParameterizedDecimal(),
585+
};
586586
TTableInfo::TAlterDataPtr alterData = TTableInfo::CreateAlterData(nullptr, schema, *typeRegistry,
587587
limits, *domainInfo, featureFlags, errStr, LocalSequences);
588588
if (!alterData.Get()) {

ydb/core/tx/schemeshard/schemeshard__operation_create_sequence.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ class TCreateSequence : public TSubOperation {
508508
TSequenceInfo::TPtr alterData = sequenceInfo->CreateNextVersion();
509509
const NScheme::TTypeRegistry* typeRegistry = AppData()->TypeRegistry;
510510
auto description = FillSequenceDescription(
511-
descr, *typeRegistry, context.SS->EnableTablePgTypes, errStr);
511+
descr, *typeRegistry, AppData()->FeatureFlags.GetEnableTablePgTypes(), errStr);
512512
if (!description) {
513513
status = NKikimrScheme::StatusInvalidParameter;
514514
result->SetError(status, errStr);

ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -578,9 +578,9 @@ class TCreateTable: public TSubOperation {
578578
const NScheme::TTypeRegistry* typeRegistry = AppData()->TypeRegistry;
579579
const TSchemeLimits& limits = domainInfo->GetSchemeLimits();
580580
const TTableInfo::TCreateAlterDataFeatureFlags featureFlags = {
581-
.EnableTablePgTypes = context.SS->EnableTablePgTypes,
582-
.EnableTableDatetime64 = context.SS->EnableTableDatetime64,
583-
.EnableParameterizedDecimal = context.SS->EnableParameterizedDecimal,
581+
.EnableTablePgTypes = AppData()->FeatureFlags.GetEnableTablePgTypes(),
582+
.EnableTableDatetime64 = AppData()->FeatureFlags.GetEnableTableDatetime64(),
583+
.EnableParameterizedDecimal = AppData()->FeatureFlags.GetEnableParameterizedDecimal(),
584584
};
585585
TTableInfo::TAlterDataPtr alterData = TTableInfo::CreateAlterData(
586586
nullptr,

ydb/core/tx/schemeshard/schemeshard_impl.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4701,14 +4701,11 @@ void TSchemeShard::OnActivateExecutor(const TActorContext &ctx) {
47014701
EnableAlterDatabaseCreateHiveFirst = appData->FeatureFlags.GetEnableAlterDatabaseCreateHiveFirst();
47024702
EnablePQConfigTransactionsAtSchemeShard = appData->FeatureFlags.GetEnablePQConfigTransactionsAtSchemeShard();
47034703
EnableStatistics = appData->FeatureFlags.GetEnableStatistics();
4704-
EnableTablePgTypes = appData->FeatureFlags.GetEnableTablePgTypes();
47054704
EnableServerlessExclusiveDynamicNodes = appData->FeatureFlags.GetEnableServerlessExclusiveDynamicNodes();
47064705
EnableAddColumsWithDefaults = appData->FeatureFlags.GetEnableAddColumsWithDefaults();
47074706
EnableReplaceIfExistsForExternalEntities = appData->FeatureFlags.GetEnableReplaceIfExistsForExternalEntities();
47084707
EnableTempTables = appData->FeatureFlags.GetEnableTempTables();
4709-
EnableTableDatetime64 = appData->FeatureFlags.GetEnableTableDatetime64();
47104708
EnableVectorIndex = appData->FeatureFlags.GetEnableVectorIndex();
4711-
EnableParameterizedDecimal = appData->FeatureFlags.GetEnableParameterizedDecimal();
47124709
EnableDataErasure = appData->FeatureFlags.GetEnableDataErasure();
47134710

47144711
ConfigureCompactionQueues(appData->CompactionConfig, ctx);
@@ -7342,16 +7339,13 @@ void TSchemeShard::ApplyConsoleConfigs(const NKikimrConfig::TFeatureFlags& featu
73427339
EnableAlterDatabaseCreateHiveFirst = featureFlags.GetEnableAlterDatabaseCreateHiveFirst();
73437340
EnablePQConfigTransactionsAtSchemeShard = featureFlags.GetEnablePQConfigTransactionsAtSchemeShard();
73447341
EnableStatistics = featureFlags.GetEnableStatistics();
7345-
EnableTablePgTypes = featureFlags.GetEnableTablePgTypes();
73467342
EnableServerlessExclusiveDynamicNodes = featureFlags.GetEnableServerlessExclusiveDynamicNodes();
73477343
EnableAddColumsWithDefaults = featureFlags.GetEnableAddColumsWithDefaults();
73487344
EnableTempTables = featureFlags.GetEnableTempTables();
73497345
EnableReplaceIfExistsForExternalEntities = featureFlags.GetEnableReplaceIfExistsForExternalEntities();
7350-
EnableTableDatetime64 = featureFlags.GetEnableTableDatetime64();
73517346
EnableResourcePoolsOnServerless = featureFlags.GetEnableResourcePoolsOnServerless();
73527347
EnableVectorIndex = featureFlags.GetEnableVectorIndex();
73537348
EnableExternalDataSourcesOnServerless = featureFlags.GetEnableExternalDataSourcesOnServerless();
7354-
EnableParameterizedDecimal = featureFlags.GetEnableParameterizedDecimal();
73557349
EnableDataErasure = featureFlags.GetEnableDataErasure();
73567350
}
73577351

ydb/core/tx/schemeshard/schemeshard_impl.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,16 +334,13 @@ class TSchemeShard
334334
bool EnableAlterDatabaseCreateHiveFirst = false;
335335
bool EnablePQConfigTransactionsAtSchemeShard = false;
336336
bool EnableStatistics = false;
337-
bool EnableTablePgTypes = false;
338337
bool EnableServerlessExclusiveDynamicNodes = false;
339338
bool EnableAddColumsWithDefaults = false;
340339
bool EnableReplaceIfExistsForExternalEntities = false;
341340
bool EnableTempTables = false;
342-
bool EnableTableDatetime64 = false;
343341
bool EnableResourcePoolsOnServerless = false;
344342
bool EnableVectorIndex = false;
345343
bool EnableExternalDataSourcesOnServerless = false;
346-
bool EnableParameterizedDecimal = false;
347344
bool EnableDataErasure = false;
348345

349346
TShardDeleter ShardDeleter;

0 commit comments

Comments
 (0)