Skip to content

Commit b95ccbf

Browse files
committed
YDB_ACCESSORs
1 parent 653229b commit b95ccbf

File tree

7 files changed

+161
-233
lines changed

7 files changed

+161
-233
lines changed

ydb/core/tx/datashard/check_write_unit.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ EExecutionStatus TCheckWriteUnit::Execute(TOperation::TPtr op,
5252

5353
TWriteOperation* writeOp = dynamic_cast<TWriteOperation*>(op.Get());
5454
Y_VERIFY_S(writeOp, "cannot cast operation of kind " << op->GetKind());
55-
auto writeTx = writeOp->WriteTx();
55+
auto writeTx = writeOp->GetWriteTx();
5656
Y_ABORT_UNLESS(writeTx);
5757
Y_ABORT_UNLESS(writeTx->Ready() || writeTx->RequirePrepare());
5858

@@ -151,7 +151,7 @@ EExecutionStatus TCheckWriteUnit::Execute(TOperation::TPtr op,
151151
return EExecutionStatus::Executed;
152152
}
153153

154-
writeOp->SetWriteResult(NEvents::TDataEvents::TEvWriteResult::BuildPrepared(writeOp->WriteTx()->TabletId(), op->GetTxId(), {op->GetMinStep(), op->GetMaxStep(), {}}));
154+
writeOp->SetWriteResult(NEvents::TDataEvents::TEvWriteResult::BuildPrepared(DataShard.TabletID(), op->GetTxId(), {op->GetMinStep(), op->GetMaxStep(), {}}));
155155
LOG_DEBUG_S(ctx, NKikimrServices::TX_DATASHARD, "Prepared " << *op << " at " << DataShard.TabletID());
156156
}
157157

ydb/core/tx/datashard/datashard_impl.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2571,7 +2571,9 @@ class TDataShard
25712571
TInstant StartedKeyAccessSamplingAt;
25722572
TInstant StopKeyAccessSamplingAt;
25732573

2574-
THashMap<ui64, TUserTable::TCPtr> TableInfos; // tableId -> local table info
2574+
using TTableInfos = THashMap<ui64, TUserTable::TCPtr>;
2575+
2576+
TTableInfos TableInfos; // tableId -> local table info
25752577
TTransQueue TransQueue;
25762578
TOutReadSets OutReadSets;
25772579
TPipeline Pipeline;

ydb/core/tx/datashard/datashard_pipeline.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1572,8 +1572,8 @@ TOperation::TPtr TPipeline::BuildOperation(NEvents::TDataEvents::TEvWrite::TPtr&
15721572
LOG_ERROR_S(TActivationContext::AsActorContext(), NKikimrServices::TX_DATASHARD, error);
15731573
};
15741574

1575-
if (!op->WriteTx()->Ready()) {
1576-
badRequest(TStringBuilder() << "Shard " << Self->TabletID() << " cannot parse tx " << op->GetTxId() << ": " << op->WriteTx()->GetError());
1575+
if (!op->GetWriteTx()->Ready()) {
1576+
badRequest(TStringBuilder() << "Shard " << Self->TabletID() << " cannot parse tx " << op->GetTxId() << ": " << op->GetWriteTx()->GetError());
15771577
return op;
15781578
}
15791579

0 commit comments

Comments
 (0)