fix: merge fixes

dragonflydb · Mar 7, 2024 · 7a77db2 · 7a77db2
1 parent 9867c35
commit 7a77db2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/src/server/main_service.cc b/src/server/main_service.cc
@@ -2103,10 +2103,8 @@ void Service::Exec(CmdArgList args, ConnectionContext* cntx) {
  }
  }
 
- if (scheduled) {
- VLOG(1) << "Exec unlocking " << exec_info.body.size() << " commands";
+ if (is_transactional)
  cntx->transaction->UnlockMulti();
- }
 
  cntx->cid = exec_cid_;
  VLOG(1) << "Exec completed";

diff --git a/src/server/transaction.cc b/src/server/transaction.cc
@@ -178,7 +178,7 @@ Transaction::Transaction(const CommandId* cid) : cid_{cid} {
  }
 }
 
-Transaction::Transaction(const Transaction* parent, ShardId shard_id)
+Transaction::Transaction(const Transaction* parent, ShardId shard_id, std::optional<SlotId> slot_id)
  : multi_{make_unique<MultiData>()},
  txid_{parent->txid()},
  unique_shard_cnt_{1},
@@ -194,9 +194,9 @@ Transaction::Transaction(const Transaction* parent, ShardId shard_id)
  multi_->shard_journal_write.resize(1);
 
  MultiUpdateWithParent(parent);
- if (slot_id.has_value()) {
- unique_slot_checker_.Add(*slot_id);
- }
+ // if (slot_id.has_value()) {
+ //  unique_slot_checker_.Add(*slot_id);
+ // }
 }
 
 Transaction::~Transaction() {
@@ -447,10 +447,6 @@ void Transaction::PrepareSquashedMultiHop(const CommandId* cid,
  DCHECK(cid->IsMultiTransactional());
 
  MultiSwitchCmd(cid);
-<<<<<<< HEAD
-
-=======
->>>>>>> 3228c044 (feat(treansaction): Use single hop in squashing when possible)
  InitBase(db_index_, {});
 
  // Because squashing already determines active shards by partitioning commands,
@@ -928,7 +924,6 @@ void Transaction::Schedule() {
 
  if ((coordinator_state_ & COORD_SCHED) == 0)
  ScheduleInternal();
- }
 }
 
 // Runs in coordinator thread.

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);
+ explicit Transaction(const Transaction* parent, ShardId shard_id, std::optional<SlotId> slot = std::nullopt);
 
  // Initialize from command (args) on specific db.
  OpStatus InitByArgs(DbIndex index, CmdArgList args);
@@ -339,9 +339,6 @@ class Transaction {
  // to it must not block.
  void PrepareMultiForScheduleSingleHop(ShardId sid, DbIndex db, CmdArgList args);
 
- // Mark as squasher. Transaction must be already properly initialized.
- void MultiBecomeSquasher();
-
  // Write a journal entry to a shard journal with the given payload. When logging a non-automatic
  // journal command, multiple journal entries may be necessary. In this case, call with set
  // multi_commands to true and call the FinishLogJournalOnShard function after logging the final