Merge branch '1.8_dev_multi_join' into 'v1.8.0_dev'

连续Left join处理



See merge request !86

Author: zoudaokoulife

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

@@ -20,6 +20,7 @@
 
 package com.dtstack.flink.sql;
 
+import com.dtstack.flink.sql.config.CalciteConfig;
 import com.dtstack.flink.sql.classloader.ClassLoaderManager;
 import com.dtstack.flink.sql.constrant.ConfigConstrant;
 import com.dtstack.flink.sql.enums.ClusterMode;
@@ -98,10 +99,6 @@ public class Main {
 
     private static final Logger LOG = LoggerFactory.getLogger(Main.class);
 
-    private static Config config = org.apache.calcite.sql.parser.SqlParser
-            .configBuilder()
-            .setLex(Lex.MYSQL)
-            .build();
 
     public static void main(String[] args) throws Exception {
 
@@ -171,7 +168,7 @@ private static void sqlTranslation(Options options,StreamTableEnvironment tableE
                     CreateTmpTableParser.SqlParserResult tmp = sqlTree.getTmpTableMap().get(tableName);
                     String realSql = DtStringUtil.replaceIgnoreQuota(result.getExecSql(), "`", "");
 
-                    SqlNode sqlNode = org.apache.calcite.sql.parser.SqlParser.create(realSql,config).parseStmt();
+                    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);

core/src/main/java/com/dtstack/flink/sql/config/CalciteConfig.java

@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package com.dtstack.flink.sql.config;
+
+import org.apache.calcite.config.Lex;
+import org.apache.calcite.sql.parser.SqlParser;
+import org.apache.calcite.sql.parser.SqlParser.Config;
+
+public class CalciteConfig {
+
+    public static Config MYSQL_LEX_CONFIG = SqlParser
+            .configBuilder()
+            .setLex(Lex.MYSQL)
+            .build();
+
+
+
+}

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

@@ -25,6 +25,7 @@
 import org.apache.flink.calcite.shaded.com.google.common.base.Strings;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * Join信息
@@ -40,6 +41,8 @@ public class JoinInfo implements Serializable {
 
     //左表是否是维表
     private boolean leftIsSideTable;
+    //左表是 转换后的中间表
+    private boolean leftIsMidTable;
 
     //右表是否是维表
     private boolean rightIsSideTable;
@@ -63,6 +66,8 @@ public class JoinInfo implements Serializable {
     private SqlNode selectNode;
 
     private JoinType joinType;
+    // 左边是中间转换表，做表映射关系，给替换属性名称使用
+    private Map<String, String> leftTabMapping;
 
     public String getSideTableName(){
         if(leftIsSideTable){
@@ -87,6 +92,22 @@ 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;
     }

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

@@ -41,8 +41,12 @@
 
 public class ParserJoinField {
 
+
     /**
-     * Need to parse the fields of information and where selectlist
+     *  build row by field
+     * @param sqlNode  select node
+     * @param scope    join left and right table all info
+     * @param getAll  true,get all fields from two tables; false, extract useful field from select node
      * @return
      */
     public static List<FieldInfo> getRowTypeInfo(SqlNode sqlNode, JoinScope scope, boolean getAll){