Skip to content

If there are no commitTxIds we should clear AwaitingDecisions #18997

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 2 commits into from
May 30, 2025
Merged

If there are no commitTxIds we should clear AwaitingDecisions #18997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa22702
If there are no commitTxIds we should clear AwaitingDecisions
azevaykin May 29, 2025
e62f518
Arbiter
azevaykin May 29, 2025
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
46 changes: 46 additions & 0 deletions ydb/core/kqp/ut/effects/kqp_effects_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,52 @@ Y_UNIT_TEST_SUITE(KqpEffects) {
UNIT_ASSERT_VALUES_EQUAL(reads[0]["columns"].GetArraySafe().size(), 3);
}

Y_UNIT_TEST_TWIN(EmptyUpdate, UseSink) {
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnableOltpSink(UseSink);
auto settings = TKikimrSettings()
.SetAppConfig(appConfig)
.SetWithSampleTables(false);
TKikimrRunner kikimr(settings);
auto db = kikimr.GetTableClient();
auto session = db.CreateSession().GetValueSync().GetSession();

kikimr.GetTestServer().GetRuntime()->SetLogPriority(NKikimrServices::TX_DATASHARD, NActors::NLog::PRI_TRACE);

{
auto schemeResult = session.ExecuteSchemeQuery(R"(
--!syntax_v1
CREATE TABLE T1 (
Key Uint32,
Value Uint32,
Timestamp Timestamp,
PRIMARY KEY (Key)
);
CREATE TABLE T2 (
Key Uint32,
Value Uint32,
PRIMARY KEY (Key)
);
)").ExtractValueSync();
UNIT_ASSERT_VALUES_EQUAL_C(schemeResult.GetStatus(), EStatus::SUCCESS, schemeResult.GetIssues().ToString());
}
Cerr << "!!!UPDATE TABLE" << Endl;
{
auto result = session.ExecuteDataQuery(R"(
--!syntax_v1
$data = SELECT 1u AS Key, 1u AS Value;
UPDATE T1 ON SELECT Key, Value FROM $data;
DELETE FROM T2 WHERE Key = 1;
)", TTxControl::BeginTx().CommitTx()).ExtractValueSync();
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
}
Cerr << "!!!DROP TABLE" << Endl;
{
auto schemeResult = session.DropTable("/Root/T1").ExtractValueSync();
UNIT_ASSERT_VALUES_EQUAL_C(schemeResult.GetStatus(), EStatus::SUCCESS, schemeResult.GetIssues().ToString());
}
}

Y_UNIT_TEST_TWIN(AlterDuringUpsertTransaction, UseSink) {
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnableOltpSink(UseSink);
Expand Down
4 changes: 3 additions & 1 deletion ydb/core/tx/datashard/execute_kqp_data_tx_unit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ EExecutionStatus TExecuteKqpDataTxUnit::Execute(TOperation::TPtr op, TTransactio
// Note: any transaction (e.g. immediate or non-volatile) may decide to commit as volatile due to dependencies
// Such transactions would have no participants and become immediately committed
auto commitTxIds = dataTx->GetVolatileCommitTxIds();
if (commitTxIds) {
if (commitTxIds || isArbiter) {
TVector<ui64> participants(awaitingDecisions.begin(), awaitingDecisions.end());
DataShard.GetVolatileTxManager().PersistAddVolatileTx(
txId,
Expand All @@ -362,6 +362,8 @@ EExecutionStatus TExecuteKqpDataTxUnit::Execute(TOperation::TPtr op, TTransactio
dataTx->GetVolatileCommitOrdered(),
isArbiter,
txc);
} else {
awaitingDecisions.clear();
}

if (dataTx->GetPerformedUserReads()) {
Expand Down
4 changes: 3 additions & 1 deletion ydb/core/tx/datashard/execute_write_unit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ class TExecuteWriteUnit : public TExecutionUnit {
// Note: any transaction (e.g. immediate or non-volatile) may decide to commit as volatile due to dependencies
// Such transactions would have no participants and become immediately committed
auto commitTxIds = userDb.GetVolatileCommitTxIds();
if (commitTxIds) {
if (commitTxIds || isArbiter) {
TVector<ui64> participants(awaitingDecisions.begin(), awaitingDecisions.end());
DataShard.GetVolatileTxManager().PersistAddVolatileTx(
userDb.GetVolatileTxId(),
Expand All @@ -449,6 +449,8 @@ class TExecuteWriteUnit : public TExecutionUnit {
isArbiter,
txc
);
} else {
awaitingDecisions.clear();
}

if (userDb.GetPerformedUserReads()) {
Expand Down
3 changes: 0 additions & 3 deletions ydb/core/tx/datashard/volatile_tx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,9 +519,6 @@ namespace NKikimr::NDataShard {
{
using Schema = TDataShard::Schema;

Y_ENSURE(!commitTxIds.empty(),
"Unexpected volatile txId# " << txId << " @" << version << " without commits");

auto res = VolatileTxs.insert(
std::make_pair(txId, std::make_unique<TVolatileTxInfo>()));
Y_ENSURE(res.second, "Cannot add volatile txId# " << txId << " @" << version
Expand Down
Loading