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

Author: gituser

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

@@ -294,7 +294,7 @@ private JoinInfo dealNestJoin(SqlJoin joinNode,
         SqlBasicCall buildAs = TableUtils.buildAsNodeByJoinInfo(joinInfo, null, null);
 
         if(rightIsSide){
-            addSideInfoToExeQueue(queueInfo, joinInfo, joinNode, parentSelectList, parentGroupByList, parentWhere, tableRef);
+            addSideInfoToExeQueue(queueInfo, joinInfo, joinNode, parentSelectList, parentGroupByList, parentWhere, tableRef, fieldRef);
         }
 
         SqlNode newLeftNode = joinNode.getLeft();
@@ -307,7 +307,7 @@ private JoinInfo dealNestJoin(SqlJoin joinNode,
 
             //替换leftNode 为新的查询
             joinNode.setLeft(buildAs);
-            replaceSelectAndWhereField(buildAs, leftJoinNode, tableRef, parentSelectList, parentGroupByList, parentWhere);
+            replaceSelectAndWhereField(buildAs, leftJoinNode, tableRef, fieldRef, parentSelectList, parentGroupByList, parentWhere);
         }
 
         return joinInfo;
@@ -330,7 +330,8 @@ public void addSideInfoToExeQueue(Queue<Object> queueInfo,
                                       SqlNodeList parentSelectList,
                                       SqlNodeList parentGroupByList,
                                       SqlNode parentWhere,
-                                      Map<String, String> tableRef){
+                                      Map<String, String> tableRef,
+                                      Map<String, String> fieldRef){
         //只处理维表
         if(!joinInfo.isRightIsSideTable()){
             return;
@@ -342,7 +343,7 @@ public void addSideInfoToExeQueue(Queue<Object> queueInfo,
         //替换左表为新的表名称
         joinNode.setLeft(buildAs);
 
-        replaceSelectAndWhereField(buildAs, leftJoinNode, tableRef, parentSelectList, parentGroupByList, parentWhere);
+        replaceSelectAndWhereField(buildAs, leftJoinNode, tableRef, fieldRef, parentSelectList, parentGroupByList, parentWhere);
     }
 
     /**
@@ -357,6 +358,7 @@ public void addSideInfoToExeQueue(Queue<Object> queueInfo,
     public void replaceSelectAndWhereField(SqlBasicCall buildAs,
                    SqlNode leftJoinNode,
                    Map<String, String> tableRef,
+                   Map<String, String> fieldRef,
                    SqlNodeList parentSelectList,
                    SqlNodeList parentGroupByList,
                    SqlNode parentWhere){
@@ -370,23 +372,22 @@ public void replaceSelectAndWhereField(SqlBasicCall buildAs,
         }
 
         //替换select field 中的对应字段
-        HashBiMap<String, String> fieldReplaceRef = HashBiMap.create();
         for(SqlNode sqlNode : parentSelectList.getList()){
             for(String tbTmp : fromTableNameSet) {
-                TableUtils.replaceSelectFieldTable(sqlNode, tbTmp, newLeftTableName, fieldReplaceRef);
+                TableUtils.replaceSelectFieldTable(sqlNode, tbTmp, newLeftTableName, fieldRef);
             }
         }
 
         //TODO 应该根据上面的查询字段的关联关系来替换
         //替换where 中的条件相关
         for(String tbTmp : fromTableNameSet){
-            TableUtils.replaceWhereCondition(parentWhere, tbTmp, newLeftTableName, fieldReplaceRef);
+            TableUtils.replaceWhereCondition(parentWhere, tbTmp, newLeftTableName, fieldRef);
         }
 
         if(parentGroupByList != null){
             for(SqlNode sqlNode : parentGroupByList.getList()){
                 for(String tbTmp : fromTableNameSet) {
-                    TableUtils.replaceSelectFieldTable(sqlNode, tbTmp, newLeftTableName, fieldReplaceRef);
+                    TableUtils.replaceSelectFieldTable(sqlNode, tbTmp, newLeftTableName, fieldRef);
                 }
             }
         }
@@ -444,16 +445,15 @@ private void extractTemporaryQuery(SqlNode node, String tableAlias,
             queueInfo.offer(sqlBasicCall);
 
             //替换select中的表结构
-            HashBiMap<String, String> fieldReplaceRef = HashBiMap.create();
             for(SqlNode tmpSelect : parentSelectList.getList()){
                 for(String tbTmp : fromTableNameSet) {
-                    TableUtils.replaceSelectFieldTable(tmpSelect, tbTmp, tableAlias, fieldReplaceRef);
+                    TableUtils.replaceSelectFieldTable(tmpSelect, tbTmp, tableAlias, fieldRef);
                 }
             }
 
             //替换where 中的条件相关
             for(String tbTmp : fromTableNameSet){
-                TableUtils.replaceWhereCondition(parentWhere, tbTmp, tableAlias, fieldReplaceRef);
+                TableUtils.replaceWhereCondition(parentWhere, tbTmp, tableAlias, fieldRef);
             }
 
             for(String tbTmp : fromTableNameSet){

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

@@ -312,7 +312,7 @@ public static void getFromTableInfo(SqlNode fromTable, Set<String> tableNameSet)
     public static void replaceSelectFieldTable(SqlNode selectNode,
                                                String oldTbName,
                                                String newTbName,
-                                               HashBiMap<String, String> fieldReplaceRef) {
+                                               Map<String, String> fieldReplaceRef) {
         if (selectNode.getKind() == AS) {
             SqlNode leftNode = ((SqlBasicCall) selectNode).getOperands()[0];
             replaceSelectFieldTable(leftNode, oldTbName, newTbName, fieldReplaceRef);
@@ -406,22 +406,13 @@ public static void replaceSelectFieldTable(SqlNode selectNode,
     private static void replaceOneSelectField(SqlIdentifier sqlIdentifier,
                                               String newTbName,
                                               String oldTbName,
-                                              HashBiMap<String, String> fieldReplaceRef){
+                                              Map<String, String> fieldReplaceRef){
         SqlIdentifier newField = sqlIdentifier.setName(0, newTbName);
         String fieldName = sqlIdentifier.names.get(1);
-        String fieldKey = oldTbName + "_" + fieldName;
-
-        if(!fieldReplaceRef.containsKey(fieldKey)){
-            if(fieldReplaceRef.inverse().get(fieldName) != null){
-                //换一个名字
-                String mappingFieldName = ParseUtils.dealDuplicateFieldName(fieldReplaceRef, fieldName);
-                newField = newField.setName(1, mappingFieldName);
-                fieldReplaceRef.put(fieldKey, mappingFieldName);
-            } else {
-                fieldReplaceRef.put(fieldKey, fieldName);
-            }
-        }else {
-            newField = newField.setName(1, fieldReplaceRef.get(fieldKey));
+        String fieldKey = oldTbName + "." + fieldName;
+        if(fieldReplaceRef.get(fieldKey) != null){
+            String newFieldName = fieldReplaceRef.get(fieldKey).split("\\.")[1];
+            newField = newField.setName(1, newFieldName);
         }
 
         sqlIdentifier.assignNamesFrom(newField);
@@ -522,7 +513,7 @@ public static String getTargetRefField(Map<String, String> refFieldMap, String c
         return preFieldName;
     }
 
-    public static void replaceWhereCondition(SqlNode parentWhere, String oldTbName, String newTbName, HashBiMap<String, String> fieldReplaceRef){
+    public static void replaceWhereCondition(SqlNode parentWhere, String oldTbName, String newTbName, Map<String, String> fieldReplaceRef){
 
         if(parentWhere == null){
             return;
@@ -538,7 +529,7 @@ public static void replaceWhereCondition(SqlNode parentWhere, String oldTbName,
         }
     }
 
-    private static void replaceConditionNode(SqlNode selectNode, String oldTbName, String newTbName, HashBiMap<String, String> fieldReplaceRef) {
+    private static void replaceConditionNode(SqlNode selectNode, String oldTbName, String newTbName, Map<String, String> fieldReplaceRef) {
         if(selectNode.getKind() == IDENTIFIER){
             SqlIdentifier sqlIdentifier = (SqlIdentifier) selectNode;