Skip to content
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.

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

ut for deleting absent rows #13172

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/config/muted_ya.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ ydb/core/keyvalue/ut_trace TKeyValueTracingTest.WriteSmall
ydb/core/kqp/ut/cost KqpCost.OlapWriteRow
ydb/core/kqp/ut/data_integrity KqpDataIntegrityTrails.Select
ydb/core/kqp/ut/data_integrity KqpDataIntegrityTrails.UpsertEvWrite
ydb/core/kqp/ut/olap KqpOlap.DeleteAbsent+Reboot
ydb/core/kqp/ut/olap KqpDecimalColumnShard.TestAggregation
ydb/core/kqp/ut/olap KqpDecimalColumnShard.TestFilterCompare
ydb/core/kqp/ut/olap KqpOlap.ManyColumnShardsWithRestarts
Expand Down
30 changes: 30 additions & 0 deletions ydb/core/kqp/ut/olap/kqp_olap_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2991,6 +2991,36 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
.GetValueSync();
UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::SUCCESS);
}

Y_UNIT_TEST_TWIN(DeleteAbsent, Reboot) {
//This test tries to DELETE from a table with WHERE condition that matches no rows
//It corresponds to a SCAN, then NO write then COMMIT
auto csController = NYDBTest::TControllers::RegisterCSControllerGuard<NYDBTest::NColumnShard::TController>();

NKikimrConfig::TAppConfig appConfig;
auto settings = TKikimrSettings().SetAppConfig(appConfig).SetWithSampleTables(false);
TTestHelper testHelper(settings);

TVector<TTestHelper::TColumnSchema> schema = {
TTestHelper::TColumnSchema().SetName("id").SetType(NScheme::NTypeIds::Int64).SetNullable(false),
TTestHelper::TColumnSchema().SetName("value").SetType(NScheme::NTypeIds::Int32).SetNullable(true),
};
TTestHelper::TColumnTable testTable;
testTable.SetName("/Root/ttt").SetPrimaryKey({ "id" }).SetSharding({ "id" }).SetSchema(schema);
testHelper.CreateTable(testTable);

if (Reboot) {
csController->SetRestartOnLocalTxCommitted("TProposeWriteTransaction");
}
auto client = testHelper.GetKikimr().GetQueryClient();
const auto resultDelete =
client
.ExecuteQuery(
"DELETE from `/Root/ttt` WHERE value % 2 == 1;",
NYdb::NQuery::TTxControl::BeginTx().CommitTx())
.GetValueSync();
UNIT_ASSERT_C(resultDelete.IsSuccess(), resultDelete.GetIssues().ToString());
}
}

}
10 changes: 5 additions & 5 deletions ydb/core/tx/columnshard/columnshard__write.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -376,19 +376,19 @@ class TCommitOperation {
ui64 ArbiterColumnShard = 0;
};

class TProposeWriteTransaction: public NTabletFlatExecutor::TTransactionBase<TColumnShard> {
class TProposeWriteTransaction: public TExtendedTransactionBase {
private:
using TBase = NTabletFlatExecutor::TTransactionBase<TColumnShard>;
using TBase = TExtendedTransactionBase;

public:
TProposeWriteTransaction(TColumnShard* self, TCommitOperation::TPtr op, const TActorId source, const ui64 cookie)
: TBase(self)
: TBase(self, "TProposeWriteTransaction")
, WriteCommit(op)
, Source(source)
, Cookie(cookie) {
}

virtual bool Execute(TTransactionContext& txc, const TActorContext&) override {
virtual bool DoExecute(TTransactionContext& txc, const TActorContext&) override {
NKikimrTxColumnShard::TCommitWriteTxBody proto;
NKikimrTxColumnShard::ETransactionKind kind;
if (WriteCommit->NeedSyncLocks()) {
Expand All @@ -407,7 +407,7 @@ class TProposeWriteTransaction: public NTabletFlatExecutor::TTransactionBase<TCo
return true;
}

virtual void Complete(const TActorContext& ctx) override {
virtual void DoComplete(const TActorContext& ctx) override {
Self->GetProgressTxController().FinishProposeOnComplete(WriteCommit->GetTxId(), ctx);
}
TTxType GetTxType() const override {
Expand Down
7 changes: 7 additions & 0 deletions ydb/core/tx/columnshard/hooks/abstract/abstract.h
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,13 @@ class ICSController {
virtual void OnCleanupActors(const ui64 tabletId) {
Y_UNUSED(tabletId);
}

virtual void OnAfterLocalTxCommitted(const NActors::TActorContext& ctx, const NColumnShard::TColumnShard& shard, const TString& txInfo) {
Y_UNUSED(ctx);
Y_UNUSED(shard);
Y_UNUSED(txInfo);
}

};

class TControllers {
Expand Down
6 changes: 6 additions & 0 deletions ydb/core/tx/columnshard/hooks/testing/controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,10 @@ ::NKikimr::NColumnShard::TBlobPutResult::TPtr TController::OverrideBlobPutResult
return result;
}

void TController::OnAfterLocalTxCommitted(const NActors::TActorContext& ctx, const ::NKikimr::NColumnShard::TColumnShard& shard, const TString& txInfo) {
if (RestartOnLocalDbTxCommitted == txInfo) {
ctx.Send(shard.SelfId(), new TEvents::TEvPoisonPill{});
}
}

} // namespace NKikimr::NYDBTest::NColumnShard
9 changes: 9 additions & 0 deletions ydb/core/tx/columnshard/hooks/testing/controller.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ class TController: public TReadOnlyController {
void CheckInvariants(const ::NKikimr::NColumnShard::TColumnShard& shard, TCheckContext& context) const;

THashSet<TString> SharingIds;

std::optional<TString> RestartOnLocalDbTxCommitted;
protected:
virtual const NOlap::NSplitter::TSplitSettings& DoGetBlobSplitSettings(const NOlap::NSplitter::TSplitSettings& defaultValue) const override {
if (OverrideBlobSplitSettings) {
Expand Down Expand Up @@ -281,6 +283,13 @@ class TController: public TReadOnlyController {
TGuard<TMutex> g(ActiveTabletsMutex);
return ActiveTablets.contains(tabletId);
}

void SetRestartOnLocalTxCommitted(std::optional<TString> txInfo) {
RestartOnLocalDbTxCommitted = std::move(txInfo);
}

virtual void OnAfterLocalTxCommitted(const NActors::TActorContext& ctx, const ::NKikimr::NColumnShard::TColumnShard& shard, const TString& txInfo) override;

};

}
1 change: 1 addition & 0 deletions ydb/core/tx/columnshard/tablet/ext_tx_base.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ bool TExtendedTransactionBase::Execute(NTabletFlatExecutor::TTransactionContext&
void TExtendedTransactionBase::Complete(const NActors::TActorContext& ctx) {
NActors::TLogContextGuard logGuard = NActors::TLogContextBuilder::Build()("tablet_id", Self->TabletID())("local_tx_no", TabletTxNo)("method", "complete")("tx_info", TxInfo);
DoComplete(ctx);
NYDBTest::TControllers::GetColumnShardController()->OnAfterLocalTxCommitted(ctx, *Self, TxInfo);
}

TExtendedTransactionBase::TExtendedTransactionBase(TColumnShard* self, const TString& txInfo)
Expand Down
Loading