Merge branch 'hotfix_1.10_4.0.x_33465' into '1.10_release_4.0.x'

Hotfix 1.10 4.0.x 33465

See merge request dt-insight-engine/flinkStreamSQL!198

Author: zoudaokoulife

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

@@ -53,6 +53,7 @@
 import java.util.Queue;
 import java.util.Set;
 import java.util.Arrays;
+import java.util.stream.Stream;
 
 import static org.apache.calcite.sql.SqlKind.*;
 
@@ -978,7 +979,13 @@ private SqlIdentifier checkAndReplaceJoinCondition(SqlNode node, Map<String, Str
     public Map<String, String> buildTmpTableFieldRefOriField(Set<String> fieldSet, String newTableAliasName){
         Map<String, String> refInfo = Maps.newConcurrentMap();
         for(String field : fieldSet){
-            String[] fields = StringUtils.splitByWholeSeparator(field, "as");
+            String[] fields = StringUtils.splitByWholeSeparator(field, " as ");
+            if (fields != null) {
+                fields = Stream
+                        .of(fields)
+                        .map(StringUtils::trimToNull)
+                        .toArray(String[]::new);
+            }
             String oldKey = field;
             String[] oldFieldInfo = StringUtils.splitByWholeSeparator(fields[0], ".");
             String oldFieldName = oldFieldInfo.length == 2 ? oldFieldInfo[1] : oldFieldInfo[0];