YQ-3555 added validations on not existing for alter/drop object

ydb/core/kqp/gateway/behaviour/resource_pool_classifier/checker.cpp

@@ -1,4 +1,5 @@
 #include "checker.h"
+#include "fetcher.h"
 
 #include <ydb/core/base/path.h>
 #include <ydb/core/cms/console/configs_dispatcher.h>
@@ -153,7 +154,7 @@ class TResourcePoolClassifierPreparationActor : public TActorBootstrapped<TResou
             return;
         }
 
-        if (ev->Get()->NumberClassifiers >= CLASSIFIER_COUNT_LIMIT) {
+        if (Context.GetActivityType() == NMetadata::NModifications::IOperationsManager::EActivityType::Create && ev->Get()->NumberClassifiers >= CLASSIFIER_COUNT_LIMIT) {
             FailAndPassAway(TStringBuilder() << "Number of resource pool classifiers reached limit in " << CLASSIFIER_COUNT_LIMIT);
             return;
         }
@@ -204,11 +205,28 @@ class TResourcePoolClassifierPreparationActor : public TActorBootstrapped<TResou
         CheckFeatureFlag(ev->Get()->Config->GetFeatureFlags());
     }
 
+    void Handle(NMetadata::NProvider::TEvRefreshSubscriberData::TPtr& ev) {
+        const auto& snapshot = ev->Get()->GetSnapshotAs<TResourcePoolClassifierSnapshot>();
+        for (const auto& objectRecord : AlterContext.GetRestoreObjectIds().GetTableRecords()) {
+            TResourcePoolClassifierConfig object;
+            TResourcePoolClassifierConfig::TDecoder::DeserializeFromRecord(object, objectRecord);
+
+            if (!snapshot->GetClassifierConfig(CanonizePath(object.GetDatabase()), object.GetName())) {
+                FailAndPassAway(TStringBuilder() << "Classifier with name " << object.GetName() << " not found in database " << object.GetDatabase());
+                return;
+            }
+        }
+
+        ExistenceChecked = true;
+        TryFinish();
+    }
+
     STRICT_STFUNC(StateFunc,
         hFunc(TEvPrivate::TEvRanksCheckerResponse, Handle);
         hFunc(TEvPrivate::TEvFetchDatabaseResponse, Handle);
         hFunc(TEvents::TEvUndelivered, Handle);
         hFunc(NConsole::TEvConfigsDispatcher::TEvGetConfigResponse, Handle);
+        hFunc(NMetadata::NProvider::TEvRefreshSubscriberData, Handle)
     )
 
 private:
@@ -237,14 +255,14 @@ class TResourcePoolClassifierPreparationActor : public TActorBootstrapped<TResou
         }
 
         Register(new TQueryRetryActor<TRanksCheckerActor, TEvPrivate::TEvRanksCheckerResponse, TString, TString, TString, std::unordered_map<i64, TString>>(
-            SelfId(), Context.GetExternalData().GetDatabase(), AlterContext.SessionId, AlterContext.TransactionId, ranksToNames
+            SelfId(), Context.GetExternalData().GetDatabase(), AlterContext.GetSessionId(), AlterContext.GetTransactionId(), ranksToNames
         ));
     }
 
     void CheckFeatureFlag(const NKikimrConfig::TFeatureFlags& featureFlags) {
         if (Context.GetActivityType() == NMetadata::NModifications::IOperationsManager::EActivityType::Drop) {
             FeatureFlagChecked = true;
-            TryFinish();
+            ValidateExistence();
             return;
         }
 
@@ -258,6 +276,16 @@ class TResourcePoolClassifierPreparationActor : public TActorBootstrapped<TResou
         }
 
         FeatureFlagChecked = true;
+        ValidateExistence();
+    }
+
+    void ValidateExistence() {
+        if (Context.GetActivityType() != NMetadata::NModifications::IOperationsManager::EActivityType::Create && NMetadata::NProvider::TServiceOperator::IsEnabled()) {
+            Send(NMetadata::NProvider::MakeServiceId(SelfId().NodeId()), new NMetadata::NProvider::TEvAskSnapshot(std::make_shared<TResourcePoolClassifierSnapshotsFetcher>()));
+            return;
+        }
+
+        ExistenceChecked = true;
         TryFinish();
     }
 
