modify according to comment

arana-db · Oct 17, 2024 · 851e3dd · 851e3dd
1 parent a36d8b9
commit 851e3dd
Show file tree

Hide file tree

Showing 49 changed files with 81 additions and 363 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -181,7 +181,6 @@ INCLUDE(cmake/brpc.cmake)
 INCLUDE(cmake/rocksdb.cmake)
 INCLUDE(cmake/braft.cmake)
 INCLUDE(cmake/rediscache.cmake)
-INCLUDE(cmake/jemalloc.cmake)
 
 SET(PROTO_OUTPUT_DIR "${CMAKE_BINARY_DIR}/generated_pb")
 FILE(MAKE_DIRECTORY "${PROTO_OUTPUT_DIR}")

diff --git a/cmake/jemalloc.cmake b/cmake/jemalloc.cmake
diff --git a/cmake/rediscache.cmake b/cmake/rediscache.cmake
@@ -1,10 +1,5 @@
-# Copyright (c) 2024-present, Qihoo, Inc.  All rights reserved.
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
-
-SET(REDISCACHE_SOURCES_DIR "${LIB_INSTALL_PREFIX}" CACHE PATH "rediscache source directory." FORCE)
-SET(REDISCACHE_INSTALL_DIR "${LIB_INSTALL_PREFIX}" CACHE PATH "rediscache install directory." FORCE)
+SET(REDISCACHE_SOURCES_DIR "${LIB_INSTALL_PREFIX}" CACHE PATH "rediscache source directory.")
+SET(REDISCACHE_INSTALL_DIR "${LIB_INSTALL_PREFIX}" CACHE PATH "rediscache install directory.")
 SET(REDISCACHE_INCLUDE_DIR "${LIB_INCLUDE_DIR}" CACHE PATH "rediscache include directory." FORCE)
 SET(REDISCACHE_LIBRARIES "${LIB_INSTALL_DIR}/librediscache.a" CACHE FILEPATH "rediscache library." FORCE)
 

diff --git a/src/base_cmd.cc b/src/base_cmd.cc
@@ -15,8 +15,8 @@
 
 #include "common.h"
 #include "config.h"
-#include "log.h"
 #include "kiwi.h"
