aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPisarenko Grigoriy <grigoriypisar@ydb.tech>2025-04-22 18:31:14 +0500
committerGitHub <noreply@github.com>2025-04-22 16:31:14 +0300
commitd7f39a11c7b50063a903340c74965d762d7024e7 (patch)
tree98a32988e1b718b4e4f3eb2d3f66ce7684adc4c3
parentf0cd8b3f35f9ad587dab49ef27307c824db40662 (diff)
downloadydb-d7f39a11c7b50063a903340c74965d762d7024e7.tar.gz
YQ-4205 fixed external source feature flags passing into SS (#16208)
-rw-r--r--ydb/core/tx/schemeshard/schemeshard_impl.cpp15
-rw-r--r--ydb/core/tx/schemeshard/schemeshard_impl.h1
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 87e03e53afb..53c805f6346 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<TString>(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<TString>(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 b1bf42759fb..7df80f80628 100644
--- a/ydb/core/tx/schemeshard/schemeshard_impl.h
+++ b/ydb/core/tx/schemeshard/schemeshard_impl.h
@@ -342,6 +342,7 @@ public:
bool EnableVectorIndex = false;
bool EnableExternalDataSourcesOnServerless = false;
bool EnableDataErasure = false;
+ bool EnableExternalSourceSchemaInference = false;
TShardDeleter ShardDeleter;