Merge branch '1.5_v3.5.6' into v1.5.0_dev

Author: yanxi0227

core/src/main/java/com/dtstack/flink/sql/side/SideSqlExec.java

@@ -394,6 +394,10 @@ private SqlNode replaceSelectFieldName(SqlNode selectNode, HashBasedTable<String
                 || selectNode.getKind() == BETWEEN
                 || selectNode.getKind() == IS_NULL
                 || selectNode.getKind() == IS_NOT_NULL
+                || selectNode.getKind() == LESS_THAN
+                || selectNode.getKind() == GREATER_THAN
+                || selectNode.getKind() == LESS_THAN_OR_EQUAL
+                || selectNode.getKind() == GREATER_THAN_OR_EQUAL
                 ){
             SqlBasicCall sqlBasicCall = (SqlBasicCall) selectNode;
             for(int i=0; i<sqlBasicCall.getOperands().length; i++){

core/src/main/java/com/dtstack/flink/sql/table/AbsTableParser.java

@@ -79,7 +79,7 @@ public boolean dealKeyPattern(String fieldRow, TableInfo tableInfo){
 
     public void parseFieldsInfo(String fieldsInfo, TableInfo tableInfo){
 
-        String[] fieldRows = DtStringUtil.splitIgnoreQuotaBrackets(fieldsInfo, ",");
+        List<String> fieldRows = DtStringUtil.splitIgnoreQuota(fieldsInfo, ',');
         for(String fieldRow : fieldRows){
             fieldRow = fieldRow.trim();
             boolean isMatcherKey = dealKeyPattern(fieldRow, tableInfo);

core/src/main/java/com/dtstack/flink/sql/util/DtStringUtil.java

@@ -84,16 +84,6 @@ public static List<String> splitIgnoreQuota(String str, char delimiter){
         return tokensList;
     }
 
-    /***
-     * Split the specified string delimiter --- ignored in brackets and quotation marks delimiter
-     * @param str
-     * @param delimter
-     * @return
-     */
-    public static String[] splitIgnoreQuotaBrackets(String str, String delimter){
-        String splitPatternStr = delimter + "(?![^()]*+\\))(?![^{}]*+})(?![^\\[\\]]*+\\])(?=(?:[^\"]|\"[^\"]*\")*$)";
-        return str.split(splitPatternStr);
-    }
 
     public static String replaceIgnoreQuota(String str, String oriStr, String replaceStr){
         String splitPatternStr = oriStr + "(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)(?=(?:[^']*'[^']*')*[^']*$)";