Skip to content

Rename op -> writeOp #715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
azevaykin merged 7 commits into from
Dec 26, 2023
Merged

Rename op -> writeOp #715

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3c6bb76
Remove TabletId from TValidatedDataTx
azevaykin Dec 22, 2023
31de4ba
Merge branch 'ydb-platform:main' into main
azevaykin Dec 25, 2023
aae42dc
Merge branch 'ydb-platform:main' into main
azevaykin Dec 25, 2023
0f4d43a
Merge branch 'ydb-platform:main' into main
azevaykin Dec 25, 2023
bd40c0d
Merge branch 'ydb-platform:main' into main
azevaykin Dec 25, 2023
c3344ba
Merge branch 'ydb-platform:main' into main
azevaykin Dec 26, 2023
5be161a
Rename op -> writeOp
azevaykin Dec 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions ydb/core/tx/datashard/datashard_pipeline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1564,47 +1564,50 @@ TOperation::TPtr TPipeline::BuildOperation(NEvents::TDataEvents::TEvWrite::TPtr&
{
const auto& rec = ev->Get()->Record;
TBasicOpInfo info(rec.GetTxId(), EOperationKind::DataTx, EvWrite::Convertor::GetProposeFlags(rec.GetTxMode()), 0, receivedAt, tieBreakerIndex);
auto op = MakeIntrusive<TWriteOperation>(info, ev, Self, txc, ctx);
op->OperationSpan = NWilson::TSpan(TWilsonTablet::Tablet, std::move(traceId), "WriteOperation", NWilson::EFlags::AUTO_END);
auto writeOp = MakeIntrusive<TWriteOperation>(info, ev, Self, txc, ctx);
auto writeTx = writeOp->GetWriteTx();
Y_ABORT_UNLESS(writeTx);

writeOp->OperationSpan = NWilson::TSpan(TWilsonTablet::Tablet, std::move(traceId), "WriteOperation", NWilson::EFlags::AUTO_END);

auto badRequest = [&](const TString& error) {
op->SetError(NKikimrDataEvents::TEvWriteResult::STATUS_BAD_REQUEST, error, Self->TabletID());
writeOp->SetError(NKikimrDataEvents::TEvWriteResult::STATUS_BAD_REQUEST, error, Self->TabletID());
LOG_ERROR_S(TActivationContext::AsActorContext(), NKikimrServices::TX_DATASHARD, error);
};

if (!op->GetWriteTx()->Ready()) {
badRequest(TStringBuilder() << "Shard " << Self->TabletID() << " cannot parse tx " << op->GetTxId() << ": " << op->GetWriteTx()->GetError());
return op;
if (!writeTx->Ready()) {
badRequest(TStringBuilder() << "Shard " << Self->TabletID() << " cannot parse tx " << writeOp->GetTxId() << ": " << writeOp->GetWriteTx()->GetError());
return writeOp;
}

op->ExtractKeys();
writeOp->ExtractKeys();

switch (rec.txmode()) {
case NKikimrDataEvents::TEvWrite::MODE_PREPARE:
break;
case NKikimrDataEvents::TEvWrite::MODE_VOLATILE_PREPARE:
op->SetVolatilePrepareFlag();
writeOp->SetVolatilePrepareFlag();
break;
case NKikimrDataEvents::TEvWrite::MODE_IMMEDIATE:
op->SetImmediateFlag();
writeOp->SetImmediateFlag();
break;
default:
badRequest(TStringBuilder() << "Unknown txmode: " << rec.txmode());
return op;
return writeOp;
}

// Make config checks for immediate op.
if (op->IsImmediate()) {
if (writeOp->IsImmediate()) {
if (Config.NoImmediate() || (Config.ForceOnlineRW())) {
LOG_INFO_S(TActivationContext::AsActorContext(), NKikimrServices::TX_DATASHARD, "Shard " << Self->TabletID() << " force immediate op " << op->GetTxId() << " to online according to config");
op->SetForceOnlineFlag();
LOG_INFO_S(TActivationContext::AsActorContext(), NKikimrServices::TX_DATASHARD, "Shard " << Self->TabletID() << " force immediate writeOp " << writeOp->GetTxId() << " to online according to config");
writeOp->SetForceOnlineFlag();
} else {
if (Config.DirtyImmediate())
op->SetForceDirtyFlag();
writeOp->SetForceDirtyFlag();
}
}

return op;
return writeOp;
}

void TPipeline::BuildDataTx(TActiveTransaction *tx, TTransactionContext &txc, const TActorContext &ctx)
Expand Down