upgrade v1.7.0

Author: todd5167

core/pom.xml

@@ -17,6 +17,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.package.name>core</project.package.name>
+        <calcite.server.version>1.16.0</calcite.server.version>
     </properties>
 
     <dependencies>
@@ -45,6 +46,12 @@
             <version>${flink.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-streaming-scala_2.11</artifactId>
+            <version>${flink.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-table_2.11</artifactId>
@@ -55,7 +62,7 @@
             <groupId>org.apache.calcite</groupId>
             <artifactId>calcite-server</artifactId>
             <!-- When updating the Calcite version, make sure to update the dependency exclusions -->
-            <version>1.16.0</version>
+            <version>${calcite.server.version}</version>
         </dependency>
 
         <dependency>
@@ -70,12 +77,6 @@
             <version>${flink.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-streaming-scala_2.11</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-shaded-hadoop2</artifactId>

core/src/main/java/com/dtstack/flink/sql/parser/InsertSqlParser.java

@@ -112,10 +112,10 @@ private static void parseNode(SqlNode sqlNode, SqlParseResult sqlParseResult){
                     sqlParseResult.addSourceTable(identifierNode.toString());
                 }
                 break;
-            case MATCH_RECOGNIZE:
-                SqlMatchRecognize node = (SqlMatchRecognize) sqlNode;
-                sqlParseResult.addSourceTable(node.getTableRef().toString());
-                break;
+//            case MATCH_RECOGNIZE:
+//                SqlMatchRecognize node = (SqlMatchRecognize) sqlNode;
+//                sqlParseResult.addSourceTable(node.getTableRef().toString());
+//                break;
             case UNION:
                 SqlNode unionLeft = ((SqlBasicCall)sqlNode).getOperands()[0];
                 SqlNode unionRight = ((SqlBasicCall)sqlNode).getOperands()[1];

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

@@ -101,7 +101,7 @@ public void exec(String sql, Map<String, SideTableInfo> sideTableMap, StreamTabl
                     tableEnv.sqlUpdate(pollSqlNode.toString());
                 }else if(pollSqlNode.getKind() == AS){
                     AliasInfo aliasInfo = parseASNode(pollSqlNode);
-                    Table table = tableEnv.sql(aliasInfo.getName());
+                    Table table = tableEnv.sqlQuery(aliasInfo.getName());
                     tableEnv.registerTable(aliasInfo.getAlias(), table);
                     localTableCache.put(aliasInfo.getAlias(), table);
                 }
@@ -528,7 +528,7 @@ public void registerTmpTable(CreateTmpTableParser.SqlParserResult result,
                     tableEnv.sqlUpdate(pollSqlNode.toString());
                 }else if(pollSqlNode.getKind() == AS){
                     AliasInfo aliasInfo = parseASNode(pollSqlNode);
-                    Table table = tableEnv.sql(aliasInfo.getName());
+                    Table table = tableEnv.sqlQuery(aliasInfo.getName());
                     tableEnv.registerTable(aliasInfo.getAlias(), table);
                     localTableCache.put(aliasInfo.getAlias(), table);
                 } else if (pollSqlNode.getKind() == SELECT){
@@ -649,7 +649,8 @@ private boolean checkFieldsInfo(CreateTmpTableParser.SqlParserResult result, Tab
                 fieldNames.add(fieldName);
                 String fieldType = filed[filed.length - 1 ].trim();
                 Class fieldClass = ClassUtil.stringConvertClass(fieldType);
-                Class tableField = table.getSchema().getType(i).get().getTypeClass();
+                //table.getSchema().getType(i).get().getTypeClass();
+                Class tableField = table.getSchema().getFieldType(i).get().getTypeClass();
                 if (fieldClass == tableField){
                     continue;
                 } else {