YQ cherry pick fixes to q-stable (#26044)

Co-authored-by: Pisarenko Grigoriy <grigoriypisar@ydb.tech>

Author: kardymonds

ydb/core/driver_lib/run/kikimr_services_initializers.cpp

@@ -179,7 +179,6 @@
 #include <ydb/library/folder_service/folder_service.h>
 #include <ydb/library/folder_service/proto/config.pb.h>
 
-#include <ydb/library/yql/dq/actors/compute/dq_checkpoints.h>
 #include <ydb/library/yql/providers/s3/actors/yql_s3_actors_factory_impl.h>
 
 #include <yql/essentials/minikql/comp_nodes/mkql_factories.h>
@@ -2186,12 +2185,10 @@ void TQuoterServiceInitializer::InitializeServices(NActors::TActorSystemSetup* s
 TKqpServiceInitializer::TKqpServiceInitializer(
         const TKikimrRunConfig& runConfig,
         std::shared_ptr<TModuleFactories> factories,
-        IGlobalObjectStorage& globalObjects,
-        NFq::IYqSharedResources::TPtr yqSharedResources)
+        IGlobalObjectStorage& globalObjects)
     : IKikimrServicesInitializer(runConfig)
     , Factories(std::move(factories))
     , GlobalObjects(globalObjects)
-    , YqSharedResources(yqSharedResources)
 {}
 
 void TKqpServiceInitializer::InitializeServices(NActors::TActorSystemSetup* setup, const NKikimr::TAppData* appData) {
@@ -2245,20 +2242,6 @@ void TKqpServiceInitializer::InitializeServices(NActors::TActorSystemSetup* setu
         setup->LocalServices.push_back(std::make_pair(
             NKqp::MakeKqpFinalizeScriptServiceId(NodeId),
             TActorSetupCmd(finalize, TMailboxType::HTSwap, appData->UserPoolId)));
-
-        const auto& checkpointConfig = Config.GetQueryServiceConfig().GetCheckpointsConfig();
-        if (checkpointConfig.GetEnabled()) {
-            auto service = NFq::NewCheckpointStorageService(
-                checkpointConfig,
-                "cs",
-                NKikimr::CreateYdbCredentialsProviderFactory,
-                NFq::TYqSharedResources::Cast(YqSharedResources),
-                appData->Counters);
-
-            setup->LocalServices.push_back(std::make_pair(
-                NYql::NDq::MakeCheckpointStorageID(),
-                TActorSetupCmd(service.release(), TMailboxType::HTSwap, appData->UserPoolId)));
-        }
     }
 }
 

ydb/core/driver_lib/run/kikimr_services_initializers.h

@@ -394,13 +394,12 @@ class TQuoterServiceInitializer : public IKikimrServicesInitializer {
 class TKqpServiceInitializer : public IKikimrServicesInitializer {
 public:
     TKqpServiceInitializer(const TKikimrRunConfig& runConfig, std::shared_ptr<TModuleFactories> factories,
-        IGlobalObjectStorage& globalObjects, NFq::IYqSharedResources::TPtr yqSharedResources);
+        IGlobalObjectStorage& globalObjects);
 
     void InitializeServices(NActors::TActorSystemSetup* setup, const NKikimr::TAppData* appData) override;
 private:
     std::shared_ptr<TModuleFactories> Factories;
     IGlobalObjectStorage& GlobalObjects;
-    NFq::IYqSharedResources::TPtr YqSharedResources;
 };
 
 class TCompDiskLimiterInitializer: public IKikimrServicesInitializer {

ydb/core/driver_lib/run/run.cpp

@@ -1738,7 +1738,7 @@ TIntrusivePtr<TServiceInitializersList> TKikimrRunner::CreateServiceInitializers
     sil->AddServiceInitializer(new TMemoryControllerInitializer(runConfig, ProcessMemoryInfoProvider));
 
     if (serviceMask.EnableKqp) {
-        sil->AddServiceInitializer(new TKqpServiceInitializer(runConfig, ModuleFactories, *this, YqSharedResources));
+        sil->AddServiceInitializer(new TKqpServiceInitializer(runConfig, ModuleFactories, *this));
     }
 
     if (serviceMask.EnableMetadataProvider) {

ydb/core/driver_lib/run/service_mask.h

@@ -113,6 +113,7 @@ union TBasicKikimrServicesMask {
         EnableViewerService = true;
         EnableMeteringWriter = true;
         EnableProfiler = true;
+        EnableStateStorageService = true;
     }
 
     void SetTinyMode() {

ydb/core/external_sources/external_source_factory.cpp

@@ -129,7 +129,7 @@ IExternalSourceFactory::TPtr CreateExternalSourceFactory(const std::vector<TStri
         },
         {
             ToString(NYql::EDatabaseType::Ydb),
-            CreateExternalDataSource(TString{NYql::GenericProviderName}, {"NONE", "BASIC", "SERVICE_ACCOUNT", "TOKEN"}, {"database_name", "use_tls", "database_id"}, hostnamePatternsRegEx)
+            CreateExternalDataSource(TString{NYql::GenericProviderName}, {"NONE", "BASIC", "SERVICE_ACCOUNT", "TOKEN"}, {"database_name", "use_tls", "database_id", "shared_reading"}, hostnamePatternsRegEx)
         },
         {
             ToString(NYql::EDatabaseType::YT),
@@ -177,7 +177,7 @@ IExternalSourceFactory::TPtr CreateExternalSourceFactory(const std::vector<TStri
         },
         {
             ToString(NYql::EDatabaseType::YdbTopics),
-            CreateExternalDataSource(TString{NYql::PqProviderName}, {"NONE", "BASIC", "TOKEN"}, {"database_name", "use_tls"}, hostnamePatternsRegEx)
+            CreateExternalDataSource(TString{NYql::PqProviderName}, {"NONE", "BASIC", "TOKEN"}, {"database_name", "use_tls", "shared_reading"}, hostnamePatternsRegEx)
         }
     },
     allExternalDataSourcesAreAvailable,

ydb/core/fq/libs/checkpoint_storage/storage_proxy.cpp

@@ -68,12 +68,12 @@ struct TRequestContext : public TThrRefBase {
 class TStorageProxy : public TActorBootstrapped<TStorageProxy> {
     NKikimrConfig::TCheckpointsConfig Config;
     TString IdsPrefix;
-    NKikimrConfig::TCheckpointsConfig::TExternalStorage StorageConfig;
+    NKikimrConfig::TExternalStorage StorageConfig;
     TCheckpointStoragePtr CheckpointStorage;
     TStateStoragePtr StateStorage;
     TActorId ActorGC;
     NKikimr::TYdbCredentialsProviderFactory CredentialsProviderFactory;
-    TYqSharedResources::TPtr YqSharedResources;
+    NYdb::TDriver Driver;
     const TStorageProxyMetricsPtr Metrics;
     bool Initialized = false;
 
@@ -82,7 +82,7 @@ class TStorageProxy : public TActorBootstrapped<TStorageProxy> {
         const NKikimrConfig::TCheckpointsConfig& config,
         const TString& idsPrefix,
         const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory,
-        const TYqSharedResources::TPtr& yqSharedResources,
+        NYdb::TDriver driver,
         const ::NMonitoring::TDynamicCounterPtr& counters);
 
     void Bootstrap();
@@ -116,7 +116,7 @@ class TStorageProxy : public TActorBootstrapped<TStorageProxy> {
     void Handle(NYql::NDq::TEvDqCompute::TEvGetTaskState::TPtr& ev);
 };
 
-static void FillDefaultParameters(NKikimrConfig::TCheckpointsConfig& checkpointCoordinatorConfig, NKikimrConfig::TCheckpointsConfig::TExternalStorage& ydbStorageConfig) {
+static void FillDefaultParameters(NKikimrConfig::TCheckpointsConfig& checkpointCoordinatorConfig, NKikimrConfig::TExternalStorage& ydbStorageConfig) {
     auto& limits = *checkpointCoordinatorConfig.MutableStateStorageLimits();
     if (!limits.GetMaxGraphCheckpointsSizeBytes()) {
         limits.SetMaxGraphCheckpointsSizeBytes(1099511627776);
@@ -143,20 +143,20 @@ TStorageProxy::TStorageProxy(
     const NKikimrConfig::TCheckpointsConfig& config,
     const TString& idsPrefix,
     const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory,
-    const TYqSharedResources::TPtr& yqSharedResources,
+    NYdb::TDriver driver,
     const ::NMonitoring::TDynamicCounterPtr& counters)
     : Config(config)
     , IdsPrefix(idsPrefix)
     , StorageConfig(Config.GetExternalStorage())
     , CredentialsProviderFactory(credentialsProviderFactory)
-    , YqSharedResources(yqSharedResources)
+    , Driver(std::move(driver))
     , Metrics(MakeIntrusive<TStorageProxyMetrics>(counters)) {
     FillDefaultParameters(Config, StorageConfig);
 }
 
 void TStorageProxy::Bootstrap() {
     LOG_STREAMS_STORAGE_SERVICE_INFO("Bootstrap");
-    auto ydbConnectionPtr = NewYdbConnection(Config.GetExternalStorage(), CredentialsProviderFactory, YqSharedResources->UserSpaceYdbDriver);
+    auto ydbConnectionPtr = NewYdbConnection(Config.GetExternalStorage(), CredentialsProviderFactory, Driver);
     CheckpointStorage = NewYdbCheckpointStorage(StorageConfig, CreateEntityIdGenerator(IdsPrefix), ydbConnectionPtr);
     StateStorage = NewYdbStateStorage(Config, ydbConnectionPtr);
     if (Config.GetCheckpointGarbageConfig().GetEnabled()) {
@@ -456,10 +456,10 @@ std::unique_ptr<NActors::IActor> NewStorageProxy(
     const NKikimrConfig::TCheckpointsConfig& config,
     const TString& idsPrefix,
     const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory,
-    const TYqSharedResources::TPtr& yqSharedResources,
+    NYdb::TDriver driver,
     const ::NMonitoring::TDynamicCounterPtr& counters)
 {
-    return std::unique_ptr<NActors::IActor>(new TStorageProxy(config, idsPrefix, credentialsProviderFactory, yqSharedResources, counters));
+    return std::unique_ptr<NActors::IActor>(new TStorageProxy(config, idsPrefix, credentialsProviderFactory, std::move(driver), counters));
 }
 
 } // namespace NFq

ydb/core/fq/libs/checkpoint_storage/storage_proxy.h

@@ -19,7 +19,7 @@ std::unique_ptr<NActors::IActor> NewStorageProxy(
     const NKikimrConfig::TCheckpointsConfig& config,
     const TString& idsPrefix,
     const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory,
-    const TYqSharedResources::TPtr& yqSharedResources,
+    NYdb::TDriver driver,
     const ::NMonitoring::TDynamicCounterPtr& counters);
 
 } // namespace NFq

ydb/core/fq/libs/checkpoint_storage/storage_service.cpp

@@ -12,10 +12,10 @@ std::unique_ptr<NActors::IActor> NewCheckpointStorageService(
     const NKikimrConfig::TCheckpointsConfig& config,
     const TString& idsPrefix,
     const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory,
-    const TYqSharedResources::TPtr& yqSharedResources,
+    NYdb::TDriver driver,
     const ::NMonitoring::TDynamicCounterPtr& counters)
 {
-    return NewStorageProxy(config, idsPrefix, credentialsProviderFactory, yqSharedResources, counters);
+    return NewStorageProxy(config, idsPrefix, credentialsProviderFactory, std::move(driver), counters);
 }
 
 } // namespace NFq

ydb/core/fq/libs/checkpoint_storage/storage_service.h

@@ -18,7 +18,7 @@ std::unique_ptr<NActors::IActor> NewCheckpointStorageService(
     const NKikimrConfig::TCheckpointsConfig& config,
     const TString& idsPrefix,
     const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory,
-    const TYqSharedResources::TPtr& yqSharedResources,
+    NYdb::TDriver driver,
     const ::NMonitoring::TDynamicCounterPtr& counters);
 
 } // namespace NFq

ydb/core/fq/libs/checkpoint_storage/ut/storage_service_ydb_ut.cpp

@@ -54,9 +54,10 @@ TRuntimePtr PrepareTestActorRuntime(const char* tablePrefix, bool enableGc = fal
     auto& gcConfig = *config.MutableCheckpointGarbageConfig();
     gcConfig.SetEnabled(enableGc);
 
+    auto driverConfig = NYdb::TDriverConfig();
+    NYdb::TDriver driver(driverConfig);
     auto credFactory = NKikimr::CreateYdbCredentialsProviderFactory;
-    auto yqSharedResources = NFq::TYqSharedResources::Cast(NFq::CreateYqSharedResourcesImpl({}, credFactory, MakeIntrusive<NMonitoring::TDynamicCounters>()));
-    auto storageService = NewCheckpointStorageService(config, "id", credFactory, yqSharedResources, MakeIntrusive<::NMonitoring::TDynamicCounters>());
+    auto storageService = NewCheckpointStorageService(config, "id", credFactory, std::move(driver), MakeIntrusive<::NMonitoring::TDynamicCounters>());
 
     runtime->AddLocalService(
         NYql::NDq::MakeCheckpointStorageID(),