fix: more fixes

dragonflydb · Feb 4, 2024 · bc52151 · bc52151
1 parent 7e699f9
commit bc52151
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/server/multi_test.cc b/src/server/multi_test.cc
@@ -540,11 +540,18 @@ TEST_F(MultiTest, MultiSingleHop) {
  for (unsigned i = 0; i < 100; i++) {
  Run({"multi"});
  Run({"rpush", "a", "bar"});
+ Run({"rpush", "a", "baz"});
  Run({"exec"});
  }
  });
-
  fb0.Join();
+
+ // Check list consistency
+ auto res = Run({"lrange", "a", "0", "-1"});
+ auto list = res.GetVec();
+ for (size_t i = 0; i < 200; i++)
+ EXPECT_EQ(list[i], i % 2 == 0 ? "bar" : "baz");
+
  auto metrics = GetMetrics();
 
  int mode = absl::GetFlag(FLAGS_multi_exec_mode);

diff --git a/src/server/transaction.cc b/src/server/transaction.cc
@@ -134,7 +134,7 @@ Transaction::Transaction(const CommandId* cid) : cid_{cid} {
  }
 }
 
-Transaction::Transaction(const Transaction* parent, ShardId shard_id, std::optional<SlotId> slot_id)
+Transaction::Transaction(const Transaction* parent, ShardId shard_id)
  : multi_{make_unique<MultiData>()},
  txid_{parent->txid()},
  unique_shard_cnt_{1},

diff --git a/src/server/transaction.h b/src/server/transaction.h
@@ -170,7 +170,7 @@ class Transaction {
  explicit Transaction(const CommandId* cid);
 
  // Initialize transaction for squashing placed on a specific shard with a given parent tx
- explicit Transaction(const Transaction* parent, ShardId shard_id, std::optional<SlotId> slot_id);
+ explicit Transaction(const Transaction* parent, ShardId shard_id);
 
  // Initialize from command (args) on specific db.
  OpStatus InitByArgs(DbIndex index, CmdArgList args);