code format

Author: wuxianrong

src/pika_client_conn.cc

@@ -50,7 +50,6 @@ std::shared_ptr<Cmd> PikaClientConn::DoCmd(const PikaCmdArgsType& argv, const st
     }
     return tmp_ptr;
   }
-
   c_ptr->SetCacheMissedInRtc(cache_miss_in_rtc);
   c_ptr->SetConn(shared_from_this());
   c_ptr->SetResp(resp_ptr);
@@ -219,7 +218,6 @@ std::shared_ptr<Cmd> PikaClientConn::DoCmd(const PikaCmdArgsType& argv, const st
   rocksdb::get_perf_context()->Reset();
   // Process Command
   c_ptr->Execute();
-
   time_stat_->process_done_ts_ = pstd::NowMicros();
   auto cmdstat_map = g_pika_cmd_table_manager->GetCommandStatMap();
   (*cmdstat_map)[opt].cmd_count.fetch_add(1);

src/pika_kv.cc

@@ -206,9 +206,7 @@ void DelCmd::DoInitial() {
 }
 
 void DelCmd::Do() {
-
   int64_t count = db_->storage()->Del(keys_);
-
   if (count >= 0) {
     res_.AppendInteger(count);
     s_ = rocksdb::Status::OK();
@@ -228,11 +226,7 @@ void DelCmd::DoThroughDB() {
 
 void DelCmd::DoUpdateCache() {
   if (s_.ok()) {
-    std::vector<std::string> v;
-    for (auto key : keys_) {
-      v.emplace_back(key);
-    }
-    db_->cache()->Del(v);
+    db_->cache()->Del(keys_);
   }
 }
 
@@ -1228,7 +1222,6 @@ void SetrangeCmd::DoThroughDB() {
 
 void SetrangeCmd::DoUpdateCache() {
   if (s_.ok()) {
- 
     STAGE_TIMER_GUARD(cache_duration_ms, true);
     db_->cache()->SetRangeIfKeyExist(key_, offset_, value_);
   }
@@ -1341,7 +1334,7 @@ void ExpireCmd::DoInitial() {
 }
 
 void ExpireCmd::Do() {
-  int64_t res = db_->storage()->Expire(key_, ttl_sec_ * 1000);
+  int32_t res = db_->storage()->Expire(key_, ttl_sec_ * 1000);
   if (res != -1) {
     res_.AppendInteger(res);
     s_ = rocksdb::Status::OK();
@@ -1396,7 +1389,6 @@ void PexpireCmd::DoInitial() {
 }
 
 void PexpireCmd::Do() {
-  
   int64_t res = db_->storage()->Expire(key_, ttl_millsec);
   if (res != -1) {
     res_.AppendInteger(res);
@@ -1452,7 +1444,7 @@ void ExpireatCmd::DoInitial() {
 }
 
 void ExpireatCmd::Do() {
-  int32_t res = db_->storage()->Expireat(key_, time_stamp_sec_ * 100);
+  int32_t res = db_->storage()->Expireat(key_, time_stamp_sec_ * 1000);
   if (res != -1) {
     res_.AppendInteger(res);
     s_ = rocksdb::Status::OK();
@@ -1527,7 +1519,7 @@ void TtlCmd::ReadCache() {
   if (timestamp == -3) {
     res_.SetRes(CmdRes::kErrOther, "ttl internal error");
   } else if (timestamp != -2) {
-    res_.AppendInteger(timestamp); 
+    res_.AppendInteger(timestamp);
   } else {
     res_.SetRes(CmdRes::kCacheMiss);
   }
@@ -1551,12 +1543,12 @@ void PttlCmd::Do() {
   if (ttl_millsec == -3) {
     res_.SetRes(CmdRes::kErrOther, "ttl internal error");
   } else {
-    // mean this key not exist
-    res_.AppendInteger(-2);
+    res_.AppendInteger(ttl_millsec);
   }
 }
 
 void PttlCmd::ReadCache() {
+  // redis cache don't support pttl cache, so read directly from db
   DoThroughDB();
 }
 
@@ -1602,7 +1594,8 @@ void TypeCmd::DoInitial() {
   key_ = argv_[1];
 }
 
-void TypeCmd::Do() {  enum storage::DataType type = storage::DataType::kNones;
+void TypeCmd::Do() { 
+  enum storage::DataType type = storage::DataType::kNones;
   std::string key_type;
   rocksdb::Status s = db_->storage()->GetType(key_, type);
   if (s.ok()) {

src/pika_list.cc

@@ -138,7 +138,7 @@ void LLenCmd::ReadCache() {
   uint64_t llen = 0;
   STAGE_TIMER_GUARD(cache_duration_ms, true);
   auto s = db_->cache()->LLen(key_, &llen);
-  if (s.ok()){
+  if (s.ok()) {
     res_.AppendInteger(llen);
   } else if (s.IsNotFound()) {
     res_.SetRes(CmdRes::kCacheMiss);

src/pika_set.cc

@@ -333,7 +333,6 @@ void SRemCmd::DoUpdateCache() {
   }
 }
 
-
 void SUnionCmd::DoInitial() {
   if (!CheckArg(argv_.size())) {
     res_.SetRes(CmdRes::kWrongNum, kCmdNameSUnion);
@@ -526,7 +525,6 @@ void SIsmemberCmd::Do() {
 }
 
 void SIsmemberCmd::ReadCache() {
-
   STAGE_TIMER_GUARD(cache_duration_ms, true);
   auto s = db_->cache()->SIsmember(key_, member_);
   if (s.ok()) {
@@ -730,7 +728,6 @@ void SRandmemberCmd::Do() {
 
 void SRandmemberCmd::ReadCache() {
   std::vector<std::string> members;
-
   STAGE_TIMER_GUARD(cache_duration_ms, true);
   auto s = db_->cache()->SRandmember(key_, count_, &members);
   if (s.ok()) {

src/pika_zset.cc

@@ -1441,8 +1441,7 @@ void ZRemrangebyrankCmd::DoThroughDB() {
 }
 
 void ZRemrangebyrankCmd::DoUpdateCache() {
-  if (s_.ok()) {
-    
+  if (s_.ok()) {  
     STAGE_TIMER_GUARD(cache_duration_ms, true);
     db_->cache()->ZRemrangebyrank(key_, min_, max_, ele_deleted_, db_);
   }

tools/pika_exporter/Makefile

@@ -8,9 +8,9 @@ GITREV 			:= $(shell git rev-parse HEAD)
 BUILDTIME 		:= $(shell date '+%F %T %Z')
 COMPILERVERSION	:= $(subst go version ,,$(shell go version))
 PROJNAME        := pika_exporter
-PIKA_EXPORTER_MAJOR := 3
-PIKA_EXPORTER_MINOR := 5
-PIKA_EXPORTER_PATCH := 5
+PIKA_EXPORTER_MAJOR := 4
+PIKA_EXPORTER_MINOR := 0
+PIKA_EXPORTER_PATCH := 2
 
 define GENERATE_VERSION_CODE
 cat << EOF | gofmt > version.go