From a5c53c4de2cd8a8f7f62e1c816b76e80da0332be Mon Sep 17 00:00:00 2001 From: chenhao16 Date: Mon, 28 Aug 2017 15:34:34 +0800 Subject: [PATCH] modify sql_scanner and remove multi host restrict when check tablets in clonechecker --- fe/src/com/baidu/palo/clone/CloneChecker.java | 10 ++-------- gensrc/parser/sql_scanner.flex | 1 + 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/fe/src/com/baidu/palo/clone/CloneChecker.java b/fe/src/com/baidu/palo/clone/CloneChecker.java index 88e7dc95c5..fcc2d51cbb 100644 --- a/fe/src/com/baidu/palo/clone/CloneChecker.java +++ b/fe/src/com/baidu/palo/clone/CloneChecker.java @@ -481,10 +481,7 @@ public class CloneChecker extends Daemon { } } - if (backendInfosMap.size() <= 1) { - return null; - } - + // maybe backendInfosMap size == 1 when migrate db // calculate avg used ratio long totalCapacityB = 0; long availableCapacityB = 0; @@ -564,10 +561,7 @@ public class CloneChecker extends Daemon { } } - if (backendInfosMap.size() <= 1) { - return null; - } - + // maybe backendInfosMap size == 1 when migrate db // init distributionLevelToBackendIds Map>> distributionLevelToBackendIds = new HashMap>>(); for (Level level : Level.values()) { diff --git a/gensrc/parser/sql_scanner.flex b/gensrc/parser/sql_scanner.flex index bf86863f4e..21dcf3fd16 100644 --- a/gensrc/parser/sql_scanner.flex +++ b/gensrc/parser/sql_scanner.flex @@ -73,6 +73,7 @@ import com.baidu.palo.common.util.SqlUtils; keywordMap.put("asc", new Integer(SqlParserSymbols.KW_ASC)); keywordMap.put("authors", new Integer(SqlParserSymbols.KW_AUTHORS)); keywordMap.put("backend", new Integer(SqlParserSymbols.KW_BACKEND)); + keywordMap.put("backends", new Integer(SqlParserSymbols.KW_BACKENDS)); keywordMap.put("backup", new Integer(SqlParserSymbols.KW_BACKUP)); keywordMap.put("begin", new Integer(SqlParserSymbols.KW_BEGIN)); keywordMap.put("between", new Integer(SqlParserSymbols.KW_BETWEEN));