From a8cfce41eb11f7ac29d68d7bf3024732c645b95d Mon Sep 17 00:00:00 2001 From: Pisarenko Grigoriy Date: Mon, 14 Apr 2025 19:00:47 +0300 Subject: [PATCH] Revert app data change --- ydb/core/tx/schemeshard/schemeshard_impl.cpp | 15 ++++++++++----- ydb/core/tx/schemeshard/schemeshard_impl.h | 1 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ydb/core/tx/schemeshard/schemeshard_impl.cpp b/ydb/core/tx/schemeshard/schemeshard_impl.cpp index 87e03e53afba..53c805f63462 100644 --- a/ydb/core/tx/schemeshard/schemeshard_impl.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_impl.cpp @@ -4706,7 +4706,10 @@ void TSchemeShard::OnActivateExecutor(const TActorContext &ctx) { EnableReplaceIfExistsForExternalEntities = appData->FeatureFlags.GetEnableReplaceIfExistsForExternalEntities(); EnableTempTables = appData->FeatureFlags.GetEnableTempTables(); EnableVectorIndex = appData->FeatureFlags.GetEnableVectorIndex(); + EnableResourcePoolsOnServerless = appData->FeatureFlags.GetEnableResourcePoolsOnServerless(); + EnableExternalDataSourcesOnServerless = appData->FeatureFlags.GetEnableExternalDataSourcesOnServerless(); EnableDataErasure = appData->FeatureFlags.GetEnableDataErasure(); + EnableExternalSourceSchemaInference = appData->FeatureFlags.GetEnableExternalSourceSchemaInference(); ConfigureCompactionQueues(appData->CompactionConfig, ctx); ConfigureStatsBatching(appData->SchemeShardConfig, ctx); @@ -7294,15 +7297,16 @@ void TSchemeShard::ApplyConsoleConfigs(const NKikimrConfig::TAppConfig& appConfi } if (appConfig.HasQueryServiceConfig()) { - const auto& hostnamePatterns = appConfig.GetQueryServiceConfig().GetHostnamePatterns(); - const auto& availableExternalDataSources = appConfig.GetQueryServiceConfig().GetAvailableExternalDataSources(); + const auto& queryServiceConfig = appConfig.GetQueryServiceConfig(); + const auto& hostnamePatterns = queryServiceConfig.GetHostnamePatterns(); + const auto& availableExternalDataSources = queryServiceConfig.GetAvailableExternalDataSources(); ExternalSourceFactory = NExternalSource::CreateExternalSourceFactory( std::vector(hostnamePatterns.begin(), hostnamePatterns.end()), nullptr, - appConfig.GetQueryServiceConfig().GetS3().GetGeneratorPathsLimit(), + queryServiceConfig.GetS3().GetGeneratorPathsLimit(), nullptr, - appConfig.GetFeatureFlags().GetEnableExternalSourceSchemaInference(), - appConfig.GetQueryServiceConfig().GetS3().GetAllowLocalFiles(), + EnableExternalSourceSchemaInference, + queryServiceConfig.GetS3().GetAllowLocalFiles(), std::set(availableExternalDataSources.cbegin(), availableExternalDataSources.cend()) ); } @@ -7347,6 +7351,7 @@ void TSchemeShard::ApplyConsoleConfigs(const NKikimrConfig::TFeatureFlags& featu EnableVectorIndex = featureFlags.GetEnableVectorIndex(); EnableExternalDataSourcesOnServerless = featureFlags.GetEnableExternalDataSourcesOnServerless(); EnableDataErasure = featureFlags.GetEnableDataErasure(); + EnableExternalSourceSchemaInference = featureFlags.GetEnableExternalSourceSchemaInference(); } void TSchemeShard::ConfigureStatsBatching(const NKikimrConfig::TSchemeShardConfig& config, const TActorContext& ctx) { diff --git a/ydb/core/tx/schemeshard/schemeshard_impl.h b/ydb/core/tx/schemeshard/schemeshard_impl.h index b1bf42759fb0..7df80f80628c 100644 --- a/ydb/core/tx/schemeshard/schemeshard_impl.h +++ b/ydb/core/tx/schemeshard/schemeshard_impl.h @@ -342,6 +342,7 @@ class TSchemeShard bool EnableVectorIndex = false; bool EnableExternalDataSourcesOnServerless = false; bool EnableDataErasure = false; + bool EnableExternalSourceSchemaInference = false; TShardDeleter ShardDeleter;