Refactor code and delete some useless files.

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

CMakeLists.txt

@@ -981,7 +981,7 @@ endfunction()
 
 file_glob_recurse(FILES_NEED_FORMAT DIRECTORIES      "src" "modules" "python" "test" "benchmark"
                                     PATTERNS         ".*\\.(cc|cpp|h|hpp|vineyard-mod)$"
-                                    EXCLUDE_PATTERNS "(.*\\.vineyard.h$)|(modules/kv-state-cache/radix-tree/radix\.*)"
+                                    EXCLUDE_PATTERNS "(.*\\.vineyard.h$)|(modules/kv-state-cache/radix-tree/radix.*)"
 )
 
 # the `memcpy.h` is borrowed from external project

modules/kv-state-cache/ds/kv_state_cache.h

@@ -22,7 +22,6 @@ limitations under the License.
 #include "common/util/status.h"
 #include "kv-state-cache/ds/kv_state_cache_block.h"
 #include "kv-state-cache/radix-tree/radix-tree.h"
-#include "kv-state-cache/strategy/LRU_strategy.h"
 
 #ifndef MODULES_KV_STATE_CACHE_DS_KV_STATE_CACHE_H_
 #define MODULES_KV_STATE_CACHE_DS_KV_STATE_CACHE_H_

modules/kv-state-cache/ds/kv_state_cache_block.cc

@@ -195,8 +195,8 @@ void KVStateCacheBlockBuilder::Update(const KV_STATE_WITH_LAYER& kvState,
   ACQUIRE_BIT_RESOURCE(this->bitmap[index / 64], index % 64);
 }
 
-short KVStateCacheBlockBuilder::Split(KVStateCacheBlockBuilder* child,
-                                      int index) {
+int16_t KVStateCacheBlockBuilder::Split(KVStateCacheBlockBuilder* child,
+                                        int index) {
   // TBD
   VINEYARD_ASSERT(this->layer == child->layer);
   int childIndex = child->FindEmptySlot();

modules/kv-state-cache/ds/kv_state_cache_block.h

@@ -19,6 +19,9 @@ limitations under the License.
 #include <array>
 #include <iostream>
 #include <map>
+#include <memory>
+#include <string>
+#include <utility>
 #include <vector>
 
 #include "basic/ds/tensor.h"

modules/kv-state-cache/utils/kv_state_cache_utils.cc

@@ -14,13 +14,16 @@ limitations under the License.
 */
 
 #include <cstdlib>
+#include <memory>
+#include <string>
+#include <vector>
 
 #include "client/client.h"
 #include "common/util/logging.h"
 #include "kv-state-cache/ds/kv_state_cache.h"
-#include "kv_state_cache_utils.h"
+#include "kv-state-cache/utils/kv_state_cache_utils.h"
 
-using namespace vineyard;
+namespace vineyard {
 
 static Client client;
 static std::shared_ptr<KVStateCacheBuilder> kvStateCacheBuilder = nullptr;
@@ -254,3 +257,5 @@ void threadFunc() {
     pthread_mutex_unlock(&syncMutex);
   }
 }
+
+}  // namespace vineyard

modules/kv-state-cache/utils/kv_state_cache_utils.h

@@ -13,10 +13,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+#include <string>
+#include <vector>
+
 #include "kv-state-cache/ds/kv_state_cache.h"
 
-#ifndef MODULES_KV_STATE_CACHE_UTILS_H_
-#define MODULES_KV_STATE_CACHE_UTILS_H_
+#ifndef MODULES_KV_STATE_CACHE_UTILS_KV_STATE_CACHE_UTILS_H_
+#define MODULES_KV_STATE_CACHE_UTILS_KV_STATE_CACHE_UTILS_H_
+
+namespace vineyard {
 
 void InitKVStateCache(
     int dimension = 10, int cacheCapacity = 10, int layer = 1,
@@ -37,4 +42,6 @@ void Delete(std::vector<int> token);
 
 void CloseKVStateCache();
 
-#endif
+}  // namespace vineyard
+
+#endif  // MODULES_KV_STATE_CACHE_UTILS_KV_STATE_CACHE_UTILS_H_

src/common/util/protocols.cc

@@ -2139,8 +2139,7 @@ void WriteInstanceStatusReply(const json& meta, std::string& msg) {
 
 Status ReadInstanceStatusReply(const json& root, json& meta) {
   CHECK_IPC_ERROR(root, command_t::INSTANCE_STATUS_REPLY);
-  meta = root["meta"].get<bool>();
-  ;
+  meta = root["meta"];
   return Status::OK();
 }
 
@@ -2305,7 +2304,6 @@ void WriteTryReleaseLockRequest(const std::string& key, std::string& msg) {
 Status ReadTryReleaseLockRequest(const json& root, std::string& key) {
   CHECK_IPC_ERROR(root, command_t::RELEASE_LOCK_REQUEST);
   key = root["key"].get<std::string>();
-  ;
   return Status::OK();
 }
 
@@ -2319,7 +2317,6 @@ void WriteTryReleaseLockReply(const bool result, std::string& msg) {
 Status ReadTryReleaseLockReply(const json& root, bool& result) {
   CHECK_IPC_ERROR(root, command_t::RELEASE_LOCK_REPLY);
   result = root["result"].get<bool>();
-  ;
   return Status::OK();
 }