Skip to content

Commit d7f39a1

Browse files
authored
YQ-4205 fixed external source feature flags passing into SS (#16208)
1 parent f0cd8b3 commit d7f39a1

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

ydb/core/tx/schemeshard/schemeshard_impl.cpp

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4706,7 +4706,10 @@ void TSchemeShard::OnActivateExecutor(const TActorContext &ctx) {
47064706
EnableReplaceIfExistsForExternalEntities = appData->FeatureFlags.GetEnableReplaceIfExistsForExternalEntities();
47074707
EnableTempTables = appData->FeatureFlags.GetEnableTempTables();
47084708
EnableVectorIndex = appData->FeatureFlags.GetEnableVectorIndex();
4709+
EnableResourcePoolsOnServerless = appData->FeatureFlags.GetEnableResourcePoolsOnServerless();
4710+
EnableExternalDataSourcesOnServerless = appData->FeatureFlags.GetEnableExternalDataSourcesOnServerless();
47094711
EnableDataErasure = appData->FeatureFlags.GetEnableDataErasure();
4712+
EnableExternalSourceSchemaInference = appData->FeatureFlags.GetEnableExternalSourceSchemaInference();
47104713

47114714
ConfigureCompactionQueues(appData->CompactionConfig, ctx);
47124715
ConfigureStatsBatching(appData->SchemeShardConfig, ctx);
@@ -7294,15 +7297,16 @@ void TSchemeShard::ApplyConsoleConfigs(const NKikimrConfig::TAppConfig& appConfi
72947297
}
72957298

72967299
if (appConfig.HasQueryServiceConfig()) {
7297-
const auto& hostnamePatterns = appConfig.GetQueryServiceConfig().GetHostnamePatterns();
7298-
const auto& availableExternalDataSources = appConfig.GetQueryServiceConfig().GetAvailableExternalDataSources();
7300+
const auto& queryServiceConfig = appConfig.GetQueryServiceConfig();
7301+
const auto& hostnamePatterns = queryServiceConfig.GetHostnamePatterns();
7302+
const auto& availableExternalDataSources = queryServiceConfig.GetAvailableExternalDataSources();
72997303
ExternalSourceFactory = NExternalSource::CreateExternalSourceFactory(
73007304
std::vector<TString>(hostnamePatterns.begin(), hostnamePatterns.end()),
73017305
nullptr,
7302-
appConfig.GetQueryServiceConfig().GetS3().GetGeneratorPathsLimit(),
7306+
queryServiceConfig.GetS3().GetGeneratorPathsLimit(),
73037307
nullptr,
7304-
appConfig.GetFeatureFlags().GetEnableExternalSourceSchemaInference(),
7305-
appConfig.GetQueryServiceConfig().GetS3().GetAllowLocalFiles(),
7308+
EnableExternalSourceSchemaInference,
7309+
queryServiceConfig.GetS3().GetAllowLocalFiles(),
73067310
std::set<TString>(availableExternalDataSources.cbegin(), availableExternalDataSources.cend())
73077311
);
73087312
}
@@ -7347,6 +7351,7 @@ void TSchemeShard::ApplyConsoleConfigs(const NKikimrConfig::TFeatureFlags& featu
73477351
EnableVectorIndex = featureFlags.GetEnableVectorIndex();
73487352
EnableExternalDataSourcesOnServerless = featureFlags.GetEnableExternalDataSourcesOnServerless();
73497353
EnableDataErasure = featureFlags.GetEnableDataErasure();
7354+
EnableExternalSourceSchemaInference = featureFlags.GetEnableExternalSourceSchemaInference();
73507355
}
73517356

73527357
void TSchemeShard::ConfigureStatsBatching(const NKikimrConfig::TSchemeShardConfig& config, const TActorContext& ctx) {

ydb/core/tx/schemeshard/schemeshard_impl.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,7 @@ class TSchemeShard
342342
bool EnableVectorIndex = false;
343343
bool EnableExternalDataSourcesOnServerless = false;
344344
bool EnableDataErasure = false;
345+
bool EnableExternalSourceSchemaInference = false;
345346

346347
TShardDeleter ShardDeleter;
347348

0 commit comments

Comments
 (0)