Skip to content

Commit 61f8e10

Browse files
committed
fix asc
1 parent c341e95 commit 61f8e10

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

utilities/transactions/transaction_test.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9488,7 +9488,7 @@ TEST_P(CommitBypassMemtableTest, MergeAndMultiCF) {
94889488
TransactionOptions txn_opts;
94899489
txn_opts.commit_bypass_memtable = true;
94909490
Transaction* txn = txn_db->BeginTransaction(wopts, txn_opts);
9491-
txn->SetName("xid1");
9491+
ASSERT_OK(txn->SetName("xid1"));
94929492
ASSERT_OK(txn->Put(handles_[0], "k1", "v1"));
94939493
ASSERT_OK(txn->Merge(handles_[0], "k1", "v2"));
94949494

@@ -9521,7 +9521,7 @@ TEST_P(CommitBypassMemtableTest, MergeAndMultiCF) {
95219521
// Data in mutable memtable
95229522
txn_opts.commit_bypass_memtable = false;
95239523
txn = txn_db->BeginTransaction(wopts, txn_opts, txn);
9524-
txn->SetName("xid2");
9524+
ASSERT_OK(txn->SetName("xid2"));
95259525
ASSERT_OK(txn->Merge(handles_[0], "k1", "v3"));
95269526
ASSERT_OK(txn->Merge(handles_[1], "count", buf_count));
95279527
ASSERT_OK(txn->Prepare());
@@ -9609,7 +9609,7 @@ TEST_P(CommitBypassMemtableTest, MergeMiniStress) {
96099609
std::unique_ptr<Transaction> txn{
96109610
txn_db->BeginTransaction(wopts, txn_opts)};
96119611
const int txn_count = i / kBatchSize;
9612-
txn->SetName("xid" + std::to_string(txn_count));
9612+
ASSERT_OK(txn->SetName("xid" + std::to_string(txn_count)));
96139613

96149614
const Snapshot* snapshot = txn_db->GetSnapshot();
96159615
// Remember the state for the snapshot

utilities/write_batch_with_index/write_batch_with_index_test.cc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4166,26 +4166,26 @@ TEST_F(WBWIMemTableTest, WBWIMemTableWithMerge) {
41664166
wbwi_mem->AssignSequenceNumbers(assigned_seq);
41674167

41684168
// Update then Merge
4169-
wbwi->Put("a", "a1");
4170-
wbwi->Merge("a", "a2");
4171-
wbwi->Merge("a", "a3");
4172-
wbwi->Delete("b");
4173-
wbwi->Merge("b", "b1");
4169+
ASSERT_OK(wbwi->Put("a", "a1"));
4170+
ASSERT_OK(wbwi->Merge("a", "a2"));
4171+
ASSERT_OK(wbwi->Merge("a", "a3"));
4172+
ASSERT_OK(wbwi->Delete("b"));
4173+
ASSERT_OK(wbwi->Merge("b", "b1"));
41744174

41754175
// Merge then Update
4176-
wbwi->Merge("c", "c1");
4177-
wbwi->Put("c", "c2");
4178-
wbwi->Merge("d", "d1");
4179-
wbwi->Merge("d", "d2");
4180-
wbwi->Delete("d");
4176+
ASSERT_OK(wbwi->Merge("c", "c1"));
4177+
ASSERT_OK(wbwi->Put("c", "c2"));
4178+
ASSERT_OK(wbwi->Merge("d", "d1"));
4179+
ASSERT_OK(wbwi->Merge("d", "d2"));
4180+
ASSERT_OK(wbwi->Delete("d"));
41814181

41824182
// Just Merge
4183-
wbwi->Merge("e", "e1");
4184-
wbwi->Merge("f", "f1");
4185-
wbwi->Merge("f", "f2");
4183+
ASSERT_OK(wbwi->Merge("e", "e1"));
4184+
ASSERT_OK(wbwi->Merge("f", "f1"));
4185+
ASSERT_OK(wbwi->Merge("f", "f2"));
41864186

41874187
// Just Update
4188-
wbwi->SingleDelete("g");
4188+
ASSERT_OK(wbwi->SingleDelete("g"));
41894189

41904190
// key <-> val
41914191
// Refer to the sequence number assignment method described in the comments

0 commit comments

Comments
 (0)