Added QueryServiceConfig into app data

Author: GrigoriyPA

ydb/core/base/appdata.cpp

@@ -71,6 +71,7 @@ struct TAppData::TImpl {
     NKikimrProto::TDataIntegrityTrailsConfig DataIntegrityTrailsConfig;
     NKikimrConfig::TDataErasureConfig DataErasureConfig;
     NKikimrConfig::THealthCheckConfig HealthCheckConfig;
+    NKikimrConfig::TQueryServiceConfig QueryServiceConfig;
 };
 
 TAppData::TAppData(
@@ -129,6 +130,7 @@ TAppData::TAppData(
     , DataIntegrityTrailsConfig(Impl->DataIntegrityTrailsConfig)
     , DataErasureConfig(Impl->DataErasureConfig)
     , HealthCheckConfig(Impl->HealthCheckConfig)
+    , QueryServiceConfig(Impl->QueryServiceConfig)
     , KikimrShouldContinue(kikimrShouldContinue)
     , TracingConfigurator(MakeIntrusive<NJaegerTracing::TSamplingThrottlingConfigurator>(TimeProvider, RandomProvider))
 {}

ydb/core/base/appdata_fwd.h

@@ -74,6 +74,7 @@ namespace NKikimrConfig {
     class TMemoryControllerConfig;
     class TFeatureFlags;
     class THealthCheckConfig;
+    class TQueryServiceConfig;
 }
 
 namespace NKikimrReplication {
@@ -244,6 +245,7 @@ struct TAppData {
     NKikimrProto::TDataIntegrityTrailsConfig& DataIntegrityTrailsConfig;
     NKikimrConfig::TDataErasureConfig& DataErasureConfig;
     NKikimrConfig::THealthCheckConfig& HealthCheckConfig;
+    NKikimrConfig::TQueryServiceConfig& QueryServiceConfig;
     bool EnforceUserTokenRequirement = false;
     bool EnforceUserTokenCheckRequirement = false; // check token if it was specified
     bool AllowHugeKeyValueDeletes = true; // delete when all clients limit deletes per request

ydb/core/driver_lib/run/run.cpp

@@ -1210,6 +1210,10 @@ void TKikimrRunner::InitializeAppData(const TKikimrRunConfig& runConfig)
         AppData->HealthCheckConfig = runConfig.AppConfig.GetHealthCheckConfig();
     }
 
+    if (runConfig.AppConfig.HasQueryServiceConfig()) {
+        AppData->QueryServiceConfig = runConfig.AppConfig.GetQueryServiceConfig();
+    }
+
     // setup resource profiles
     AppData->ResourceProfiles = new TResourceProfiles;
     if (runConfig.AppConfig.GetBootstrapConfig().ResourceProfilesSize())

ydb/core/testlib/actors/test_runtime.cpp

@@ -179,6 +179,7 @@ namespace NActors {
             nodeAppData->AwsCompatibilityConfig = app0->AwsCompatibilityConfig;
             nodeAppData->S3ProxyResolverConfig = app0->S3ProxyResolverConfig;
             nodeAppData->GraphConfig = app0->GraphConfig;
+            nodeAppData->QueryServiceConfig = app0->QueryServiceConfig;
             nodeAppData->EnableMvccSnapshotWithLegacyDomainRoot = app0->EnableMvccSnapshotWithLegacyDomainRoot;
             nodeAppData->IoContextFactory = app0->IoContextFactory;
             nodeAppData->SchemeOperationFactory = app0->SchemeOperationFactory;

ydb/core/testlib/basics/appdata.cpp

@@ -65,6 +65,7 @@ namespace NKikimr {
         app->AwsCompatibilityConfig = AwsCompatibilityConfig;
         app->S3ProxyResolverConfig = S3ProxyResolverConfig;
         app->GraphConfig = GraphConfig;
+        app->QueryServiceConfig = QueryServiceConfig;
         app->InitFeatureFlags(FeatureFlags);
 
         // This is a special setting active in test runtime only

ydb/core/testlib/basics/appdata.h

@@ -111,6 +111,7 @@ namespace NKikimr {
         NKikimrConfig::TGraphConfig GraphConfig;
         NKikimrConfig::TImmediateControlsConfig ImmediateControlsConfig;
         NKikimrResourceBroker::TResourceBrokerConfig ResourceBrokerConfig;
+        NKikimrConfig::TQueryServiceConfig QueryServiceConfig;
         std::vector<TIntrusivePtr<NKikimr::TControlBoard>> Icb;
 
     private:

ydb/core/testlib/test_client.cpp

@@ -467,6 +467,9 @@ namespace Tests {
         if (Settings->AppConfig->HasResourceBrokerConfig()) {
             app.ResourceBrokerConfig = Settings->AppConfig->GetResourceBrokerConfig();
         }
+        if (Settings->AppConfig->HasQueryServiceConfig()) {
+            app.QueryServiceConfig = Settings->AppConfig->GetQueryServiceConfig();
+        }
 
         // forcibly turn on some feature flags
         app.FeatureFlags = Settings->FeatureFlags;

ydb/core/tx/schemeshard/schemeshard_impl.cpp

@@ -4665,9 +4665,12 @@ void TSchemeShard::OnActivateExecutor(const TActorContext &ctx) {
     EnableReplaceIfExistsForExternalEntities = appData->FeatureFlags.GetEnableReplaceIfExistsForExternalEntities();
     EnableTempTables = appData->FeatureFlags.GetEnableTempTables();
     EnableTableDatetime64 = appData->FeatureFlags.GetEnableTableDatetime64();
+    EnableResourcePoolsOnServerless = appData->FeatureFlags.GetEnableResourcePoolsOnServerless();
     EnableVectorIndex = appData->FeatureFlags.GetEnableVectorIndex();
+    EnableExternalDataSourcesOnServerless = appData->FeatureFlags.GetEnableExternalDataSourcesOnServerless();
     EnableParameterizedDecimal = appData->FeatureFlags.GetEnableParameterizedDecimal();
     EnableDataErasure = appData->FeatureFlags.GetEnableDataErasure();
+    EnableExternalSourceSchemaInference = appData->FeatureFlags.GetEnableExternalSourceSchemaInference();
 
     ConfigureCompactionQueues(appData->CompactionConfig, ctx);
     ConfigureStatsBatching(appData->SchemeShardConfig, ctx);
@@ -4677,6 +4680,7 @@ void TSchemeShard::OnActivateExecutor(const TActorContext &ctx) {
 
     ConfigureBackgroundCleaningQueue(appData->BackgroundCleaningConfig, ctx);
     ConfigureDataErasureManager(appData->DataErasureConfig);
+    ConfigureQueryService(appData->QueryServiceConfig, ctx);
 
     if (appData->ChannelProfiles) {
         ChannelProfiles = appData->ChannelProfiles;
@@ -7258,17 +7262,8 @@ void TSchemeShard::ApplyConsoleConfigs(const NKikimrConfig::TAppConfig& appConfi
     }
 
     if (appConfig.HasQueryServiceConfig()) {
-        const auto& hostnamePatterns = appConfig.GetQueryServiceConfig().GetHostnamePatterns();
-        const auto& availableExternalDataSources = appConfig.GetQueryServiceConfig().GetAvailableExternalDataSources();
-        ExternalSourceFactory = NExternalSource::CreateExternalSourceFactory(
-            std::vector<TString>(hostnamePatterns.begin(), hostnamePatterns.end()),
-            nullptr,
-            appConfig.GetQueryServiceConfig().GetS3().GetGeneratorPathsLimit(),
-            nullptr,
-            appConfig.GetFeatureFlags().GetEnableExternalSourceSchemaInference(),
-            appConfig.GetQueryServiceConfig().GetS3().GetAllowLocalFiles(),
-            std::set<TString>(availableExternalDataSources.cbegin(), availableExternalDataSources.cend())
-        );
+        const auto& queryServiceConfig = appConfig.GetQueryServiceConfig();
+        ConfigureQueryService(queryServiceConfig, ctx);
     }
 
     if (appConfig.HasAuthConfig()) {
@@ -7314,6 +7309,7 @@ void TSchemeShard::ApplyConsoleConfigs(const NKikimrConfig::TFeatureFlags& featu
     EnableExternalDataSourcesOnServerless = featureFlags.GetEnableExternalDataSourcesOnServerless();
     EnableParameterizedDecimal = featureFlags.GetEnableParameterizedDecimal();
     EnableDataErasure = featureFlags.GetEnableDataErasure();
+    EnableExternalSourceSchemaInference = featureFlags.GetEnableExternalSourceSchemaInference();
 }
 
 void TSchemeShard::ConfigureStatsBatching(const NKikimrConfig::TSchemeShardConfig& config, const TActorContext& ctx) {
@@ -7522,6 +7518,32 @@ void TSchemeShard::ConfigureAccountLockout(
                  << ", AttemptResetDuration# " << accountLockoutInitializer.AttemptResetDuration);
 }
 
+void TSchemeShard::ConfigureQueryService(
+    const NKikimrConfig::TQueryServiceConfig& config,
+    const TActorContext& ctx)
+{
+    const auto& hostnamePatterns = config.GetHostnamePatterns();
+    const auto& availableExternalDataSources = config.GetAvailableExternalDataSources();
+    const auto pathsLimit = config.GetS3().GetGeneratorPathsLimit();
+    const auto allowLocalFiles = config.GetS3().GetAllowLocalFiles();
+    ExternalSourceFactory = NExternalSource::CreateExternalSourceFactory(
+        std::vector<TString>(hostnamePatterns.begin(), hostnamePatterns.end()),
+        nullptr,
+        pathsLimit,
+        nullptr,
+        EnableExternalSourceSchemaInference,
+        allowLocalFiles,
+        std::set<TString>(availableExternalDataSources.cbegin(), availableExternalDataSources.cend())
+    );
+
+    LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
+                 "QueryService configured: HostnamePatterns# [" << Join(", ", hostnamePatterns) << "]"
+                 << ", AvailableExternalDataSources# [" << Join(", ", availableExternalDataSources) << "]"
+                 << ", PathsLimit# " << pathsLimit
+                 << ", EnableExternalSourceSchemaInference# " << (EnableExternalSourceSchemaInference ? "true" : "false")
+                 << ", AllowLocalFiles# " << (allowLocalFiles ? "true" : "false"));
+}
+
 void TSchemeShard::StartStopCompactionQueues() {
     // note, that we don't need to check current state of compaction queue
     if (IsServerlessDomain(TPath::Init(RootPathId(), this))) {

ydb/core/tx/schemeshard/schemeshard_impl.h

@@ -345,6 +345,7 @@ class TSchemeShard
     bool EnableExternalDataSourcesOnServerless = false;
     bool EnableParameterizedDecimal = false;
     bool EnableDataErasure = false;
+    bool EnableExternalSourceSchemaInference = false;
 
     TShardDeleter ShardDeleter;
 
@@ -511,6 +512,10 @@ class TSchemeShard
         const ::NKikimrProto::TAuthConfig& config,
         const TActorContext &ctx);
 
+    void ConfigureQueryService(
+        const NKikimrConfig::TQueryServiceConfig& config,
+        const TActorContext& ctx);
+
     void StartStopCompactionQueues();
 
     void WaitForTableProfiles(ui64 importId, ui32 itemIdx);