Merge branch '1.5.0_dev_field_by_name' into 'v1.5.0_dev'

插入时按名称映射



See merge request !49

Author: zoudaokoulife

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

@@ -22,7 +22,12 @@
 
 import com.dtstack.flink.sql.classloader.DtClassLoader;
 import com.dtstack.flink.sql.enums.ECacheType;
-import com.dtstack.flink.sql.parser.*;
+import com.dtstack.flink.sql.exec.FlinkSQLExec;
+import com.dtstack.flink.sql.parser.CreateFuncParser;
+import com.dtstack.flink.sql.parser.CreateTmpTableParser;
+import com.dtstack.flink.sql.parser.InsertSqlParser;
+import com.dtstack.flink.sql.parser.SqlParser;
+import com.dtstack.flink.sql.parser.SqlTree;
 import com.dtstack.flink.sql.side.SideSqlExec;
 import com.dtstack.flink.sql.side.SideTableInfo;
 import com.dtstack.flink.sql.table.SourceTableInfo;
@@ -204,7 +209,7 @@ public static void main(String[] args) throws Exception {
                         //sql-dimensional table contains the dimension table of execution
                         sideSqlExec.exec(result.getExecSql(), sideTableMap, tableEnv, registerTableCache);
                     }else{
-                        tableEnv.sqlUpdate(result.getExecSql());
+                        FlinkSQLExec.sqlUpdate(tableEnv, result.getExecSql());
                         if(LOG.isInfoEnabled()){
                             LOG.info("exec sql: " + result.getExecSql());
                         }

core/src/main/java/com/dtstack/flink/sql/exec/FlinkSQLExec.java

@@ -0,0 +1,52 @@
+package com.dtstack.flink.sql.exec;
+
+import org.apache.calcite.sql.SqlIdentifier;
+import org.apache.calcite.sql.SqlInsert;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.flink.table.api.Table;
+import org.apache.flink.table.api.TableEnvironment;
+import org.apache.flink.table.api.TableException;
+import org.apache.flink.table.api.java.StreamTableEnvironment;
+import org.apache.flink.table.calcite.FlinkPlannerImpl;
+import org.apache.flink.table.plan.logical.LogicalRelNode;
+import org.apache.flink.table.plan.schema.TableSinkTable;
+
+import java.lang.reflect.Method;
+
+/**
+ * @description:  mapping by name when insert into sink table
+ * @author: maqi
+ * @create: 2019/08/15 11:09
+ */
+public class FlinkSQLExec {
+
+    public static void sqlUpdate(StreamTableEnvironment tableEnv, String stmt) throws Exception {
+
+        FlinkPlannerImpl planner = new FlinkPlannerImpl(tableEnv.getFrameworkConfig(), tableEnv.getPlanner(), tableEnv.getTypeFactory());
+        SqlNode insert = planner.parse(stmt);
+
+        if (!(insert instanceof SqlInsert)) {
+            throw new TableException(
+                    "Unsupported SQL query! sqlUpdate() only accepts SQL statements of type INSERT.");
+        }
+        SqlNode query = ((SqlInsert) insert).getSource();
+
+        SqlNode validatedQuery = planner.validate(query);
+
+        Table queryResult = new Table(tableEnv, new LogicalRelNode(planner.rel(validatedQuery).rel));
+        String targetTableName = ((SqlIdentifier) ((SqlInsert) insert).getTargetTable()).names.get(0);
+
+        try {
+            Method method = TableEnvironment.class.getDeclaredMethod("getTable", String.class);
+            method.setAccessible(true);
+
+            TableSinkTable targetTable = (TableSinkTable) method.invoke(tableEnv, targetTableName);
+            String[] fieldNames = targetTable.tableSink().getFieldNames();
+            Table newTable = queryResult.select(String.join(",", fieldNames));
+            // insert query result into sink table
+            tableEnv.insertInto(newTable, targetTableName, tableEnv.queryConfig());
+        } catch (Exception e) {
+            throw e;
+        }
+    }
+}

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

@@ -20,7 +20,9 @@
 
 package com.dtstack.flink.sql.side;
 
+import com.dtstack.flink.sql.Main;
 import com.dtstack.flink.sql.enums.ECacheType;
+import com.dtstack.flink.sql.exec.FlinkSQLExec;
 import com.dtstack.flink.sql.parser.CreateTmpTableParser;
 import com.dtstack.flink.sql.side.operator.SideAsyncOperator;
 import com.dtstack.flink.sql.side.operator.SideWithAllCacheOperator;
@@ -105,7 +107,7 @@ public void exec(String sql, Map<String, SideTableInfo> sideTableMap, StreamTabl
                 }
 
                 if(pollSqlNode.getKind() == INSERT){
-                    tableEnv.sqlUpdate(pollSqlNode.toString());
+                    FlinkSQLExec.sqlUpdate(tableEnv, pollSqlNode.toString());
                     if(LOG.isInfoEnabled()){
                         LOG.info("exec sql: " + pollSqlNode.toString());
                     }