Fixed EnableOnServerless validation

Author: GrigoriyPA

ydb/core/kqp/workload_service/actors/scheme_actors.cpp

@@ -138,17 +138,23 @@ class TPoolFetcherActor : public TSchemeActorBase<TPoolFetcherActor> {
 
     void Handle(TEvTxProxySchemeCache::TEvNavigateKeySetResult::TPtr& ev) {
         const auto& results = ev->Get()->Request->ResultSet;
-        if (results.size() != 1) {
+        if (results.size() != 2) {
             Reply(Ydb::StatusIds::INTERNAL_ERROR, "Unexpected scheme cache response");
             return;
         }
 
-        const auto& result = results[0];
-        if (!EnableOnServerless && result.DomainInfo && result.DomainInfo->IsServerless()) {
+        const auto& databaseResult = results[1];
+        if (!databaseResult.DomainInfo) {
+            Reply(Ydb::StatusIds::NOT_FOUND, TStringBuilder() << "Database with name " << Database << " not found or you don't have access permissions");
+            return;
+        }
+
+        if (!EnableOnServerless && databaseResult.DomainInfo->IsServerless()) {
             Reply(Ydb::StatusIds::UNSUPPORTED, "Resource pools are disabled for serverless domains. Please contact your system administrator to enable it");
             return;
         }
 
+        const auto& result = results[0];
         switch (result.Status) {
             case EStatus::Unknown:
             case EStatus::PathNotTable:
@@ -187,12 +193,12 @@ class TPoolFetcherActor : public TSchemeActorBase<TPoolFetcherActor> {
     void StartRequest() override {
         LOG_D("Start pool fetching");
         auto event = NTableCreator::BuildSchemeCacheNavigateRequest(
-            {{".resource_pools", PoolId}},
+            {{".resource_pools", PoolId}, {}},
             Database,
-            UserToken
+            UserToken,
+            NSchemeCache::TSchemeCacheNavigate::OpPath
         );
         event->ResultSet[0].Access |= NACLib::SelectRow;
-        event->ResultSet[0].Operation = NSchemeCache::TSchemeCacheNavigate::OpPath;
         Send(MakeSchemeCacheID(), new TEvTxProxySchemeCache::TEvNavigateKeySet(event.Release()), IEventHandle::FlagTrackDelivery);
     }
 

ydb/library/table_creator/table_creator.cpp

@@ -388,7 +388,7 @@ using TTableCreatorRetryPolicy = IRetryPolicy<bool>;
 
 namespace NTableCreator {
 
-THolder<NSchemeCache::TSchemeCacheNavigate> BuildSchemeCacheNavigateRequest(const TVector<TVector<TString>>& pathsComponents, const TString& database, TIntrusiveConstPtr<NACLib::TUserToken> userToken) {
+THolder<NSchemeCache::TSchemeCacheNavigate> BuildSchemeCacheNavigateRequest(const TVector<TVector<TString>>& pathsComponents, const TString& database, TIntrusiveConstPtr<NACLib::TUserToken> userToken, NSchemeCache::TSchemeCacheNavigate::EOp operation) {
     auto request = MakeHolder<NSchemeCache::TSchemeCacheNavigate>();
     auto databasePath = SplitPath(database);
     request->DatabaseName = CanonizePath(databasePath);
@@ -398,7 +398,7 @@ THolder<NSchemeCache::TSchemeCacheNavigate> BuildSchemeCacheNavigateRequest(cons
 
     for (const auto& pathComponents : pathsComponents) {
         auto& entry = request->ResultSet.emplace_back();
-        entry.Operation = NSchemeCache::TSchemeCacheNavigate::OpTable;
+        entry.Operation = operation;
         entry.RequestType = NSchemeCache::TSchemeCacheNavigate::TEntry::ERequestType::ByPath;
         entry.ShowPrivatePath = true;
         entry.Path = databasePath;
@@ -408,8 +408,8 @@ THolder<NSchemeCache::TSchemeCacheNavigate> BuildSchemeCacheNavigateRequest(cons
     return request;
 }
 
-THolder<NSchemeCache::TSchemeCacheNavigate> BuildSchemeCacheNavigateRequest(const TVector<TVector<TString>>& pathsComponents) {
-    return BuildSchemeCacheNavigateRequest(pathsComponents, AppData()->TenantName, nullptr);
+THolder<NSchemeCache::TSchemeCacheNavigate> BuildSchemeCacheNavigateRequest(const TVector<TVector<TString>>& pathsComponents, NSchemeCache::TSchemeCacheNavigate::EOp operation) {
+    return BuildSchemeCacheNavigateRequest(pathsComponents, AppData()->TenantName, nullptr, operation);
 }
 
 NKikimrSchemeOp::TColumnDescription TMultiTableCreator::Col(const TString& columnName, const char* columnType) {

ydb/library/table_creator/table_creator.h

@@ -66,8 +66,8 @@ class TMultiTableCreator : public NActors::TActorBootstrapped<TMultiTableCreator
     NYql::TIssues Issues;
 };
 
-THolder<NSchemeCache::TSchemeCacheNavigate> BuildSchemeCacheNavigateRequest(const TVector<TVector<TString>>& pathsComponents, const TString& database, TIntrusiveConstPtr<NACLib::TUserToken> userToken);
-THolder<NSchemeCache::TSchemeCacheNavigate> BuildSchemeCacheNavigateRequest(const TVector<TVector<TString>>& pathsComponents);
+THolder<NSchemeCache::TSchemeCacheNavigate> BuildSchemeCacheNavigateRequest(const TVector<TVector<TString>>& pathsComponents, const TString& database, TIntrusiveConstPtr<NACLib::TUserToken> userToken, NSchemeCache::TSchemeCacheNavigate::EOp operation = NSchemeCache::TSchemeCacheNavigate::OpTable);
+THolder<NSchemeCache::TSchemeCacheNavigate> BuildSchemeCacheNavigateRequest(const TVector<TVector<TString>>& pathsComponents, NSchemeCache::TSchemeCacheNavigate::EOp operation = NSchemeCache::TSchemeCacheNavigate::OpTable);
 
 } // namespace NTableCreator