@@ -271,7 +299,7 @@ class TResourcePoolClassifierPreparationActor : public TActorBootstrapped<TResou
     }
 
     void TryFinish() {
-        if (!FeatureFlagChecked || !RanksChecked) {
+        if (!FeatureFlagChecked || !RanksChecked || !ExistenceChecked) {
             return;
         }
 
@@ -286,6 +314,7 @@ class TResourcePoolClassifierPreparationActor : public TActorBootstrapped<TResou
     bool Serverless = false;
     bool FeatureFlagChecked = false;
     bool RanksChecked = false;
+    bool ExistenceChecked = false;
 
     NMetadata::NModifications::IAlterPreparationController<TResourcePoolClassifierConfig>::TPtr Controller;
     std::vector<TResourcePoolClassifierConfig> PatchedObjects;

ydb/core/kqp/gateway/behaviour/resource_pool_classifier/snapshot.cpp

@@ -22,4 +22,16 @@ TString TResourcePoolClassifierSnapshot::DoSerializeToString() const {
     return result.GetStringRobust();
 }
 
+std::optional<TResourcePoolClassifierConfig> TResourcePoolClassifierSnapshot::GetClassifierConfig(const TString& database, const TString& name) const {
+    const auto databaseIt = ResourcePoolClassifierConfigs.find(database);
+    if (databaseIt == ResourcePoolClassifierConfigs.end()) {
+        return std::nullopt;
+    }
+    const auto configIt = databaseIt->second.find(name);
+    if (configIt == databaseIt->second.end()) {
+        return std::nullopt;
+    }
+    return configIt->second;
+}
+
 }  // namespace NKikimr::NKqp

ydb/core/kqp/gateway/behaviour/resource_pool_classifier/snapshot.h

@@ -19,6 +19,8 @@ class TResourcePoolClassifierSnapshot : public NMetadata::NFetcher::ISnapshot {
 
 public:
     using TBase::TBase;
+
+    std::optional<TResourcePoolClassifierConfig> GetClassifierConfig(const TString& database, const TString& name) const;
 };
 
 }  // namespace NKikimr::NKqp

ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp

@@ -6796,7 +6796,8 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
 
         // DROP RESOURCE POOL CLASSIFIER
         checkQuery("DROP RESOURCE POOL CLASSIFIER MyResourcePoolClassifier;",
-            EStatus::SUCCESS);
+            EStatus::GENERIC_ERROR,
+            "Classifier with name MyResourcePoolClassifier not found in database /Root");
     }
 
     Y_UNIT_TEST(ResourcePoolClassifiersValidation) {
@@ -7021,6 +7022,27 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
         }
     }
 
+    Y_UNIT_TEST(AlterNonExistingResourcePoolClassifier) {
+        NKikimrConfig::TAppConfig config;
+        config.MutableFeatureFlags()->SetEnableResourcePools(true);
+
+        TKikimrRunner kikimr(NKqp::TKikimrSettings()
+            .SetAppConfig(config)
+            .SetEnableResourcePools(true));
+
+        auto db = kikimr.GetTableClient();
+        auto session = db.CreateSession().GetValueSync().GetSession();
+
+        auto query = R"(
+            ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier
+                SET (MEMBERNAME = "test@user", RANK = 100),
+                RESET (RESOURCE_POOL);
+            )";
+        auto result = session.ExecuteSchemeQuery(query).GetValueSync();
+        UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::GENERIC_ERROR, result.GetIssues().ToString());
+        UNIT_ASSERT_STRING_CONTAINS(result.GetIssues().ToString(), "Classifier with name MyResourcePoolClassifier not found in database /Root");
+    }
+
     Y_UNIT_TEST(DropResourcePoolClassifier) {
         NKikimrConfig::TAppConfig config;
         config.MutableFeatureFlags()->SetEnableResourcePools(true);
@@ -7049,6 +7071,23 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
             UNIT_ASSERT_VALUES_EQUAL(FetchResourcePoolClassifiers(kikimr), "{\"resource_pool_classifiers\":[]}");
         }
     }
