Merge branch 'master' into keep

src/clients/meta/MetaClient.cpp

@@ -3116,102 +3116,6 @@ folly::Future<StatusOr<std::vector<cpp2::Zone>>> MetaClient::listZones() {
   return future;
 }
 
-folly::Future<StatusOr<bool>> MetaClient::addGroup(std::string groupName,
-                                                   std::vector<std::string> zoneNames) {
-  cpp2::AddGroupReq req;
-  req.set_group_name(std::move(groupName));
-  req.set_zone_names(std::move(zoneNames));
-
-  folly::Promise<StatusOr<bool>> promise;
-  auto future = promise.getFuture();
-  getResponse(
-      std::move(req),
-      [](auto client, auto request) { return client->future_addGroup(request); },
-      [](cpp2::ExecResp&& resp) -> bool {
-        return resp.get_code() == nebula::cpp2::ErrorCode::SUCCEEDED;
-      },
-      std::move(promise));
-  return future;
-}
-
-folly::Future<StatusOr<bool>> MetaClient::dropGroup(std::string groupName) {
-  cpp2::DropGroupReq req;
-  req.set_group_name(std::move(groupName));
-
-  folly::Promise<StatusOr<bool>> promise;
-  auto future = promise.getFuture();
-  getResponse(
-      std::move(req),
-      [](auto client, auto request) { return client->future_dropGroup(request); },
-      [](cpp2::ExecResp&& resp) -> bool {
-        return resp.get_code() == nebula::cpp2::ErrorCode::SUCCEEDED;
-      },
-      std::move(promise));
-  return future;
-}
-
-folly::Future<StatusOr<bool>> MetaClient::addZoneIntoGroup(std::string zoneName,
-                                                           std::string groupName) {
-  cpp2::AddZoneIntoGroupReq req;
-  req.set_zone_name(zoneName);
-  req.set_group_name(groupName);
-
-  folly::Promise<StatusOr<bool>> promise;
-  auto future = promise.getFuture();
-  getResponse(
-      std::move(req),
-      [](auto client, auto request) { return client->future_addZoneIntoGroup(request); },
-      [](cpp2::ExecResp&& resp) -> bool {
-        return resp.get_code() == nebula::cpp2::ErrorCode::SUCCEEDED;
-      },
-      std::move(promise));
-  return future;
-}
-
-folly::Future<StatusOr<bool>> MetaClient::dropZoneFromGroup(std::string zoneName,
-                                                            std::string groupName) {
-  cpp2::DropZoneFromGroupReq req;
-  req.set_zone_name(zoneName);
-  req.set_group_name(groupName);
-
-  folly::Promise<StatusOr<bool>> promise;
-  auto future = promise.getFuture();
-  getResponse(
-      std::move(req),
-      [](auto client, auto request) { return client->future_dropZoneFromGroup(request); },
-      [](cpp2::ExecResp&& resp) -> bool {
-        return resp.get_code() == nebula::cpp2::ErrorCode::SUCCEEDED;
-      },
-      std::move(promise));
-  return future;
-}
-
-folly::Future<StatusOr<std::vector<std::string>>> MetaClient::getGroup(std::string groupName) {
-  cpp2::GetGroupReq req;
-  req.set_group_name(std::move(groupName));
-
-  folly::Promise<StatusOr<std::vector<std::string>>> promise;
-  auto future = promise.getFuture();
-  getResponse(
-      std::move(req),
-      [](auto client, auto request) { return client->future_getGroup(request); },
-      [](cpp2::GetGroupResp&& resp) -> decltype(auto) { return resp.get_zone_names(); },
-      std::move(promise));
-  return future;
-}
-
-folly::Future<StatusOr<std::vector<cpp2::Group>>> MetaClient::listGroups() {
-  cpp2::ListGroupsReq req;
-  folly::Promise<StatusOr<std::vector<cpp2::Group>>> promise;
-  auto future = promise.getFuture();
-  getResponse(
-      std::move(req),
-      [](auto client, auto request) { return client->future_listGroups(request); },
-      [](cpp2::ListGroupsResp&& resp) -> decltype(auto) { return resp.get_groups(); },
-      std::move(promise));
-  return future;
-}
-
 folly::Future<StatusOr<cpp2::StatsItem>> MetaClient::getStats(GraphSpaceID spaceId) {
   cpp2::GetStatsReq req;
   req.set_space_id(spaceId);

src/clients/meta/MetaClient.h

@@ -607,18 +607,6 @@ class MetaClient {
 
   folly::Future<StatusOr<std::vector<cpp2::Zone>>> listZones();
 
-  folly::Future<StatusOr<bool>> addGroup(std::string groupName, std::vector<std::string> zoneNames);
-
-  folly::Future<StatusOr<bool>> dropGroup(std::string groupName);
-
-  folly::Future<StatusOr<bool>> addZoneIntoGroup(std::string zoneName, std::string groupName);
-
-  folly::Future<StatusOr<bool>> dropZoneFromGroup(std::string zoneName, std::string groupName);
-
-  folly::Future<StatusOr<std::vector<std::string>>> getGroup(std::string groupName);
-
-  folly::Future<StatusOr<std::vector<cpp2::Group>>> listGroups();
-
   Status refreshCache();
 
   folly::Future<StatusOr<cpp2::StatsItem>> getStats(GraphSpaceID spaceId);

src/graph/executor/CMakeLists.txt

@@ -65,7 +65,6 @@ nebula_add_library(
     admin/DownloadExecutor.cpp
     admin/IngestExecutor.cpp
     admin/ConfigExecutor.cpp
-    admin/GroupExecutor.cpp
     admin/ZoneExecutor.cpp
     admin/ShowTSClientsExecutor.cpp
     admin/SignInTSServiceExecutor.cpp

src/graph/executor/Executor.cpp

@@ -24,7 +24,6 @@
 #include "graph/executor/admin/DownloadExecutor.h"
 #include "graph/executor/admin/DropUserExecutor.h"
 #include "graph/executor/admin/GrantRoleExecutor.h"
-#include "graph/executor/admin/GroupExecutor.h"
 #include "graph/executor/admin/IngestExecutor.h"
 #include "graph/executor/admin/KillQueryExecutor.h"
 #include "graph/executor/admin/ListRolesExecutor.h"
@@ -435,24 +434,6 @@ Executor *Executor::makeExecutor(QueryContext *qctx, const PlanNode *node) {
     case PlanNode::Kind::kSubgraph: {
       return pool->add(new SubgraphExecutor(node, qctx));
     }
-    case PlanNode::Kind::kAddGroup: {
-      return pool->add(new AddGroupExecutor(node, qctx));
-    }
-    case PlanNode::Kind::kDropGroup: {
-      return pool->add(new DropGroupExecutor(node, qctx));
-    }
-    case PlanNode::Kind::kDescribeGroup: {
-      return pool->add(new DescribeGroupExecutor(node, qctx));
-    }
-    case PlanNode::Kind::kAddZoneIntoGroup: {
-      return pool->add(new AddZoneIntoGroupExecutor(node, qctx));
-    }
-    case PlanNode::Kind::kDropZoneFromGroup: {
-      return pool->add(new DropZoneFromGroupExecutor(node, qctx));
-    }
-    case PlanNode::Kind::kShowGroups: {
-      return pool->add(new ListGroupsExecutor(node, qctx));
-    }
     case PlanNode::Kind::kAddZone: {
       return pool->add(new AddZoneExecutor(node, qctx));
     }

src/graph/optimizer/rule/TopNRule.cpp

@@ -4,6 +4,7 @@
  */
 
 #include "graph/optimizer/rule/TopNRule.h"
+
 #include "graph/optimizer/OptContext.h"
 #include "graph/optimizer/OptGroup.h"
 #include "graph/planner/plan/PlanNode.h"