binlog dispath by name when no key servered commadn

zhangweixin · May 6, 2016 · 069689e · 069689e
1 parent 457fe99
commit 069689e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/pika_binlog_bgworker.cc b/src/pika_binlog_bgworker.cc
@@ -37,7 +37,7 @@ void BinlogBGWorker::DoBinlogBG(void* arg) {
   // No need lock on readonly mode
   // Since the binlog task is dispatched by hash code of key
   // That is to say binlog with same key will be dispatched to same thread and execute sequencly
-  if (!is_readonly) {
+  if (!is_readonly && argv.size() >= 2) {
     g_pika_server->mutex_record_.Lock(argv[1]);
   }
 
@@ -68,7 +68,7 @@ void BinlogBGWorker::DoBinlogBG(void* arg) {
     pthread_rwlock_unlock(g_pika_server->rwlock());
   }
 
-  if (!is_readonly) {
+  if (!is_readonly && argv.size() >= 2) {
     g_pika_server->mutex_record_.Unlock(argv[1]);
   }
   if (g_pika_conf->slowlog_slower_than() >= 0) {

diff --git a/src/pika_master_conn.cc b/src/pika_master_conn.cc
@@ -65,7 +65,8 @@ int PikaMasterConn::DealMessage() {
   }
 
   PikaCmdArgsType *argv = new PikaCmdArgsType(argv_);
-  g_pika_server->DispatchBinlogBG(argv_[1], argv, raw_args_,
+  std::string dispatch_key = argv_.size() >= 2 ? argv_[1] : argv_[0];
+  g_pika_server->DispatchBinlogBG(dispatch_key, argv, raw_args_,
       serial, is_readonly);
   //  memcpy(wbuf_ + wbuf_len_, res.data(), res.size());
   //  wbuf_len_ += res.size();