aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzverevgeny <zverevgeny@ydb.tech>2025-03-14 08:27:07 +0300
committerGitHub <noreply@github.com>2025-03-14 08:27:07 +0300
commita520c9e013e4e878b493e5ddd954b90e221ced36 (patch)
tree5178b1f9e61759cb0c945a1014abda264407d2e5
parentcfb40786c7f9252db05044dce043381a9a23d8d5 (diff)
downloadydb-a520c9e013e4e878b493e5ddd954b90e221ced36.tar.gz
Use TEvNotifyTxCompletion in CS ut (#15699)
-rw-r--r--ydb/core/tx/columnshard/test_helper/columnshard_ut_common.cpp10
-rw-r--r--ydb/core/tx/columnshard/transactions/operators/schema.h3
2 files changed, 5 insertions, 8 deletions
diff --git a/ydb/core/tx/columnshard/test_helper/columnshard_ut_common.cpp b/ydb/core/tx/columnshard/test_helper/columnshard_ut_common.cpp
index ccde6657af..833a430a4f 100644
--- a/ydb/core/tx/columnshard/test_helper/columnshard_ut_common.cpp
+++ b/ydb/core/tx/columnshard/test_helper/columnshard_ut_common.cpp
@@ -67,6 +67,9 @@ bool ProposeSchemaTx(TTestBasicRuntime& runtime, TActorId& sender, const TString
}
void PlanSchemaTx(TTestBasicRuntime& runtime, const TActorId& sender, NOlap::TSnapshot snap) {
+ auto evSubscribe = std::make_unique<TEvColumnShard::TEvNotifyTxCompletion>(snap.GetTxId());
+ ForwardToTablet(runtime, TTestTxConfig::TxTablet0, sender, evSubscribe.release());
+
auto plan = std::make_unique<TEvTxProcessing::TEvPlanStep>(snap.GetPlanStep(), 0, TTestTxConfig::TxTablet0);
auto tx = plan->Record.AddTransactions();
tx->SetTxId(snap.GetTxId());
@@ -74,11 +77,8 @@ void PlanSchemaTx(TTestBasicRuntime& runtime, const TActorId& sender, NOlap::TSn
ForwardToTablet(runtime, TTestTxConfig::TxTablet0, sender, plan.release());
UNIT_ASSERT(runtime.GrabEdgeEvent<TEvTxProcessing::TEvPlanStepAck>(sender));
- auto ev = runtime.GrabEdgeEvent<TEvColumnShard::TEvProposeTransactionResult>(sender);
- const auto& res = ev->Get()->Record;
- UNIT_ASSERT_EQUAL(res.GetTxId(), snap.GetTxId());
- UNIT_ASSERT_EQUAL(res.GetTxKind(), NKikimrTxColumnShard::TX_KIND_SCHEMA);
- UNIT_ASSERT_EQUAL(res.GetStatus(), NKikimrTxColumnShard::SUCCESS);
+ auto ev = runtime.GrabEdgeEvent<TEvColumnShard::TEvNotifyTxCompletionResult>(sender);
+ UNIT_ASSERT_EQUAL(ev->Get()->Record.GetTxId(), snap.GetTxId());
}
void PlanWriteTx(TTestBasicRuntime& runtime, const TActorId& sender, NOlap::TSnapshot snap, bool waitResult) {
diff --git a/ydb/core/tx/columnshard/transactions/operators/schema.h b/ydb/core/tx/columnshard/transactions/operators/schema.h
index df0b8aedb0..f185b0f77d 100644
--- a/ydb/core/tx/columnshard/transactions/operators/schema.h
+++ b/ydb/core/tx/columnshard/transactions/operators/schema.h
@@ -104,9 +104,6 @@ public:
ctx.Send(subscriber, event.Release(), 0, 0);
}
- auto result = std::make_unique<TEvColumnShard::TEvProposeTransactionResult>(owner.TabletID(), TxInfo.TxKind, TxInfo.TxId, NKikimrTxColumnShard::SUCCESS);
- result->Record.SetStep(TxInfo.PlanStep);
- ctx.Send(TxInfo.Source, result.release(), 0, TxInfo.Cookie);
return true;
}