delete binglog dead code (OpenAtomFoundation#2274)

Co-authored-by: wuxianrong <[email protected]>
Y-Rookie · Jan 10, 2024 · e6a5852 · e6a5852
1 parent 34b9aba
commit e6a5852
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 42 deletions.
diff --git a/include/pika_consensus.h b/include/pika_consensus.h
@@ -115,8 +115,6 @@ class ConsensusCoordinator {
   // invoked by dbsync process
   pstd::Status Reset(const LogOffset& offset);
 
-  pstd::Status ProposeLog(const std::shared_ptr<Cmd>& cmd_ptr, std::shared_ptr<PikaClientConn> conn_ptr,
-                    std::shared_ptr<std::string> resp_ptr);
   pstd::Status ProposeLog(const std::shared_ptr<Cmd>& cmd_ptr);
   pstd::Status UpdateSlave(const std::string& ip, int port, const LogOffset& start, const LogOffset& end);
   pstd::Status AddSlaveNode(const std::string& ip, int port, int session_id);
@@ -184,9 +182,8 @@ class ConsensusCoordinator {
   bool MatchConsensusLevel();
   pstd::Status TruncateTo(const LogOffset& offset);
 
-  pstd::Status InternalAppendLog(const BinlogItem& item, const std::shared_ptr<Cmd>& cmd_ptr,
-                           std::shared_ptr<PikaClientConn> conn_ptr, std::shared_ptr<std::string> resp_ptr);
-  pstd::Status InternalAppendBinlog(const BinlogItem& item, const std::shared_ptr<Cmd>& cmd_ptr, LogOffset* log_offset);
+  pstd::Status InternalAppendLog(const std::shared_ptr<Cmd>& cmd_ptr);
+  pstd::Status InternalAppendBinlog(const std::shared_ptr<Cmd>& cmd_ptr);
   void InternalApply(const MemLog::LogItem& log);
   void InternalApplyFollower(const MemLog::LogItem& log);
 

diff --git a/include/pika_rm.h b/include/pika_rm.h
@@ -86,8 +86,6 @@ class SyncMasterSlot : public SyncSlot {
 
   // consensus use
   pstd::Status ConsensusUpdateSlave(const std::string& ip, int port, const LogOffset& start, const LogOffset& end);
-  pstd::Status ConsensusProposeLog(const std::shared_ptr<Cmd>& cmd_ptr, std::shared_ptr<PikaClientConn> conn_ptr,
-                             std::shared_ptr<std::string> resp_ptr);
   pstd::Status ConsensusProposeLog(const std::shared_ptr<Cmd>& cmd_ptr);
   pstd::Status ConsensusSanityCheck();
   pstd::Status ConsensusProcessLeaderLog(const std::shared_ptr<Cmd>& cmd_ptr, const BinlogItem& attribute);

diff --git a/src/pika_command.cc b/src/pika_command.cc
@@ -943,8 +943,7 @@ void Cmd::DoBinlog(const std::shared_ptr<SyncMasterSlot>& slot) {
       return;
     }
 
-    Status s =
-        slot->ConsensusProposeLog(shared_from_this(), std::dynamic_pointer_cast<PikaClientConn>(conn_ptr), resp_ptr);
+    Status s = slot->ConsensusProposeLog(shared_from_this());
     if (!s.ok()) {
       LOG(WARNING) << slot->SyncSlotInfo().ToString() << " Writing binlog failed, maybe no space left on device "
                    << s.ToString();

diff --git a/src/pika_consensus.cc b/src/pika_consensus.cc
@@ -344,20 +344,16 @@ Status ConsensusCoordinator::Reset(const LogOffset& offset) {
   return Status::OK();
 }
 
-Status ConsensusCoordinator::ProposeLog(const std::shared_ptr<Cmd>& cmd_ptr, std::shared_ptr<PikaClientConn> conn_ptr,
-                                        std::shared_ptr<std::string> resp_ptr) {
+Status ConsensusCoordinator::ProposeLog(const std::shared_ptr<Cmd>& cmd_ptr) {
   std::vector<std::string> keys = cmd_ptr->current_key();
   // slotkey shouldn't add binlog
   if (cmd_ptr->name() == kCmdNameSAdd && !keys.empty() &&
       (keys[0].compare(0, SlotKeyPrefix.length(), SlotKeyPrefix) == 0 || keys[0].compare(0, SlotTagPrefix.length(), SlotTagPrefix) == 0)) {
     return Status::OK();
   }
 
-  LogOffset log_offset;
-
-  BinlogItem item;
   // make sure stable log and mem log consistent
-  Status s = InternalAppendLog(item, cmd_ptr, std::move(conn_ptr), std::move(resp_ptr));
+  Status s = InternalAppendLog(cmd_ptr);
   if (!s.ok()) {
     return s;
   }
@@ -366,19 +362,8 @@ Status ConsensusCoordinator::ProposeLog(const std::shared_ptr<Cmd>& cmd_ptr, std
   return Status::OK();
 }
 
-Status ConsensusCoordinator::ProposeLog(const std::shared_ptr<Cmd>& cmd_ptr) {
-    return ProposeLog(cmd_ptr, nullptr, nullptr);
-}
-
-Status ConsensusCoordinator::InternalAppendLog(const BinlogItem& item, const std::shared_ptr<Cmd>& cmd_ptr,
-                                               std::shared_ptr<PikaClientConn> conn_ptr,
-                                               std::shared_ptr<std::string> resp_ptr) {
-  LogOffset log_offset;
-  Status s = InternalAppendBinlog(item, cmd_ptr, &log_offset);
-  if (!s.ok()) {
-    return s;
-  }
-  return Status::OK();
+Status ConsensusCoordinator::InternalAppendLog(const std::shared_ptr<Cmd>& cmd_ptr) {
+  return InternalAppendBinlog(cmd_ptr);
 }
 
 // precheck if prev_offset match && drop this log if this log exist
@@ -390,7 +375,7 @@ Status ConsensusCoordinator::ProcessLeaderLog(const std::shared_ptr<Cmd>& cmd_pt
     return Status::OK();
   }
 
-  Status s = InternalAppendLog(attribute, cmd_ptr, nullptr, nullptr);
+  Status s = InternalAppendLog(cmd_ptr);
 
   InternalApplyFollower(MemLog::LogItem(LogOffset(), cmd_ptr, nullptr, nullptr));
   return Status::OK();
@@ -407,8 +392,7 @@ Status ConsensusCoordinator::UpdateSlave(const std::string& ip, int port, const
   return Status::OK();
 }
 
-Status ConsensusCoordinator::InternalAppendBinlog(const BinlogItem& item, const std::shared_ptr<Cmd>& cmd_ptr,
-                                                  LogOffset* log_offset) {
+Status ConsensusCoordinator::InternalAppendBinlog(const std::shared_ptr<Cmd>& cmd_ptr) {
   std::string content = cmd_ptr->ToRedisProtocol();
   Status s = stable_logger_->Logger()->Put(content);
   if (!s.ok()) {
@@ -419,11 +403,9 @@ Status ConsensusCoordinator::InternalAppendBinlog(const BinlogItem& item, const
     }
     return s;
   }
-  uint32_t filenum;
-  uint64_t offset;
-  stable_logger_->Logger()->GetProducerStatus(&filenum, &offset);
-  *log_offset = LogOffset(BinlogOffset(filenum, offset), LogicOffset(item.term_id(), item.logic_id()));
-  return Status::OK();
+  uint32_t filenum = 0;
+  uint64_t offset = 0;
+  return stable_logger_->Logger()->GetProducerStatus(&filenum, &offset);
 }
 
 Status ConsensusCoordinator::ScheduleApplyLog(const LogOffset& committed_index) {

diff --git a/src/pika_rm.cc b/src/pika_rm.cc
@@ -477,16 +477,10 @@ bool SyncMasterSlot::CheckSessionId(const std::string& ip, int port, const std::
   return true;
 }
 
-Status SyncMasterSlot::ConsensusProposeLog(const std::shared_ptr<Cmd>& cmd_ptr, std::shared_ptr<PikaClientConn> conn_ptr,
-                                                std::shared_ptr<std::string> resp_ptr) {
-  return coordinator_.ProposeLog(cmd_ptr, std::move(conn_ptr), std::move(resp_ptr));
-}
-
 Status SyncMasterSlot::ConsensusProposeLog(const std::shared_ptr<Cmd>& cmd_ptr) {
   return coordinator_.ProposeLog(cmd_ptr);
 }
 
-
 Status SyncMasterSlot::ConsensusProcessLeaderLog(const std::shared_ptr<Cmd>& cmd_ptr, const BinlogItem& attribute) {
   return coordinator_.ProcessLeaderLog(cmd_ptr, attribute);
 }