aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornsofya <nsofya@yandex-team.com>2023-07-17 15:10:36 +0300
committernsofya <nsofya@yandex-team.com>2023-07-17 15:10:36 +0300
commit014ff1fcc2d92fee3ff2096f203a4bc561f79b83 (patch)
treee136d5c594aa9ba907d1181009390f500a6e396c
parent99b614f1ffe19d480452329313d26c235c8ba9ca (diff)
downloadydb-014ff1fcc2d92fee3ff2096f203a4bc561f79b83.tar.gz
Remove TX_KIND_DATA processing
-rw-r--r--ydb/core/tx/columnshard/columnshard__progress_tx.cpp25
-rw-r--r--ydb/core/tx/columnshard/columnshard__propose_transaction.cpp44
-rw-r--r--ydb/core/tx/columnshard/columnshard_impl.h1
3 files changed, 0 insertions, 70 deletions
diff --git a/ydb/core/tx/columnshard/columnshard__progress_tx.cpp b/ydb/core/tx/columnshard/columnshard__progress_tx.cpp
index e3a71ca589..203cf8f721 100644
--- a/ydb/core/tx/columnshard/columnshard__progress_tx.cpp
+++ b/ydb/core/tx/columnshard/columnshard__progress_tx.cpp
@@ -101,31 +101,6 @@ public:
auto& txInfo = Self->BasicTxInfo.at(txId);
switch (txInfo.TxKind) {
- case NKikimrTxColumnShard::TX_KIND_DATA:
- {
- NKikimrTxDataShard::TDataTransaction dataTransaction;
- Y_VERIFY(dataTransaction.ParseFromString(db.Table<Schema::TxInfo>().Key(txId).Select().GetValue<Schema::TxInfo::TxBody>()));
- {
- for (auto&& task : dataTransaction.GetKqpTransaction().GetTasks()) {
- for (auto&& o : task.GetOutputs()) {
- for (auto&& c : o.GetChannels()) {
- TActorId actorId(c.GetDstEndpoint().GetActorId().GetRawX1(), c.GetDstEndpoint().GetActorId().GetRawX2());
- {
- NYql::NDqProto::TEvComputeChannelData evProto;
- evProto.MutableChannelData()->SetChannelId(c.GetId());
- evProto.MutableChannelData()->SetFinished(true);
- evProto.SetNoAck(true);
- evProto.SetSeqNo(1);
- auto ev = std::make_unique<NYql::NDq::TEvDqCompute::TEvChannelData>();
- ev->Record = evProto;
- ctx.Send(actorId, ev.release());
- }
- }
- }
- }
- }
- break;
- }
case NKikimrTxColumnShard::TX_KIND_SCHEMA:
{
auto& meta = Self->AltersInFlight.at(txId);
diff --git a/ydb/core/tx/columnshard/columnshard__propose_transaction.cpp b/ydb/core/tx/columnshard/columnshard__propose_transaction.cpp
index df70479a5f..a8f8a500c7 100644
--- a/ydb/core/tx/columnshard/columnshard__propose_transaction.cpp
+++ b/ydb/core/tx/columnshard/columnshard__propose_transaction.cpp
@@ -220,50 +220,6 @@ bool TTxProposeTransaction::Execute(TTransactionContext& txc, const TActorContex
status = NKikimrTxColumnShard::EResultStatus::PREPARED;
break;
}
- case NKikimrTxColumnShard::TX_KIND_DATA: {
- NKikimrTxDataShard::TDataTransaction dataTransaction;
- Y_VERIFY(dataTransaction.ParseFromString(record.GetTxBody()));
-
- LOG_S_DEBUG(TxPrefix() << "immediate data tx txId " << txId
- << " '" << dataTransaction.DebugString()
- << TxSuffix());
-
- bool isImmediate = record.GetFlags() & NKikimrTxColumnShard::ETransactionFlag::TX_FLAG_IMMEDIATE;
- if (isImmediate) {
- for (auto&& task : dataTransaction.GetKqpTransaction().GetTasks()) {
- for (auto&& o : task.GetOutputs()) {
- for (auto&& c : o.GetChannels()) {
- TActorId actorId(c.GetDstEndpoint().GetActorId().GetRawX1(),
- c.GetDstEndpoint().GetActorId().GetRawX2());
- NYql::NDqProto::TEvComputeChannelData evProto;
- evProto.MutableChannelData()->SetChannelId(c.GetId());
- evProto.MutableChannelData()->SetFinished(true);
- evProto.SetNoAck(true);
- evProto.SetSeqNo(1);
- auto ev = std::make_unique<NYql::NDq::TEvDqCompute::TEvChannelData>();
- ev->Record = evProto;
- ctx.Send(actorId, ev.release());
- }
- }
- }
- status = NKikimrTxColumnShard::EResultStatus::SUCCESS;
- } else {
-#if 0 // TODO
- minStep = Self->GetAllowedStep();
- maxStep = minStep + Self->MaxCommitTxDelay.MilliSeconds();
- auto& txInfo = Self->BasicTxInfo[txId];
- txInfo.TxId = txId;
- txInfo.TxKind = txKind;
- txInfo.Source = Ev->Get()->GetSource();
- txInfo.Cookie = Ev->Cookie;
- Schema::SaveTxInfo(db, txInfo.TxId, txInfo.TxKind, txBody, txInfo.MaxStep, txInfo.Source, txInfo.Cookie);
-#endif
- statusMessage = TStringBuilder() << "Planned data tx is not supported at ColumnShard txId "
- << txId << " '" << dataTransaction.DebugString() << "'";
- //status = NKikimrTxColumnShard::EResultStatus::PREPARED;
- }
- break;
- }
case NKikimrTxColumnShard::TX_KIND_TTL: {
/// @note There's no tx guaranties now. For now TX_KIND_TTL is used to trigger TTL in tests only.
/// In future we could trigger TTL outside of tablet. Then we need real tx with complete notification.
diff --git a/ydb/core/tx/columnshard/columnshard_impl.h b/ydb/core/tx/columnshard/columnshard_impl.h
index 7601d2f5e6..584497c918 100644
--- a/ydb/core/tx/columnshard/columnshard_impl.h
+++ b/ydb/core/tx/columnshard/columnshard_impl.h
@@ -117,7 +117,6 @@ class TColumnShard
friend class TTxNotifyTxCompletion;
friend class TTxPlanStep;
friend class TTxWrite;
- friend class TTxCleanInserted;
friend class TTxReadBase;
friend class TTxRead;
friend class TTxScan;