1. add comments and change log level for meta

2. remove some unused meta kv files 3. remove unused tests 4. remove unused kv relative tests in metaclient
vesoft-inc · Jan 19, 2022 · 1468067 · 1468067
1 parent fd59b45
commit 1468067
Show file tree

Hide file tree

Showing 62 changed files with 551 additions and 1,080 deletions.
diff --git a/src/clients/meta/MetaClient.cpp b/src/clients/meta/MetaClient.cpp
@@ -851,8 +851,6 @@ Status MetaClient::handleResponse(const RESP& resp) {
       return Status::Error("Zone is empty!");
     case nebula::cpp2::ErrorCode::E_STORE_FAILURE:
       return Status::Error("Store failure!");
-    case nebula::cpp2::ErrorCode::E_STORE_SEGMENT_ILLEGAL:
-      return Status::Error("Store segment illegal!");
     case nebula::cpp2::ErrorCode::E_BAD_BALANCE_PLAN:
       return Status::Error("Bad balance plan!");
     case nebula::cpp2::ErrorCode::E_BALANCED:
@@ -1406,134 +1404,6 @@ StatusOr<std::vector<std::string>> MetaClient::getAllEdgeFromCache(const GraphSp
   return it->second;
 }
 
-folly::Future<StatusOr<bool>> MetaClient::multiPut(
-    std::string segment, std::vector<std::pair<std::string, std::string>> pairs) {
-  if (!nebula::meta::checkSegment(segment) || pairs.empty()) {
-    return Status::Error("arguments invalid!");
-  }
-
-  cpp2::MultiPutReq req;
-  std::vector<nebula::KeyValue> data;
-  data.reserve(pairs.size());
-
-  for (auto& element : pairs) {
-    data.emplace_back(std::move(element));
-  }
-  req.segment_ref() = std::move(segment);
-  req.pairs_ref() = std::move(data);
-  folly::Promise<StatusOr<bool>> promise;
-  auto future = promise.getFuture();
-  getResponse(
-      std::move(req),
-      [](auto client, auto request) { return client->future_multiPut(request); },
-      [](cpp2::ExecResp&& resp) -> bool {
-        return resp.get_code() == nebula::cpp2::ErrorCode::SUCCEEDED;
-      },
-      std::move(promise));
-  return future;
-}
-
-folly::Future<StatusOr<std::string>> MetaClient::get(std::string segment, std::string key) {
-  if (!nebula::meta::checkSegment(segment) || key.empty()) {
-    return Status::Error("arguments invalid!");
-  }
-
-  cpp2::GetReq req;
-  req.segment_ref() = std::move(segment);
-  req.key_ref() = std::move(key);
-  folly::Promise<StatusOr<std::string>> promise;
-  auto future = promise.getFuture();
-  getResponse(
-      std::move(req),
-      [](auto client, auto request) { return client->future_get(request); },
-      [](cpp2::GetResp&& resp) -> std::string { return resp.get_value(); },
-      std::move(promise));
-  return future;
-}
-
-folly::Future<StatusOr<std::vector<std::string>>> MetaClient::multiGet(
-    std::string segment, std::vector<std::string> keys) {
-  if (!nebula::meta::checkSegment(segment) || keys.empty()) {
-    return Status::Error("arguments invalid!");
-  }
-
-  cpp2::MultiGetReq req;
-  req.segment_ref() = std::move(segment);
-  req.keys_ref() = std::move(keys);
-  folly::Promise<StatusOr<std::vector<std::string>>> promise;
-  auto future = promise.getFuture();
-  getResponse(
-      std::move(req),
-      [](auto client, auto request) { return client->future_multiGet(request); },
-      [](cpp2::MultiGetResp&& resp) -> std::vector<std::string> { return resp.get_values(); },
-      std::move(promise));
-  return future;
-}
-
-folly::Future<StatusOr<std::vector<std::string>>> MetaClient::scan(std::string segment,
-                                                                   std::string start,
-                                                                   std::string end) {
-  if (!nebula::meta::checkSegment(segment) || start.empty() || end.empty()) {
-    return Status::Error("arguments invalid!");
-  }
-
-  cpp2::ScanReq req;
-  req.segment_ref() = std::move(segment);
-  req.start_ref() = std::move(start);
-  req.end_ref() = std::move(end);
-  folly::Promise<StatusOr<std::vector<std::string>>> promise;
-  auto future = promise.getFuture();
-  getResponse(
-      std::move(req),
-      [](auto client, auto request) { return client->future_scan(request); },
-      [](cpp2::ScanResp&& resp) -> std::vector<std::string> { return resp.get_values(); },
-      std::move(promise));
-  return future;
-}
-
-folly::Future<StatusOr<bool>> MetaClient::remove(std::string segment, std::string key) {
-  if (!nebula::meta::checkSegment(segment) || key.empty()) {
-    return Status::Error("arguments invalid!");
-  }
-
-  cpp2::RemoveReq req;
-  req.segment_ref() = std::move(segment);
-  req.key_ref() = std::move(key);
-  folly::Promise<StatusOr<bool>> promise;
-  auto future = promise.getFuture();
-  getResponse(
-      std::move(req),
-      [](auto client, auto request) { return client->future_remove(request); },
-      [](cpp2::ExecResp&& resp) -> bool {
-        return resp.get_code() == nebula::cpp2::ErrorCode::SUCCEEDED;
-      },
-      std::move(promise));
-  return future;
-}
-
-folly::Future<StatusOr<bool>> MetaClient::removeRange(std::string segment,
-                                                      std::string start,
-                                                      std::string end) {
-  if (!nebula::meta::checkSegment(segment) || start.empty() || end.empty()) {
-    return Status::Error("arguments invalid!");
-  }
-
-  cpp2::RemoveRangeReq req;
-  req.segment_ref() = std::move(segment);
-  req.start_ref() = std::move(start);
-  req.end_ref() = std::move(end);
-  folly::Promise<StatusOr<bool>> promise;
-  auto future = promise.getFuture();
-  getResponse(
-      std::move(req),
-      [](auto client, auto request) { return client->future_removeRange(request); },
-      [](cpp2::ExecResp&& resp) -> bool {
-        return resp.get_code() == nebula::cpp2::ErrorCode::SUCCEEDED;
-      },
-      std::move(promise));
-  return future;
-}
-
 PartsMap MetaClient::getPartsMapFromCache(const HostAddr& host) {
   folly::rcu_reader guard;
   const auto& metadata = *metadata_.load();
@@ -2777,50 +2647,6 @@ folly::Future<StatusOr<std::vector<cpp2::RoleItem>>> MetaClient::getUserRoles(st
   return future;
 }
 
-folly::Future<StatusOr<std::string>> MetaClient::getTagDefaultValue(GraphSpaceID spaceId,
-                                                                    TagID tagId,
-                                                                    const std::string& field) {
-  cpp2::GetReq req;
-  static std::string defaultKey = "__default__";
-  req.segment_ref() = defaultKey;
-  std::string key;
-  key.reserve(64);
-  key.append(reinterpret_cast<const char*>(&spaceId), sizeof(GraphSpaceID));
-  key.append(reinterpret_cast<const char*>(&tagId), sizeof(TagID));
-  key.append(field);
-  req.key_ref() = std::move(key);
-  folly::Promise<StatusOr<std::string>> promise;
-  auto future = promise.getFuture();
-  getResponse(
-      std::move(req),
-      [](auto client, auto request) { return client->future_get(request); },
-      [](cpp2::GetResp&& resp) -> std::string { return resp.get_value(); },
-      std::move(promise));
-  return future;
-}
-
-folly::Future<StatusOr<std::string>> MetaClient::getEdgeDefaultValue(GraphSpaceID spaceId,
-                                                                     EdgeType edgeType,
-                                                                     const std::string& field) {
-  cpp2::GetReq req;
-  static std::string defaultKey = "__default__";
-  req.segment_ref() = defaultKey;
-  std::string key;
-  key.reserve(64);
-  key.append(reinterpret_cast<const char*>(&spaceId), sizeof(GraphSpaceID));
-  key.append(reinterpret_cast<const char*>(&edgeType), sizeof(EdgeType));
-  key.append(field);
-  req.key_ref() = std::move(key);
-  folly::Promise<StatusOr<std::string>> promise;
-  auto future = promise.getFuture();
-  getResponse(
-      std::move(req),
-      [](auto client, auto request) { return client->future_get(request); },
-      [](cpp2::GetResp&& resp) -> std::string { return resp.get_value(); },
-      std::move(promise));
-  return future;
-}
-
 folly::Future<StatusOr<bool>> MetaClient::regConfig(const std::vector<cpp2::ConfigItem>& items) {
   cpp2::RegConfigReq req;
   req.items_ref() = items;

diff --git a/src/clients/meta/MetaClient.h b/src/clients/meta/MetaClient.h
@@ -371,25 +371,6 @@ class MetaClient {
 
   folly::Future<StatusOr<std::vector<cpp2::IndexStatus>>> listEdgeIndexStatus(GraphSpaceID spaceId);
 
-  // Operations for custom kv
-  folly::Future<StatusOr<bool>> multiPut(std::string segment,
-                                         std::vector<std::pair<std::string, std::string>> pairs);
-
-  folly::Future<StatusOr<std::string>> get(std::string segment, std::string key);
-
-  folly::Future<StatusOr<std::vector<std::string>>> multiGet(std::string segment,
-                                                             std::vector<std::string> keys);
-
-  folly::Future<StatusOr<std::vector<std::string>>> scan(std::string segment,
-                                                         std::string start,
-                                                         std::string end);
-
-  folly::Future<StatusOr<bool>> remove(std::string segment, std::string key);
-
-  folly::Future<StatusOr<bool>> removeRange(std::string segment,
-                                            std::string start,
-                                            std::string end);
-
   // Operations for users.
   folly::Future<StatusOr<bool>> createUser(std::string account,
                                            std::string password,
@@ -589,14 +570,6 @@ class MetaClient {
 
   const std::vector<HostAddr>& getAddresses();
 
-  folly::Future<StatusOr<std::string>> getTagDefaultValue(GraphSpaceID spaceId,
-                                                          TagID tagId,
-                                                          const std::string& field);
-
-  folly::Future<StatusOr<std::string>> getEdgeDefaultValue(GraphSpaceID spaceId,
-                                                           EdgeType edgeType,
-                                                           const std::string& field);
-
   std::vector<cpp2::RoleItem> getRolesByUserFromCache(const std::string& user);
 
   Status authCheckFromCache(const std::string& account, const std::string& password);

diff --git a/src/common/meta/Common.h b/src/common/meta/Common.h
@@ -62,13 +62,6 @@ using RemoteListeners =
     std::unordered_map<GraphSpaceID,
                        std::unordered_map<PartitionID, std::vector<RemoteListenerInfo>>>;
 
-inline bool checkSegment(const std::string& segment) {
-  static const std::regex pattern("^[0-9a-zA-Z]+$");
-  if (!segment.empty() && std::regex_match(segment, pattern)) {
-    return true;
-  }
-  return false;
-}
 
 }  // namespace meta
 }  // namespace nebula

diff --git a/src/common/utils/MetaKeyUtils.cpp b/src/common/utils/MetaKeyUtils.cpp
@@ -760,13 +760,6 @@ std::string MetaKeyUtils::indexZoneKey(const std::string& name) {
   return key;
 }
 
-std::string MetaKeyUtils::assembleSegmentKey(const std::string& segment, const std::string& key) {
-  std::string segmentKey;
-  segmentKey.reserve(64);
-  segmentKey.append(segment).append(key.data(), key.size());
-  return segmentKey;
-}
-
 std::string MetaKeyUtils::userPrefix() {
   return kUsersTable;
 }

diff --git a/src/common/utils/MetaKeyUtils.h b/src/common/utils/MetaKeyUtils.h
@@ -243,8 +243,6 @@ class MetaKeyUtils final {
 
   static std::string indexZoneKey(const std::string& name);
 
-  static std::string assembleSegmentKey(const std::string& segment, const std::string& key);
-
   static std::string userPrefix();
 
   static std::string userKey(const std::string& account);

diff --git a/src/interface/meta.thrift b/src/interface/meta.thrift
@@ -518,58 +518,6 @@ struct GetWorkerIdResp {
     3: i64              workerid,
 }
 
-struct MultiPutReq {
-    // segment is used to avoid conflict with system data.
-    // it should be comprised of numbers and letters.
-    1: binary                   segment,
-    2: list<common.KeyValue>    pairs,
-}
-
-struct GetReq {
-    1: binary segment,
-    2: binary key,
-}
-
-struct GetResp {
-    1: common.ErrorCode code,
-    2: common.HostAddr  leader,
-    3: binary           value,
-}
-
-struct MultiGetReq {
-    1: binary       segment,
-    2: list<binary> keys,
-}
-
-struct MultiGetResp {
-    1: common.ErrorCode code,
-    2: common.HostAddr  leader,
-    3: list<binary>     values,
-}
-
-struct RemoveReq {
-    1: binary segment,
-    2: binary key,
-}
-
-struct RemoveRangeReq {
-    1: binary segment,
-    2: binary start,
-    3: binary end,
-}
-
-struct ScanReq {
-    1: binary segment,
-    2: binary start,
-    3: binary end,
-}
-
-struct ScanResp {
-    1: common.ErrorCode code,
-    2: common.HostAddr  leader,
-    3: list<binary>     values,
-}
-
 struct HBResp {
     1: common.ErrorCode code,
     2: common.HostAddr  leader,
@@ -1220,13 +1168,6 @@ service MetaService {
 
     GetWorkerIdResp getWorkerId(1: GetWorkerIdReq req);
 
-    ExecResp multiPut(1: MultiPutReq req);
-    GetResp get(1: GetReq req);
-    MultiGetResp multiGet(1: MultiGetReq req);
-    ExecResp remove(1: RemoveReq req);
-    ExecResp removeRange(1: RemoveRangeReq req);
-    ScanResp scan(1: ScanReq req);
-
     ExecResp             createTagIndex(1: CreateTagIndexReq req);
     ExecResp             dropTagIndex(1: DropTagIndexReq req );
     GetTagIndexResp      getTagIndex(1: GetTagIndexReq req);

diff --git a/src/meta/ActiveHostsMan.cpp b/src/meta/ActiveHostsMan.cpp
@@ -8,7 +8,6 @@
 #include <thrift/lib/cpp/util/EnumUtils.h>
 
 #include "common/utils/Utils.h"
-#include "meta/common/MetaCommon.h"
 #include "meta/processors/Common.h"
 
 DECLARE_int32(heartbeat_interval_secs);

diff --git a/src/meta/CMakeLists.txt b/src/meta/CMakeLists.txt
@@ -38,12 +38,6 @@ nebula_add_library(
     processors/index/ListEdgeIndexesProcessor.cpp
     processors/service/ServiceProcessor.cpp
     processors/index/FTIndexProcessor.cpp
-    processors/kv/GetProcessor.cpp
-    processors/kv/MultiGetProcessor.cpp
-    processors/kv/MultiPutProcessor.cpp
-    processors/kv/RemoveProcessor.cpp
-    processors/kv/RemoveRangeProcessor.cpp
-    processors/kv/ScanProcessor.cpp
     processors/admin/HBProcessor.cpp
     processors/admin/AgentHBProcessor.cpp
     processors/user/AuthenticationProcessor.cpp