fix - merge conflict

vesoft-inc · Nov 17, 2021 · 8716a43 · 8716a43
1 parent 373d1a9
commit 8716a43
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 17 deletions.
diff --git a/src/graph/executor/Executor.cpp b/src/graph/executor/Executor.cpp
@@ -388,21 +388,6 @@ Executor *Executor::makeExecutor(QueryContext *qctx, const PlanNode *node) {
     case PlanNode::Kind::kDescribeUser: {
       return pool->add(new DescribeUserExecutor(node, qctx));
     }
-    case PlanNode::Kind::kBalanceLeaders: {
-      return pool->add(new BalanceLeadersExecutor(node, qctx));
-    }
-    case PlanNode::Kind::kBalance: {
-      return pool->add(new BalanceExecutor(node, qctx));
-    }
-    case PlanNode::Kind::kStopBalance: {
-      return pool->add(new StopBalanceExecutor(node, qctx));
-    }
-    case PlanNode::Kind::kResetBalance: {
-      return pool->add(new ResetBalanceExecutor(node, qctx));
-    }
-    case PlanNode::Kind::kShowBalance: {
-      return pool->add(new ShowBalanceExecutor(node, qctx));
-    }
     case PlanNode::Kind::kShowConfigs: {
       return pool->add(new ShowConfigsExecutor(node, qctx));
     }

diff --git a/src/graph/validator/Validator.cpp b/src/graph/validator/Validator.cpp
@@ -133,8 +133,6 @@ std::unique_ptr<Validator> Validator::makeValidator(Sentence* sentence, QueryCon
       return std::make_unique<ShowRolesInSpaceValidator>(sentence, context);
     case Sentence::Kind::kDescribeUser:
       return std::make_unique<DescribeUserValidator>(sentence, context);
-    case Sentence::Kind::kBalance:
-      return std::make_unique<BalanceValidator>(sentence, context);
     case Sentence::Kind::kAdminJob:
     case Sentence::Kind::kAdminShowJobs:
       return std::make_unique<AdminJobValidator>(sentence, context);