+#include "log.h"
 #include "praft/praft.h"
 
 namespace kiwi {
@@ -96,10 +96,6 @@ bool BaseCmd::IsNeedReadCache() const { return HasFlag(kCmdFlagsReadCache); }
 bool BaseCmd::IsNeedUpdateCache() const { return HasFlag(kCmdFlagsUpdateCache); }
 
 bool BaseCmd::IsNeedCacheDo(PClient* client) const {
-  if (g_config.tmp_cache_disable_flag.load()) {
-    return false;
-  }
-
   if (HasFlag(kCmdFlagsKv)) {
     if (!g_config.cache_string.load()) {
       return false;

diff --git a/src/base_cmd.h b/src/base_cmd.h
@@ -299,6 +299,9 @@ class BaseCmd : public std::enable_shared_from_this<BaseCmd> {
   uint32_t cmd_id_ = 0;
   uint32_t acl_category_ = 0;
 
+  // save db operation status which will be used in cache operation
+  storage::Status s_;
+
  private:
   // The function to be executed first before executing `DoCmd`
   // What needs to be done at present are: extract the key in the command and fill it into the context

diff --git a/src/cache/CMakeLists.txt b/src/cache/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Copyright (c) 2024-present, Qihoo, Inc.  All rights reserved.
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
-
 FILE(GLOB PCACHE_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/*.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/*.cc"

diff --git a/src/cache/config.h b/src/cache/config.h
@@ -1,8 +1,3 @@
-// Copyright (c) 2024-present, Qihoo, Inc.  All rights reserved.
-// This source code is licensed under the BSD-style license found in the
-// LICENSE file in the root directory of this source tree. An additional grant
-// of patent rights can be found in the PATENTS file in the same directory.
-
 #pragma once
 
 #include <cstdint>

diff --git a/src/cache/hash.cc b/src/cache/hash.cc
@@ -1,8 +1,3 @@
-// Copyright (c) 2024-present, Qihoo, Inc.  All rights reserved.
-// This source code is licensed under the BSD-style license found in the
-// LICENSE file in the root directory of this source tree. An additional grant
-// of patent rights can be found in the PATENTS file in the same directory.
-
 #include "pstd_defer.h"
 #include "redisCache.h"
 

diff --git a/src/cache/list.cc b/src/cache/list.cc
@@ -1,8 +1,3 @@
-// Copyright (c) 2024-present, Qihoo, Inc.  All rights reserved.
-// This source code is licensed under the BSD-style license found in the
-// LICENSE file in the root directory of this source tree. An additional grant
-// of patent rights can be found in the PATENTS file in the same directory.
-
 #include "pstd_defer.h"
 #include "redisCache.h"
 

diff --git a/src/cache/redisCache.cc b/src/cache/redisCache.cc
@@ -1,8 +1,3 @@
-// Copyright (c) 2024-present, Qihoo, Inc.  All rights reserved.
-// This source code is licensed under the BSD-style license found in the
-// LICENSE file in the root directory of this source tree. An additional grant
-// of patent rights can be found in the PATENTS file in the same directory.
-
 #include "cache/redisCache.h"
 #include "pstd/pstd_defer.h"
 #include "pstd/pstd_string.h"

diff --git a/src/cache/redisCache.h b/src/cache/redisCache.h
@@ -1,8 +1,3 @@
-// Copyright (c) 2024-present, Qihoo, Inc.  All rights reserved.
-// This source code is licensed under the BSD-style license found in the
-// LICENSE file in the root directory of this source tree. An additional grant
-// of patent rights can be found in the PATENTS file in the same directory.
-
 #pragma once
 
 #include <unistd.h>

diff --git a/src/cache/set.cc b/src/cache/set.cc
@@ -1,8 +1,3 @@
-// Copyright (c) 2024-present, Qihoo, Inc.  All rights reserved.
-// This source code is licensed under the BSD-style license found in the
-// LICENSE file in the root directory of this source tree. An additional grant
-// of patent rights can be found in the PATENTS file in the same directory.
-
 #include "pstd_defer.h"
 #include "redisCache.h"
 

diff --git a/src/cache/string.cc b/src/cache/string.cc
@@ -1,8 +1,3 @@
-// Copyright (c) 2024-present, Qihoo, Inc.  All rights reserved.
-// This source code is licensed under the BSD-style license found in the
-// LICENSE file in the root directory of this source tree. An additional grant
-// of patent rights can be found in the PATENTS file in the same directory.
-
 #include <cstdlib>
 
 #include "pstd/pstd_defer.h"

diff --git a/src/cache/zset.cc b/src/cache/zset.cc
@@ -1,8 +1,3 @@
-// Copyright (c) 2024-present, Qihoo, Inc.  All rights reserved.
-// This source code is licensed under the BSD-style license found in the
-// LICENSE file in the root directory of this source tree. An additional grant
-// of patent rights can be found in the PATENTS file in the same directory.
-
 #include "pstd/pstd_defer.h"
 #include "redisCache.h"
 

diff --git a/src/cache_define.h b/src/cache_define.h
@@ -1,8 +1,3 @@
-// Copyright (c) 2024-present, Qihoo, Inc.  All rights reserved.
-// This source code is licensed under the BSD-style license found in the
-// LICENSE file in the root directory of this source tree. An additional grant
-// of patent rights can be found in the PATENTS file in the same directory.
-
 #pragma once
 
 namespace kiwi {

diff --git a/src/cmd_admin.h b/src/cmd_admin.h
@@ -37,7 +37,7 @@ class CmdConfig : public BaseCmdGroup {
  private:
   //  std::vector<std::string> subCmd_;
 
-  void DoCmd(PClient* client) override{};
+  void DoCmd(PClient* client) override {};
 };
 
 class CmdConfigGet : public BaseCmd {
@@ -178,7 +178,7 @@ class CmdDebug : public BaseCmdGroup {
   bool DoInitial(PClient* client) override { return true; };
 
  private:
-  void DoCmd(PClient* client) override{};
+  void DoCmd(PClient* client) override {};
 };
 
 class CmdDebugHelp : public BaseCmd {

diff --git a/src/cmd_hash.h b/src/cmd_hash.h
@@ -26,7 +26,6 @@ class HSetCmd : public BaseCmd {
   void DoCmd(PClient *client) override;
   void DoThroughDB(PClient *client) override;
   void DoUpdateCache(PClient *client) override;
-  storage::Status s_;
 };
 
 class HGetCmd : public BaseCmd {
@@ -41,7 +40,6 @@ class HGetCmd : public BaseCmd {
   void DoThroughDB(PClient *client) override;
   void DoUpdateCache(PClient *client) override;
   void ReadCache(PClient *client) override;
-  storage::Status s_;
 };
 
 class HDelCmd : public BaseCmd {
@@ -55,7 +53,7 @@ class HDelCmd : public BaseCmd {
   void DoCmd(PClient *client) override;
   void DoThroughDB(PClient *client) override;
   void DoUpdateCache(PClient *client) override;
-  rocksdb::Status s_;
+
   int32_t deleted_ = 0;
 };
 
@@ -70,7 +68,6 @@ class HMSetCmd : public BaseCmd {
   void DoCmd(PClient *client) override;
   void DoThroughDB(PClient *client) override;
   void DoUpdateCache(PClient *client) override;
-  rocksdb::Status s_;
 };
 
 class HMGetCmd : public BaseCmd {
@@ -85,7 +82,6 @@ class HMGetCmd : public BaseCmd {
   void DoThroughDB(PClient *client) override;
   void DoUpdateCache(PClient *client) override;
   void ReadCache(PClient *client) override;
-  rocksdb::Status s_;
 };
 
 class HGetAllCmd : public BaseCmd {
@@ -100,7 +96,6 @@ class HGetAllCmd : public BaseCmd {
   void DoThroughDB(PClient *client) override;
   void DoUpdateCache(PClient *client) override;
   void ReadCache(PClient *client) override;
-  rocksdb::Status s_;
 };
 
 class HKeysCmd : public BaseCmd {
@@ -115,7 +110,6 @@ class HKeysCmd : public BaseCmd {
   void DoThroughDB(PClient *client) override;
   void DoUpdateCache(PClient *client) override;
   void ReadCache(PClient *client) override;
-  rocksdb::Status s_;
 };
 
 class HLenCmd : public BaseCmd {
@@ -130,7 +124,6 @@ class HLenCmd : public BaseCmd {
   void DoThroughDB(PClient *client) override;
   void DoUpdateCache(PClient *client) override;
   void ReadCache(PClient *client) override;
-  rocksdb::Status s_;
 };
 
 class HStrLenCmd : public BaseCmd {
@@ -145,7 +138,6 @@ class HStrLenCmd : public BaseCmd {
   void DoThroughDB(PClient *client) override;
   void DoUpdateCache(PClient *client) override;
   void ReadCache(PClient *client) override;
-  storage::Status s_;
 };
 
 class HScanCmd : public BaseCmd {
@@ -174,7 +166,6 @@ class HValsCmd : public BaseCmd {
   void DoThroughDB(PClient *client) override;
   void DoUpdateCache(PClient *client) override;
   void ReadCache(PClient *client) override;
-  storage::Status s_;
 };
 
 class HIncrbyFloatCmd : public BaseCmd {
@@ -188,7 +179,6 @@ class HIncrbyFloatCmd : public BaseCmd {
   void DoCmd(PClient *client) override;
   void DoThroughDB(PClient *client) override;
   void DoUpdateCache(PClient *client) override;
-  storage::Status s_;
 };
 
 class HSetNXCmd : public BaseCmd {
@@ -202,7 +192,6 @@ class HSetNXCmd : public BaseCmd {
   void DoCmd(PClient *client) override;
   void DoThroughDB(PClient *client) override;
   void DoUpdateCache(PClient *client) override;
-  storage::Status s_;
 };
 
 class HIncrbyCmd : public BaseCmd {
@@ -216,7 +205,7 @@ class HIncrbyCmd : public BaseCmd {
   void DoCmd(PClient *client) override;
   void DoThroughDB(PClient *client) override;
   void DoUpdateCache(PClient *client) override;
-  storage::Status s_;
+
   int64_t int_by_ = 0;
 };
 
@@ -244,7 +233,6 @@ class HExistsCmd : public BaseCmd {
   void DoThroughDB(PClient *client) override;
   void DoUpdateCache(PClient *client) override;
   void ReadCache(PClient *client) override;
-  rocksdb::Status s_;
 };
 
 }  // namespace kiwi
diff --git a/src/cmd_keys.h b/src/cmd_keys.h
@@ -22,7 +22,6 @@ class DelCmd : public BaseCmd {
   bool DoInitial(PClient* client) override;
 
  private:
-  rocksdb::Status s_;
   void DoCmd(PClient* client) override;
   void DoThroughDB(PClient* client) override;
   void DoUpdateCache(PClient* client) override;
@@ -65,7 +64,7 @@ class ExpireCmd : public BaseCmd {
   void DoCmd(PClient* client) override;
   void DoThroughDB(PClient* client) override;
   void DoUpdateCache(PClient* client) override;
-  rocksdb::Status s_;
+
   int64_t sec_ = 0;
 };
 
@@ -94,7 +93,6 @@ class PExpireCmd : public BaseCmd {
   void DoThroughDB(PClient* client) override;
   void DoUpdateCache(PClient* client) override;
   int64_t msec_ = 0;
-  rocksdb::Status s_;
 };
 
 class ExpireatCmd : public BaseCmd {
@@ -105,7 +103,6 @@ class ExpireatCmd : public BaseCmd {
   bool DoInitial(PClient* client) override;
 
  private:
-  rocksdb::Status s_;
   int64_t time_stamp_ = 0;
   void DoCmd(PClient* client) override;
   void DoThroughDB(PClient* client) override;
@@ -120,7 +117,6 @@ class PExpireatCmd : public BaseCmd {
   bool DoInitial(PClient* client) override;
 
  private:
-  rocksdb::Status s_;
   int64_t time_stamp_ms_ = 0;
   void DoCmd(PClient* client) override;
   void DoThroughDB(PClient* client) override;
@@ -136,7 +132,7 @@ class PersistCmd : public BaseCmd {
 
  private:
   void DoCmd(PClient* client) override;
-  rocksdb::Status s_;
+
   void DoThroughDB(PClient* client) override;
   void DoUpdateCache(PClient* client) override;
 };

diff --git a/src/cmd_kv.cc b/src/cmd_kv.cc
@@ -918,8 +918,6 @@ bool SetRangeCmd::DoInitial(PClient* client) {
 }
 
 void SetRangeCmd::DoCmd(PClient* client) {
-
-
   int32_t ret = 0;
   s_ =
       PSTORE.GetBackend(client->GetCurrentDB())->GetStorage()->Setrange(client->Key(), offset_, client->argv_[3], &ret);
-Original file line number
+Diff line change
@@ Expand Up / @@ -918,8 +918,6 @@ bool SetRangeCmd::DoInitial(PClient* client) { @@
     }
     void SetRangeCmd::DoCmd(PClient* client) {
       int32_t ret = 0;
       s_ =
           PSTORE.GetBackend(client->GetCurrentDB())->GetStorage()->Setrange(client->Key(), offset_, client->argv_[3], &ret);
@@ Expand Down @@