Merge remote-tracking branch 'origin/1.5_v3.6.1' into 1.5_v3.7.2

Author: todd5167

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

@@ -372,39 +372,33 @@ private SqlNode replaceSelectFieldName(SqlNode selectNode, HashBasedTable<String
             return sqlIdentifier;
         }else if(selectNode.getKind() == LITERAL || selectNode.getKind() == LITERAL_CHAIN){//字面含义
             return selectNode;
-        }else if(selectNode.getKind() == OTHER_FUNCTION
+        }else if(  AGGREGATE.contains(selectNode.getKind())
+                || AVG_AGG_FUNCTIONS.contains(selectNode.getKind())
+                || COMPARISON.contains(selectNode.getKind())
+                || selectNode.getKind() == OTHER_FUNCTION
                 || selectNode.getKind() == DIVIDE
                 || selectNode.getKind() == CAST
-                || selectNode.getKind() == SUM
-                || selectNode.getKind() == AVG
-                || selectNode.getKind() == MAX
-                || selectNode.getKind() == MIN
                 || selectNode.getKind() == TRIM
                 || selectNode.getKind() == TIMES
                 || selectNode.getKind() == PLUS
-                || selectNode.getKind() == IN
+                || selectNode.getKind() == NOT_IN
                 || selectNode.getKind() == OR
                 || selectNode.getKind() == AND
-                || selectNode.getKind() == COUNT
-                || selectNode.getKind() == SUM0
-                || selectNode.getKind() == LEAD
-                || selectNode.getKind() == LAG
-                || selectNode.getKind() == EQUALS
-                || selectNode.getKind() == NOT_EQUALS
                 || selectNode.getKind() == MINUS
                 || selectNode.getKind() == TUMBLE
                 || selectNode.getKind() == TUMBLE_START
                 || selectNode.getKind() == TUMBLE_END
                 || selectNode.getKind() == SESSION
                 || selectNode.getKind() == SESSION_START
                 || selectNode.getKind() == SESSION_END
+                || selectNode.getKind() == HOP
+                || selectNode.getKind() == HOP_START
+                || selectNode.getKind() == HOP_END
                 || 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
+                || selectNode.getKind() == CONTAINS
+
                 ){
             SqlBasicCall sqlBasicCall = (SqlBasicCall) selectNode;
             for(int i=0; i<sqlBasicCall.getOperands().length; i++){