25-1: Add more tests (#19389)

Author: CyberROFL

ydb/core/tx/datashard/datashard_ut_change_exchange.cpp

@@ -3894,7 +3894,8 @@ Y_UNIT_TEST_SUITE(Cdc) {
         MustNotLoseSchemaSnapshot(true);
     }
 
-    Y_UNIT_TEST(ShouldBreakLocksOnConcurrentSchemeTx) {
+    template <typename TPrepareFunc, typename TTestFunc>
+    void ShouldBreakLocksOnConcurrentSchemeTx(TPrepareFunc prepare, TTestFunc test, Ydb::StatusIds::StatusCode finalCode = Ydb::StatusIds::ABORTED) {
         TPortManager portManager;
         TServer::TPtr server = new TServer(TServerSettings(portManager.GetPort(2134), {}, DefaultPQConfig())
             .SetUseRealThreads(false)
@@ -3911,6 +3912,8 @@ Y_UNIT_TEST_SUITE(Cdc) {
         WaitTxNotification(server, edgeActor, AsyncAlterAddStream(server, "/Root", "Table",
             Updates(NKikimrSchemeOp::ECdcStreamFormatJson)));
 
+        prepare(server, edgeActor);
+
         ExecSQL(server, edgeActor, "UPSERT INTO `/Root/Table` (key, value) VALUES (1, 10);");
 
         TString sessionId;
@@ -3921,17 +3924,89 @@ Y_UNIT_TEST_SUITE(Cdc) {
             KqpSimpleContinue(runtime, sessionId, txId, "SELECT key, value FROM `/Root/Table`;"),
             "{ items { uint32_value: 1 } items { uint32_value: 11 } }");
 
-        WaitTxNotification(server, edgeActor, AsyncAlterAddExtraColumn(server, "/Root", "Table"));
+        test(server, edgeActor);
 
         UNIT_ASSERT_VALUES_EQUAL(
             KqpSimpleCommit(runtime, sessionId, txId, "SELECT 1;"),
-            "ERROR: ABORTED");
+            Sprintf("ERROR: %s", Ydb::StatusIds::StatusCode_Name(finalCode).c_str()));
 
         WaitForContent(server, edgeActor, "/Root/Table/Stream", {
             R"({"update":{"value":10},"key":[1]})",
         });
     }
 
+    void Nop(TServer::TPtr, const TActorId&) {
+    }
+
+    Y_UNIT_TEST(ShouldBreakLocksOnConcurrentAlterTable) {
+        ShouldBreakLocksOnConcurrentSchemeTx(&Nop, [](TServer::TPtr server, const TActorId& edgeActor) {
+            WaitTxNotification(server, edgeActor, AsyncAlterAddExtraColumn(server, "/Root", "Table"));
+        });
+    }
+
+    Y_UNIT_TEST(ShouldBreakLocksOnConcurrentMoveTable) {
+        // nop: "Cannot move table with cdc streams"
+    }
+
+    void AddIndex(TServer::TPtr server, const TActorId& edgeActor) {
+        WaitTxNotification(server, edgeActor, AsyncAlterAddIndex(server, "/Root", "/Root/Table",
+            TShardedTableOptions::TIndex{"Index", {"value"}}));
+    }
+
+    Y_UNIT_TEST(ShouldBreakLocksOnConcurrentAddIndex) {
+        ShouldBreakLocksOnConcurrentSchemeTx(&Nop, &AddIndex);
+    }
+
+    Y_UNIT_TEST(ShouldBreakLocksOnConcurrentMoveIndex) {
+        ShouldBreakLocksOnConcurrentSchemeTx(&AddIndex, [](TServer::TPtr server, const TActorId& edgeActor) {
+            WaitTxNotification(server, edgeActor, AsyncMoveIndex(server, "/Root/Table", "Index", "MovedIndex"));
+        });
+    }
+
+    Y_UNIT_TEST(ShouldBreakLocksOnConcurrentDropIndex) {
+        ShouldBreakLocksOnConcurrentSchemeTx(&AddIndex, [](TServer::TPtr server, const TActorId& edgeActor) {
+            WaitTxNotification(server, edgeActor, AsyncAlterDropIndex(server, "/Root", "Table", "Index"));
+        }, Ydb::StatusIds::UNAVAILABLE);
+    }
+
+    Y_UNIT_TEST(ShouldBreakLocksOnConcurrentCancelBuildIndex) {
+        ui64 buildIndexId = 0;
+        auto addIndexWithBlock = [&buildIndexId](TServer::TPtr server, const TActorId&) {
+            auto& runtime = *server->GetRuntime();
+            TBlockEvents<TEvDataShard::TEvBuildIndexProgressResponse> blockProgress(runtime);
+            buildIndexId = AsyncAlterAddIndex(server, "/Root", "/Root/Table", TShardedTableOptions::TIndex{"Index", {"value"}});
+            runtime.WaitFor("Progress", [&]{ return blockProgress.size(); });
+            blockProgress.Stop();
+        };
+        auto cancelBuildIndex = [&buildIndexId](TServer::TPtr server, const TActorId& edgeActor) {
+            UNIT_ASSERT(buildIndexId != 0);
+            CancelAddIndex(server, "/Root", buildIndexId);
+            WaitTxNotification(server, edgeActor, buildIndexId);
+        };
+        ShouldBreakLocksOnConcurrentSchemeTx(addIndexWithBlock, cancelBuildIndex, Ydb::StatusIds::UNAVAILABLE);
+    }
+
+    void AddStream(TServer::TPtr server, const TActorId& edgeActor) {
+        WaitTxNotification(server, edgeActor, AsyncAlterAddStream(server, "/Root", "Table",
+            Updates(NKikimrSchemeOp::ECdcStreamFormatJson, "Stream2")));
+    }
+
+    Y_UNIT_TEST(ShouldBreakLocksOnConcurrentAddStream) {
+        ShouldBreakLocksOnConcurrentSchemeTx(&Nop, &AddStream);
+    }
+
+    Y_UNIT_TEST(ShouldBreakLocksOnConcurrentAlterStream) {
+        ShouldBreakLocksOnConcurrentSchemeTx(&AddStream, [](TServer::TPtr server, const TActorId& edgeActor) {
+            WaitTxNotification(server, edgeActor, AsyncAlterDisableStream(server, "/Root", "Table", "Stream2"));
+        });
+    }
+
+    Y_UNIT_TEST(ShouldBreakLocksOnConcurrentDropStream) {
+        ShouldBreakLocksOnConcurrentSchemeTx(&AddStream, [](TServer::TPtr server, const TActorId& edgeActor) {
+            WaitTxNotification(server, edgeActor, AsyncAlterDropStream(server, "/Root", "Table", "Stream2"));
+        });
+    }
+
     Y_UNIT_TEST(ResolvedTimestampsContinueAfterMerge) {
         TPortManager portManager;
         TServer::TPtr server = new TServer(TServerSettings(portManager.GetPort(2134), {}, DefaultPQConfig())

ydb/core/tx/datashard/ut_common/datashard_ut_common.cpp

@@ -1782,6 +1782,21 @@ void CancelAddIndex(Tests::TServer::TPtr server, const TString& dbName, ui64 bui
     UNIT_ASSERT_EQUAL(resp->Get()->Record.GetStatus(), Ydb::StatusIds::SUCCESS);
 }
 
+ui64 AsyncMoveIndex(
+        Tests::TServer::TPtr server,
+        const TString& tablePath,
+        const TString& srcIndexName,
+        const TString& dstIndexName)
+{
+    auto request = SchemeTxTemplate(NKikimrSchemeOp::ESchemeOpMoveIndex);
+    auto& desc = *request->Record.MutableTransaction()->MutableModifyScheme()->MutableMoveIndex();
+    desc.SetTablePath(tablePath);
+    desc.SetSrcPath(srcIndexName);
+    desc.SetDstPath(dstIndexName);
+
+    return RunSchemeTx(*server->GetRuntime(), std::move(request));
+}
+
 ui64 AsyncAlterDropIndex(
         Tests::TServer::TPtr server,
         const TString& workingDir,

ydb/core/tx/datashard/ut_common/datashard_ut_common.h

@@ -670,6 +670,12 @@ void CancelAddIndex(
         const TString& dbName,
         ui64 buildIndexId);
 
+ui64 AsyncMoveIndex(
+        Tests::TServer::TPtr server,
+        const TString& tablePath,
+        const TString& srcIndexName,
+        const TString& dstIndexName);
+
 ui64 AsyncAlterDropIndex(
         Tests::TServer::TPtr server,
         const TString& workingDir,