Fixed unit tests

Author: GrigoriyPA

ydb/core/kqp/proxy_service/kqp_proxy_databases_cache.cpp

@@ -127,7 +127,11 @@ class TDatabaseSubscriberActor : public TActor<TDatabaseSubscriberActor> {
         if (status == Ydb::StatusIds::SUCCESS || status == Ydb::StatusIds::UNSUPPORTED) {
             Send(subscriber, new TEvKqp::TEvUpdateDatabaseInfo(database, databaseState.DatabaseId, databaseState.Serverless));
         } else {
-            Send(subscriber, new TEvKqp::TEvUpdateDatabaseInfo(database, status, std::move(issues)));
+            NYql::TIssue rootIssue(TStringBuilder() << "Failed to describe database" << database);
+            for (const auto& issue : issues) {
+                rootIssue.AddSubIssue(MakeIntrusive<NYql::TIssue>(issue));
+            }
+            Send(subscriber, new TEvKqp::TEvUpdateDatabaseInfo(database, status, {rootIssue}));
         }
     }
 

ydb/core/kqp/proxy_service/kqp_proxy_service.cpp

@@ -646,6 +646,8 @@ class TKqpProxyService : public TActorBootstrapped<TKqpProxyService> {
             return;
         }
 
+        Cerr << "------------------------------- DatabaseId: " << ev->Get()->GetDatabaseId() << "\n";
+
         const TString& database = ev->Get()->GetDatabase();
         const TString& traceId = ev->Get()->GetTraceId();
         const auto queryType = ev->Get()->GetType();

ydb/core/kqp/proxy_service/kqp_proxy_service_impl.h

@@ -662,7 +662,7 @@ class TDatabasesCache {
             return true;
         }
 
-        const auto& database = event->Get()->GetDatabase();
+        const auto& database = CanonizePath(event->Get()->GetDatabase());
         auto& databaseInfo = DatabasesCache[database];
         if (databaseInfo.DatabaseId) {
             event->Get()->SetDatabaseId(databaseInfo.DatabaseId);
@@ -682,7 +682,11 @@ class TDatabasesCache {
     }
 
     void UpdateDatabaseInfo(TEvKqp::TEvUpdateDatabaseInfo::TPtr& event, TActorContext actorContext) {
-        auto it = DatabasesCache.find(event->Get()->Database);
+        const auto& database = event->Get()->Database;
+        auto it = DatabasesCache.find(database);
+        if (it == DatabasesCache.end()) {
+            it = DatabasesCache.insert({database, TDatabaseInfo{}}).first;
+        }
         it->second.DatabaseId = event->Get()->DatabaseId;
 
         bool success = event->Get()->Status == Ydb::StatusIds::SUCCESS;

ydb/core/kqp/proxy_service/ut/ya.make

@@ -13,6 +13,7 @@ PEERDIR(
     ydb/core/kqp/run_script_actor
     ydb/core/kqp/proxy_service
     ydb/core/kqp/ut/common
+    ydb/core/kqp/workload_service/ut/common
     ydb/library/yql/sql/pg_dummy
     ydb/public/sdk/cpp/client/ydb_query
     ydb/public/sdk/cpp/client/ydb_driver

ydb/core/kqp/workload_service/ut/kqp_workload_service_ut.cpp

@@ -635,7 +635,7 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifiersDdl) {
     }
 
     void WaitForFail(TIntrusivePtr<IYdbSetup> ydb, const TQueryRunnerSettings& settings, const TString& poolId) {
-        ydb->WaitFor(TDuration::Seconds(5), "Resource pool classifier fail", [ydb, settings, poolId](TString& errorString) {
+        ydb->WaitFor(TDuration::Seconds(10), "Resource pool classifier fail", [ydb, settings, poolId](TString& errorString) {
             auto result = ydb->ExecuteQuery(TSampleQueries::TSelect42::Query, settings);
 
             errorString = result.GetIssues().ToOneLineString();
@@ -644,7 +644,7 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifiersDdl) {
     }
 
     void WaitForSuccess(TIntrusivePtr<IYdbSetup> ydb, const TQueryRunnerSettings& settings) {
-        ydb->WaitFor(TDuration::Seconds(5), "Resource pool classifier success", [ydb, settings](TString& errorString) {
+        ydb->WaitFor(TDuration::Seconds(10), "Resource pool classifier success", [ydb, settings](TString& errorString) {
             auto result = ydb->ExecuteQuery(TSampleQueries::TSelect42::Query, settings);
 
             errorString = result.GetIssues().ToOneLineString();

ydb/tests/tools/kqprun/configuration/app_config.conf

@@ -53,6 +53,7 @@ FeatureFlags {
   EnableScriptExecutionOperations: true
   EnableExternalSourceSchemaInference: true
   EnableTempTables: true
+  EnableResourcePools: false
 }
 
 KQPConfig {