From 8716a436bbf396ff51be924797e8ea4dd7c92a26 Mon Sep 17 00:00:00 2001
From: heroicNeZha <25311962+heroicNeZha@users.noreply.github.com>
Date: Wed, 17 Nov 2021 12:53:31 +0800
Subject: [PATCH] fix - merge conflict

---
 src/graph/executor/Executor.cpp   | 15 ---------------
 src/graph/validator/Validator.cpp |  2 --
 2 files changed, 17 deletions(-)

diff --git a/src/graph/executor/Executor.cpp b/src/graph/executor/Executor.cpp
index 2dd27ed2512..d7eb30f1759 100644
--- 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
index b49346ff0c2..7513a7ac93a 100644
--- 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);