Skip to content

Fix missing SingleDeleteCF in PessimisticTransaction::LockBatch (#15511) #15531

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

Open
midverm wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix missing SingleDeleteCF in PessimisticTransaction::LockBatch (#15511) #15531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions utilities/transactions/pessimistic_transaction.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,6 +1101,11 @@ Status PessimisticTransaction::LockBatch(WriteBatch* batch,
RecordKey(column_family_id, key);
return Status::OK();
}
Status SingleDeleteCF(uint32_t column_family_id,
const Slice& key) override {
RecordKey(column_family_id, key);
return Status::OK();
}
};

// Iterating on this handler will add all keys in this batch into keys
Expand Down
54 changes: 54 additions & 0 deletions utilities/transactions/transaction_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,60 @@ TEST_P(TransactionTest, SuccessTest) {
delete txn;
}

TEST_P(TransactionTest, SingleDeleteBatchLocking) {
ColumnFamilyHandle* cf1 = nullptr;
ASSERT_OK(db->CreateColumnFamily(ColumnFamilyOptions(), "cf1", &cf1));
ColumnFamilyHandle* cf0 = db->DefaultColumnFamily();

WriteOptions write_options;
ReadOptions read_options;
std::string value;

ASSERT_OK(db->Put(write_options, cf0, "k0", "val0"));
ASSERT_OK(db->Put(write_options, cf1, "k1", "val1"));

Transaction* txn = db->BeginTransaction(write_options);
ASSERT_TRUE(txn);

ASSERT_OK(txn->GetForUpdate(read_options, cf0, "k0", &value));
ASSERT_EQ("val0", value);

// A batched SingleDelete on the key locked by txn should time out / fail
{
WriteBatch batch;
ASSERT_OK(batch.SingleDelete(cf0, "k0"));
Status s = db->Write(write_options, &batch);
ASSERT_TRUE(s.IsTimedOut() || s.IsBusy()) << s.ToString();
}

// The key must not have been deleted
ASSERT_OK(db->Get(read_options, cf0, "k0", &value));
ASSERT_EQ("val0", value);

ASSERT_OK(txn->Rollback());
delete txn;

// After rollback, batched SingleDelete on default CF succeeds
{
WriteBatch batch;
ASSERT_OK(batch.SingleDelete(cf0, "k0"));
ASSERT_OK(db->Write(write_options, &batch));
Status s = db->Get(read_options, cf0, "k0", &value);
ASSERT_TRUE(s.IsNotFound()) << s.ToString();
}

// Batched SingleDelete on non-default CF also succeeds
{
WriteBatch batch;
ASSERT_OK(batch.SingleDelete(cf1, "k1"));
ASSERT_OK(db->Write(write_options, &batch));
Status s = db->Get(read_options, cf1, "k1", &value);
ASSERT_TRUE(s.IsNotFound()) << s.ToString();
}

delete cf1;
}

TEST_P(TransactionTest, DirectWriteCommitPath) {
if (options.two_write_queues || options.unordered_write) {
ROCKSDB_GTEST_BYPASS(
Expand Down