Merge branch '1.8_release_3.9.x' into 1.8_release_3.10.x

Author: gituser

core/src/main/java/com/dtstack/flink/sql/Main.java

@@ -153,7 +153,7 @@ private static void sqlTranslation(String localSqlPluginPath, StreamTableEnviron
         SideSqlExec sideSqlExec = new SideSqlExec();
         sideSqlExec.setLocalSqlPluginPath(localSqlPluginPath);
         for (CreateTmpTableParser.SqlParserResult result : sqlTree.getTmpSqlList()) {
-            sideSqlExec.registerTmpTable(result, sideTableMap, tableEnv, registerTableCache);
+            sideSqlExec.exec(result.getExecSql(), sideTableMap, tableEnv, registerTableCache, queryConfig, result);
         }
 
         for (InsertSqlParser.SqlParseResult result : sqlTree.getExecSqlList()) {
@@ -169,7 +169,7 @@ private static void sqlTranslation(String localSqlPluginPath, StreamTableEnviron
                     SqlNode sqlNode = org.apache.calcite.sql.parser.SqlParser.create(realSql, CalciteConfig.MYSQL_LEX_CONFIG).parseStmt();
                     String tmpSql = ((SqlInsert) sqlNode).getSource().toString();
                     tmp.setExecSql(tmpSql);
-                    sideSqlExec.registerTmpTable(tmp, sideTableMap, tableEnv, registerTableCache);
+                    sideSqlExec.exec(tmp.getExecSql(), sideTableMap, tableEnv, registerTableCache, queryConfig, tmp);
                 } else {
                     for (String sourceTable : result.getSourceTableList()) {
                         if (sideTableMap.containsKey(sourceTable)) {
@@ -179,10 +179,14 @@ private static void sqlTranslation(String localSqlPluginPath, StreamTableEnviron
                     }
                     if (isSide) {
                         //sql-dimensional table contains the dimension table of execution
-                        sideSqlExec.exec(result.getExecSql(), sideTableMap, tableEnv, registerTableCache, queryConfig);
+                        sideSqlExec.exec(result.getExecSql(), sideTableMap, tableEnv, registerTableCache, queryConfig, null);
                     }else{
+                        System.out.println("----------exec sql without dimension join-----------" );
+                        System.out.println("----------real sql exec is--------------------------");
+                        System.out.println(result.getExecSql());
                         FlinkSQLExec.sqlUpdate(tableEnv, result.getExecSql(), queryConfig);
                         if(LOG.isInfoEnabled()){
+                            System.out.println();
                             LOG.info("exec sql: " + result.getExecSql());
                         }
                     }

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

@@ -21,9 +21,10 @@
 package com.dtstack.flink.sql.side;
 
 import com.google.common.collect.HashBasedTable;
+import org.apache.commons.lang3.StringUtils;
 
 /**
- * Reason:
+ * 用于记录转换之后的表和原来表直接字段的关联关系
  * Date: 2018/8/30
  * Company: www.dtstack.com
  * @author xuchao
@@ -37,6 +38,8 @@ public class FieldReplaceInfo {
 
     private String targetTableAlias = null;
 
+    private FieldReplaceInfo preNode = null;
+
     public void setMappingTable(HashBasedTable<String, String, String> mappingTable) {
         this.mappingTable = mappingTable;
     }
@@ -57,7 +60,39 @@ public String getTargetTableAlias() {
         return targetTableAlias;
     }
 
+    public FieldReplaceInfo getPreNode() {
+        return preNode;
+    }
+
+    public void setPreNode(FieldReplaceInfo preNode) {
+        this.preNode = preNode;
+    }
+
     public void setTargetTableAlias(String targetTableAlias) {
         this.targetTableAlias = targetTableAlias;
     }
+
+    /**
+     * 根据原始的tableName + fieldName 获取转换之后的fieldName
+     * @param tableName
+     * @param fieldName
+     * @return
+     */
+    public String getTargetFieldName(String tableName, String fieldName){
+        String targetFieldName = mappingTable.get(tableName, fieldName);
+        if(StringUtils.isNotBlank(targetFieldName)){
+            return targetFieldName;
+        }
+
+        if(preNode == null){
+            return null;
+        }
+
+        String preNodeTargetFieldName = preNode.getTargetFieldName(tableName, fieldName);
+        if(StringUtils.isBlank(preNodeTargetFieldName)){
+            return null;
+        }
+
+        return mappingTable.get(preNode.getTargetTableAlias(), preNodeTargetFieldName);
+    }
 }

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

@@ -41,8 +41,8 @@ public class JoinInfo implements Serializable {
 
     //左表是否是维表
     private boolean leftIsSideTable;
-    //左表是 转换后的中间表
-    private boolean leftIsMidTable;
+
+    private boolean leftIsTmpTable = false;
 
     //右表是否是维表
     private boolean rightIsSideTable;
@@ -66,8 +66,6 @@ public class JoinInfo implements Serializable {
     private SqlNode selectNode;
 
     private JoinType joinType;
-    // 左边是中间转换表，做表映射关系，给替换属性名称使用
-    private Map<String, String> leftTabMapping;
 
     public String getSideTableName(){
         if(leftIsSideTable){
@@ -92,21 +90,6 @@ public String getNewTableName(){
         return leftStr + "_" + rightTableName;
     }
 
-    public boolean isLeftIsMidTable() {
-        return leftIsMidTable;
-    }
-
-    public void setLeftIsMidTable(boolean leftIsMidTable) {
-        this.leftIsMidTable = leftIsMidTable;
-    }
-
-    public Map<String, String> getLeftTabMapping() {
-        return leftTabMapping;
-    }
-
-    public void setLeftTabMapping(Map<String, String> leftTabMapping) {
-        this.leftTabMapping = leftTabMapping;
-    }
 
     public String getNewTableAlias(){
         return leftTableAlias + "_" + rightTableAlias;
@@ -211,4 +194,29 @@ public JoinType getJoinType() {
     public void setJoinType(JoinType joinType) {
         this.joinType = joinType;
     }
+
+    public boolean isLeftIsTmpTable() {
+        return leftIsTmpTable;
+    }
+
+    public void setLeftIsTmpTable(boolean leftIsTmpTable) {
+        this.leftIsTmpTable = leftIsTmpTable;
+    }
+
+    @Override
+    public String toString() {
+        return "JoinInfo{" +
+                "leftIsSideTable=" + leftIsSideTable +
+                ", leftIsTmpTable=" + leftIsTmpTable +
+                ", rightIsSideTable=" + rightIsSideTable +
+                ", leftTableName='" + leftTableName + '\'' +
+                ", leftTableAlias='" + leftTableAlias + '\'' +
+                ", rightTableName='" + rightTableName + '\'' +
+                ", rightTableAlias='" + rightTableAlias + '\'' +
+                ", condition=" + condition +
+                ", selectFields=" + selectFields +
+                ", selectNode=" + selectNode +
+                ", joinType=" + joinType +
+                '}';
+    }
 }