[feat][contrib] Upgrade brpc to 1.12.1.

Signed-off-by: Ketor <[email protected]>

Author: ketor

contrib/braft

@@ -98,11 +98,12 @@ Latches::Latches() {
 
 Latches::~Latches() { delete slots_ptr; }
 
+// NOTE: bthread_mutex_t not allow copy, so we can't resize slots
 // CAUTION: this function is not safe, need to call before any usage begin
-void Latches::SetSlotNum(size_t size) {
-  slots_size = NextPowerOfTwo(size);
-  slots_ptr->resize(slots_size);
-}
+// void Latches::SetSlotNum(size_t size) {
+//   slots_size = NextPowerOfTwo(size);
+//   slots_ptr->resize(slots_size);
+// }
 
 bool Latches::Acquire(Lock* lock, uint64_t who) const {
   size_t acquired_count = 0;

contrib/brpc

@@ -26,7 +26,7 @@ namespace dingodb {
 
 class Latch {
  public:
-  std::deque<std::pair<uint64_t, uint64_t>> waiting{};
+  std::deque<std::pair<uint64_t, uint64_t>> waiting;
 
   Latch() = default;
 
@@ -44,7 +44,7 @@ class Latch {
 
 class Lock {
  public:
-  std::vector<uint64_t> requiredHashes{};
+  std::vector<uint64_t> requiredHashes;
   size_t ownedCount = 0;
 
   Lock(const std::vector<std::string>& keys);
@@ -71,7 +71,8 @@ class Latches {
   explicit Latches();
   ~Latches();
 
-  void SetSlotNum(size_t size);
+  // NOTE: bthread_mutex_t not allow copy, so we can't resize slots
+  // void SetSlotNum(size_t size);
 
   bool Acquire(Lock* lock, uint64_t who) const;
 

contrib/fmt

@@ -70,37 +70,30 @@ struct KvWatchNode {
 class DeferDone {
  public:
   DeferDone() {
-    // bthread_mutex_init(&mutex_, nullptr);
     create_time_ = butil::gettimeofday_ms();
   }
   DeferDone(uint64_t closure_id, const std::string &watch_key, google::protobuf::Closure *done,
             pb::version::WatchResponse *response)
       : closure_id_(closure_id), watch_key_(watch_key), done_(done), response_(response) {
     create_time_ = butil::gettimeofday_ms();
-    // bthread_mutex_init(&mutex_, nullptr);
   }
 
   ~DeferDone() = default;
 
   bool IsDone() {
-    // bthread_mutex_lock(&mutex_);
     bool is_done = done_ == nullptr;
-    // bthread_mutex_unlock(&mutex_);
     return is_done;
   }
 
   std::string GetWatchKey() { return watch_key_; }
   pb::version::WatchResponse *GetResponse() {
-    // bthread_mutex_lock(&mutex_);
     auto *response = response_;
-    // bthread_mutex_unlock(&mutex_);
     return response;
   }
 
   int64_t GetStartTime() const { return create_time_; }
 
   void Done() {
-    // bthread_mutex_lock(&mutex_);
     if (done_) {
       braft::AsyncClosureGuard done_guard(done_);
       done_ = nullptr;
@@ -111,13 +104,11 @@ class DeferDone {
       DINGO_LOG(INFO) << "Deferred done_again closure_id=" << closure_id_ << " watch_key=" << watch_key_
                       << " cost: " << butil::gettimeofday_ms() - create_time_ << " ms, create_time: " << create_time_;
     }
-    // bthread_mutex_unlock(&mutex_);
   }
 
  private:
   uint64_t closure_id_;
   std::string watch_key_;
-  bthread_mutex_t mutex_;
   google::protobuf::Closure *done_;
   pb::version::WatchResponse *response_;
   int64_t create_time_;