+
+    Y_UNIT_TEST(DropNonExistingResourcePoolClassifier) {
+        NKikimrConfig::TAppConfig config;
+        config.MutableFeatureFlags()->SetEnableResourcePools(true);
+
+        TKikimrRunner kikimr(NKqp::TKikimrSettings()
+            .SetAppConfig(config)
+            .SetEnableResourcePools(true));
+
+        auto db = kikimr.GetTableClient();
+        auto session = db.CreateSession().GetValueSync().GetSession();
+
+        auto query = "DROP RESOURCE POOL CLASSIFIER MyResourcePoolClassifier;";
+        auto result = session.ExecuteSchemeQuery(query).GetValueSync();
+        UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::GENERIC_ERROR, result.GetIssues().ToString());
+        UNIT_ASSERT_STRING_CONTAINS(result.GetIssues().ToString(), "Classifier with name MyResourcePoolClassifier not found in database /Root");
+    }
 }
 
 Y_UNIT_TEST_SUITE(KqpOlapScheme) {

ydb/services/metadata/manager/abstract.h

@@ -19,9 +19,17 @@ namespace NKikimr::NMetadata::NModifications {
 
 using TOperationParsingResult = TConclusion<NInternal::TTableRecord>;
 
-struct TAlterOperationContext {
-    TString SessionId;
-    TString TransactionId;
+class TAlterOperationContext {
+private:
+    YDB_READONLY_DEF(TString, SessionId);
+    YDB_READONLY_DEF(TString, TransactionId);
+    YDB_READONLY_DEF(NInternal::TTableRecords, RestoreObjectIds);
+public:
+    TAlterOperationContext(const TString& sessionId, const TString& transactionId, const NInternal::TTableRecords& RestoreObjectIds)
+        : SessionId(sessionId)
+        , TransactionId(transactionId)
+        , RestoreObjectIds(RestoreObjectIds) {
+        }
 };
 
 class TColumnInfo {

ydb/services/metadata/manager/alter_impl.h

@@ -148,8 +148,7 @@ class TModificationActorImpl: public NActors::TActorBootstrapped<TModificationAc
         if (!PrepareRestoredObjects(objects)) {
             TBase::PassAway();
         } else {
-            const TAlterOperationContext alterContext = {.SessionId = SessionId, .TransactionId = TransactionId};
-            Manager->PrepareObjectsBeforeModification(std::move(objects), InternalController, Context, alterContext);
+            Manager->PrepareObjectsBeforeModification(std::move(objects), InternalController, Context, TAlterOperationContext(SessionId, TransactionId, RestoreObjectIds));
         }
     }
 

ydb/services/metadata/manager/table_record.cpp

@@ -288,4 +288,16 @@ TTableRecords TTableRecords::SelectColumns(const std::vector<TString>& columnIds
     return result;
 }
 
+std::vector<TTableRecord> TTableRecords::GetTableRecords() const {
+    std::vector<TTableRecord> result;
+    result.reserve(Records.size());
+    for (const Ydb::Value& record : Records) {
+        result.emplace_back();
+        for (size_t i = 0; i < std::min(Columns.size(), static_cast<size_t>(record.items_size())); ++i) {
+            result.back().SetColumn(Columns[i].name(), record.items(i));
+        }
+    }
+    return result;
+}
+
 }

ydb/services/metadata/manager/table_record.h

@@ -45,6 +45,7 @@ class TTableRecords {
 
 public:
     TTableRecords SelectColumns(const std::vector<TString>& columnIds) const;
+    std::vector<TTableRecord> GetTableRecords() const;
 
     Ydb::Table::ExecuteDataQueryRequest BuildInsertQuery(const TString& tablePath) const;
     Ydb::Table::ExecuteDataQueryRequest BuildUpsertQuery(const TString& tablePath) const;