Clear the code associated with AddHosts/RemoveHosts (vesoft-inc#1172)

close vesoft-inc#736
whitewum · Nov 11, 2019 · bd07ef0 · bd07ef0
1 parent 0ec8c23
commit bd07ef0
Show file tree

Hide file tree

Showing 28 changed files with 52 additions and 721 deletions.
diff --git a/src/graph/AddHostsExecutor.cpp b/src/graph/AddHostsExecutor.cpp
diff --git a/src/graph/AddHostsExecutor.h b/src/graph/AddHostsExecutor.h
diff --git a/src/graph/CMakeLists.txt b/src/graph/CMakeLists.txt
@@ -28,8 +28,6 @@ nebula_add_library(
  AssignmentExecutor.cpp
  InterimResult.cpp
  VariableHolder.cpp
- AddHostsExecutor.cpp
- RemoveHostsExecutor.cpp
  CreateSpaceExecutor.cpp
  DropSpaceExecutor.cpp
  DescribeSpaceExecutor.cpp

diff --git a/src/graph/Executor.cpp b/src/graph/Executor.cpp
@@ -25,8 +25,6 @@
 #include "graph/InsertEdgeExecutor.h"
 #include "graph/AssignmentExecutor.h"
 #include "graph/ShowExecutor.h"
-#include "graph/AddHostsExecutor.h"
-#include "graph/RemoveHostsExecutor.h"
 #include "graph/CreateSpaceExecutor.h"
 #include "graph/DescribeSpaceExecutor.h"
 #include "graph/DropSpaceExecutor.h"
@@ -100,12 +98,6 @@ std::unique_ptr<Executor> Executor::makeExecutor(Sentence *sentence) {
  case Sentence::Kind::kAssignment:
  executor = std::make_unique<AssignmentExecutor>(sentence, ectx());
  break;
- case Sentence::Kind::kAddHosts:
- executor = std::make_unique<AddHostsExecutor>(sentence, ectx());
- break;
- case Sentence::Kind::kRemoveHosts:
- executor = std::make_unique<RemoveHostsExecutor>(sentence, ectx());
- break;
  case Sentence::Kind::kCreateSpace:
  executor = std::make_unique<CreateSpaceExecutor>(sentence, ectx());
  break;

diff --git a/src/graph/PermissionManager.h b/src/graph/PermissionManager.h
@@ -31,8 +31,6 @@
 // kDeleteVertex | Y | Y | Y |
 // kDeleteEdge | Y | Y | Y |
 // kFind | Y | Y | Y | Y
-// kAddHosts | Y | | |
-// kRemoveHosts | Y | | |
 // kCreateSpace | Y | | |
 // kDropSpace | Y | Y | |
 // kYield | Y | Y | Y | Y

diff --git a/src/graph/RemoveHostsExecutor.cpp b/src/graph/RemoveHostsExecutor.cpp
diff --git a/src/graph/RemoveHostsExecutor.h b/src/graph/RemoveHostsExecutor.h
diff --git a/src/graph/test/UpdateTestBase.h b/src/graph/test/UpdateTestBase.h
@@ -62,15 +62,6 @@ std::unique_ptr<GraphClient> UpdateTestBase::client_;
 
 // static
 AssertionResult UpdateTestBase::prepareSchema() {
- {
- cpp2::ExecutionResponse resp;
- std::string host = folly::stringPrintf("127.0.0.1:%u", storagePort_);
- std::string cmd = "ADD HOSTS " + host;
- auto code = client_->execute(cmd, resp);
- if (cpp2::ErrorCode::SUCCEEDED != code) {
- return TestError() << "Do cmd:" << cmd << " failed";
- }
- }
  {
  cpp2::ExecutionResponse resp;
  std::string cmd = "CREATE SPACE myspace_test2(partition_num=1, replica_factor=1)";
@@ -266,14 +257,6 @@ AssertionResult UpdateTestBase::removeData() {
  return TestError() << "Do cmd:" << cmd << " failed";
  }
  }
- {
- cpp2::ExecutionResponse resp;
- std::string cmd = folly::stringPrintf("REMOVE HOSTS 127.0.0.1:%u", storagePort_);
- auto code = client_->execute(cmd, resp);
- if (cpp2::ErrorCode::SUCCEEDED != code) {
- return TestError() << "Do cmd:" << cmd << " failed";
- }
- }
  return TestOK();
 }
 

diff --git a/src/interface/meta.thrift b/src/interface/meta.thrift
@@ -262,11 +262,6 @@ struct ListEdgesResp {
  3: list<EdgeItem> edges,
 }
 
-// Host related operations.
-struct AddHostsReq {
- 1: list<common.HostAddr> hosts;
-}
-
 struct ListHostsReq {
 }
 
@@ -294,11 +289,6 @@ struct ListPartsResp {
  3: list<PartItem> parts,
 }
 
-struct RemoveHostsReq {
- 1: list<common.HostAddr> hosts;
-}
-
-// Parts related operations.
 struct GetPartsAllocReq {
  1: common.GraphSpaceID space_id,
 }
@@ -547,8 +537,6 @@ service MetaService {
  GetEdgeResp getEdge(1: GetEdgeReq req);
  ListEdgesResp listEdges(1: ListEdgesReq req);
 
- ExecResp addHosts(1: AddHostsReq req);
- ExecResp removeHosts(1: RemoveHostsReq req);
  ListHostsResp listHosts(1: ListHostsReq req);
 
  GetPartsAllocResp getPartsAlloc(1: GetPartsAllocReq req);

diff --git a/src/meta/CMakeLists.txt b/src/meta/CMakeLists.txt
@@ -10,10 +10,8 @@ nebula_add_library(
  MetaServiceHandler.cpp
  MetaServiceUtils.cpp
  ActiveHostsMan.cpp
- processors/partsMan/AddHostsProcessor.cpp
  processors/partsMan/ListHostsProcessor.cpp
  processors/partsMan/ListPartsProcessor.cpp
- processors/partsMan/RemoveHostsProcessor.cpp
  processors/partsMan/CreateSpaceProcessor.cpp
  processors/partsMan/GetSpaceProcessor.cpp
  processors/partsMan/ListSpacesProcessor.cpp

diff --git a/src/meta/MetaServiceHandler.cpp b/src/meta/MetaServiceHandler.cpp
@@ -10,10 +10,8 @@
 #include "meta/processors/partsMan/DropSpaceProcessor.h"
 #include "meta/processors/partsMan/ListSpacesProcessor.h"
 #include "meta/processors/partsMan/GetSpaceProcessor.h"
-#include "meta/processors/partsMan/AddHostsProcessor.h"
 #include "meta/processors/partsMan/ListHostsProcessor.h"
 #include "meta/processors/partsMan/ListPartsProcessor.h"
-#include "meta/processors/partsMan/RemoveHostsProcessor.h"
 #include "meta/processors/partsMan/GetPartsAllocProcessor.h"
 #include "meta/processors/schemaMan/CreateTagProcessor.h"
 #include "meta/processors/schemaMan/AlterTagProcessor.h"
@@ -72,12 +70,6 @@ MetaServiceHandler::future_getSpace(const cpp2::GetSpaceReq& req) {
  RETURN_FUTURE(processor);
 }
 
-folly::Future<cpp2::ExecResp>
-MetaServiceHandler::future_addHosts(const cpp2::AddHostsReq& req) {
- auto* processor = AddHostsProcessor::instance(kvstore_);
- RETURN_FUTURE(processor);
-}
-
 folly::Future<cpp2::ListHostsResp>
 MetaServiceHandler::future_listHosts(const cpp2::ListHostsReq& req) {
  auto* processor = ListHostsProcessor::instance(kvstore_, adminClient_.get());
@@ -90,12 +82,6 @@ MetaServiceHandler::future_listParts(const cpp2::ListPartsReq& req) {
  RETURN_FUTURE(processor);
 }
 
-folly::Future<cpp2::ExecResp>
-MetaServiceHandler::future_removeHosts(const cpp2::RemoveHostsReq& req) {
- auto* processor = RemoveHostsProcessor::instance(kvstore_);
- RETURN_FUTURE(processor);
-}
-
 folly::Future<cpp2::GetPartsAllocResp>
 MetaServiceHandler::future_getPartsAlloc(const cpp2::GetPartsAllocReq& req) {
  auto* processor = GetPartsAllocProcessor::instance(kvstore_);

diff --git a/src/meta/MetaServiceHandler.h b/src/meta/MetaServiceHandler.h
@@ -38,18 +38,12 @@ class MetaServiceHandler final : public cpp2::MetaServiceSvIf {
  folly::Future<cpp2::GetSpaceResp>
  future_getSpace(const cpp2::GetSpaceReq& req) override;
 
- folly::Future<cpp2::ExecResp>
- future_addHosts(const cpp2::AddHostsReq& req) override;
-
  folly::Future<cpp2::ListHostsResp>
  future_listHosts(const cpp2::ListHostsReq& req) override;
 
  folly::Future<cpp2::ListPartsResp>
  future_listParts(const cpp2::ListPartsReq& req) override;
 
- folly::Future<cpp2::ExecResp>
- future_removeHosts(const cpp2::RemoveHostsReq& req) override;
-
  folly::Future<cpp2::GetPartsAllocResp>
  future_getPartsAlloc(const cpp2::GetPartsAllocReq& req) override;