sqlparser bugfix

simenliuxing · simenliuxing · commit 5b5b2c61cc56 · 2020-08-10T09:29:13.000+08:00
diff --git a/core/src/main/java/com/dtstack/flink/sql/side/SidePredicatesParser.java b/core/src/main/java/com/dtstack/flink/sql/side/SidePredicatesParser.java
@@ -49,8 +49,7 @@ public class SidePredicatesParser {
     private FlinkPlanner flinkPlanner = new FlinkPlanner();
 
     public void fillPredicatesForSideTable(String exeSql, Map<String, AbstractSideTableInfo> sideTableMap) throws SqlParseException {
-
-        SqlNode sqlNode = org.apache.calcite.sql.parser.SqlParser.create(exeSql).parseStmt();
+        SqlNode sqlNode = flinkPlanner.getParser().parse(exeSql);
         parseSql(sqlNode, sideTableMap, Maps.newHashMap());
     }
 
@@ -141,7 +140,7 @@ private void extractPredicateInfo(SqlNode whereNode, List<PredicateInfo> predica
         }
     }
 
-    private void fillPredicateInfoToList(SqlBasicCall whereNode, List<PredicateInfo> predicatesInfoList, String operatorName, SqlKind operatorKind,
+    private void  fillPredicateInfoToList(SqlBasicCall whereNode, List<PredicateInfo> predicatesInfoList, String operatorName, SqlKind operatorKind,
                                          int fieldIndex, int conditionIndex) {
         SqlNode sqlNode = whereNode.getOperands()[fieldIndex];
         if (sqlNode.getKind() == SqlKind.IDENTIFIER) {

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,7 @@ public class SidePredicatesParser {`
`49`	`49`	`private FlinkPlanner flinkPlanner = new FlinkPlanner();`
`50`	`50`
`51`	`51`	`public void fillPredicatesForSideTable(String exeSql, Map<String, AbstractSideTableInfo> sideTableMap) throws SqlParseException {`
`52`		`-`
`53`		`- SqlNode sqlNode = org.apache.calcite.sql.parser.SqlParser.create(exeSql).parseStmt();`
	`52`	`+ SqlNode sqlNode = flinkPlanner.getParser().parse(exeSql);`
`54`	`53`	`parseSql(sqlNode, sideTableMap, Maps.newHashMap());`
`55`	`54`	`}`
`56`	`55`
`@@ -141,7 +140,7 @@ private void extractPredicateInfo(SqlNode whereNode, List<PredicateInfo> predica`
`141`	`140`	`}`
`142`	`141`	`}`
`143`	`142`
`144`		`- private void fillPredicateInfoToList(SqlBasicCall whereNode, List<PredicateInfo> predicatesInfoList, String operatorName, SqlKind operatorKind,`
	`143`	`+ private void fillPredicateInfoToList(SqlBasicCall whereNode, List<PredicateInfo> predicatesInfoList, String operatorName, SqlKind operatorKind,`
`145`	`144`	`int fieldIndex, int conditionIndex) {`
`146`	`145`	`SqlNode sqlNode = whereNode.getOperands()[fieldIndex];`
`147`	`146`	`if (sqlNode.getKind() == SqlKind.IDENTIFIER) {`