pom

Author: simenliuxing

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

@@ -122,26 +122,25 @@ private static List<FieldInfo> getAllField(JoinScope scope){
         List<FieldInfo> fieldInfoList = Lists.newArrayList();
         while(true) {
             JoinScope.ScopeChild resolved;
-            RowTypeInfo field;
+            BaseRowTypeInfo field;
             BaseRowTypeInfo baseRowTypeInfo;
             if(!prefixId.hasNext()) {
                 return fieldInfoList;
             }
 
             resolved = (JoinScope.ScopeChild)prefixId.next();
-            int fieldTypeLength = resolved.getRowTypeInfo().getFieldTypes().length;
+            int fieldTypeLength = resolved.getBaseRowTypeInfo().getFieldTypes().length;
             if(fieldTypeLength == 2
-                    && resolved.getRowTypeInfo().getFieldTypes()[1].getClass().equals(RowTypeInfo.class)){
-                field = (RowTypeInfo) resolved.getRowTypeInfo().getFieldTypes()[1];
+                    && resolved.getRowTypeInfo().getFieldTypes()[1].getClass().equals(BaseRowTypeInfo.class)){
+                field = (BaseRowTypeInfo) resolved.getBaseRowTypeInfo().getFieldTypes()[1];
             } else if(fieldTypeLength ==1
-                    && resolved.getRowTypeInfo().getFieldTypes()[0].getClass().equals(RowTypeInfo.class)){
-                field = (RowTypeInfo) resolved.getRowTypeInfo().getFieldTypes()[0];
+                    && resolved.getRowTypeInfo().getFieldTypes()[0].getClass().equals(BaseRowTypeInfo.class)){
+                field = (BaseRowTypeInfo) resolved.getBaseRowTypeInfo().getFieldTypes()[0];
             }else{
-                field = resolved.getRowTypeInfo();
+                field = resolved.getBaseRowTypeInfo();
             }
 
-
-            baseRowTypeInfo = resolved.getBaseRowTypeInfo();
+            baseRowTypeInfo = field;
             String[] fieldNames = field.getFieldNames();
             TypeInformation<?>[] types = field.getFieldTypes();
             LogicalType[] logicalTypes = baseRowTypeInfo.getLogicalTypes();

…ncher/src/main/resource/log4j.properties …cher/src/main/resources/log4j.propertieslauncher/src/main/resource/log4j.properties renamed to launcher/src/main/resources/log4j.properties launcher/src/main/resource/log4j.properties renamed to launcher/src/main/resources/log4j.properties

@@ -11,32 +11,11 @@
     <modules>
         <module>core</module>
         <module>kafka-base</module>
-        <module>kafka09</module>
-        <module>kafka10</module>
-        <module>kafka11</module>
         <module>kafka</module>
         <module>mysql</module>
-        <module>hbase</module>
-        <module>elasticsearch5</module>
-        <module>elasticsearch6</module>
-        <module>mongo</module>
-        <module>redis5</module>
         <module>launcher</module>
         <module>rdb</module>
-        <module>sqlserver</module>
-        <module>oracle</module>
-        <module>cassandra</module>
-        <module>kudu</module>
-        <module>postgresql</module>
-        <module>serversocket</module>
         <module>console</module>
-        <module>clickhouse</module>
-        <module>impala</module>
-        <module>db2</module>
-        <module>polardb</module>
-        <module>oceanbase</module>
-        <module>tidb</module>
-<!--        <module>localTest</module>-->
 
     </modules>