optimize structure

Author: a49a

core/src/main/java/com/dtstack/flink/sql/table/AbstractTableParser.java

@@ -103,16 +103,15 @@ public void parseFieldsInfo(String fieldsInfo, AbstractTableInfo tableInfo){
             }
 
             // 处理复合类型，例如 ARRAY<ROW<foo INT, bar STRING>>
+            // 把ARRAY类型的长串字符压入Buffer
             Matcher headMatcher = compositeTypeHeadPattern.matcher(fieldRow);
             Matcher tailMatcher = compositeTypeTailPattern.matcher(fieldRow);
-            if (
-                !tailMatcher.matches() &&
-                (headMatcher.matches() ||
-                !buffer.isEmpty())
-            ) {
+            boolean isNotTail = !tailMatcher.matches();
+            boolean isToNeedPush = headMatcher.matches() || !buffer.isEmpty();
+
+            if (isNotTail && isToNeedPush) {
                 writeBuffer(buffer, fieldRow);
             } else {
-
                 String[] fieldInfoArr;
                 if (tailMatcher.matches()) {
                     buffer.add(fieldRow);
@@ -122,9 +121,8 @@ public void parseFieldsInfo(String fieldsInfo, AbstractTableInfo tableInfo){
                     fieldInfoArr = fieldRow.split("\\s+");
                 }
 
-                if (fieldInfoArr.length < 2) {
-                    throw new RuntimeException(String.format("table [%s] field [%s] format error.", tableInfo.getName(), fieldRow));
-                }
+                String errorMsg = String.format("table [%s] field [%s] format error.", tableInfo.getName(), fieldRow);
+                Preconditions.checkState(fieldInfoArr.length >= 2, errorMsg);
 
                 boolean isMatcherKey = dealKeyPattern(fieldRow, tableInfo);
                 if (isMatcherKey) {
@@ -149,7 +147,7 @@ public void parseFieldsInfo(String fieldsInfo, AbstractTableInfo tableInfo){
                     fieldClass = dbTypeConvertToJavaType(fieldType);
                 }
 
-                tableInfo.addPhysicalMappings(fieldInfoArr[0],fieldInfoArr[0]);
+                tableInfo.addPhysicalMappings(fieldInfoArr[0], fieldInfoArr[0]);
                 tableInfo.addField(fieldName);
                 tableInfo.addFieldClass(fieldClass);
                 tableInfo.addFieldType(fieldType);

core/src/main/java/com/dtstack/flink/sql/util/DataTypeUtils.java

@@ -84,24 +84,23 @@ public static RowTypeInfo convertToRow(String rowTypeString) {
         Preconditions.checkState(ROW.equals(normalizedType), errorMsg);
 
         String elementTypeStr = matcher.group(2);
-        Iterable<String> fieldInfos = splitCompositeTypeField(elementTypeStr);
-        Tuple2<TypeInformation[], String[]> info = genFieldInfo(fieldInfos);
+        Iterable<String> fieldInfoStrs = splitCompositeTypeField(elementTypeStr);
+        Tuple2<TypeInformation[], String[]> info = genFieldInfo(fieldInfoStrs);
         return new RowTypeInfo(info.f0, info.f1);
     }
 
-
-
-    private static Tuple2<TypeInformation[], String[]> genFieldInfo(Iterable<String> fieldInfos) {
+    private static Tuple2<TypeInformation[], String[]> genFieldInfo(Iterable<String> fieldInfoStrs) {
         ArrayList<TypeInformation> types = Lists.newArrayList();
         ArrayList<String> fieldNames = Lists.newArrayList();
 
-        for (String fieldInfo : fieldInfos) {
-            Iterable<String> splitedInfo = splitTypeInfo(fieldInfo);
+        for (String fieldStr : fieldInfoStrs) {
+            Iterable<String> splitedInfo = splitTypeInfo(fieldStr);
             ArrayList<String> info = Lists.newArrayList(splitedInfo.iterator());
             Preconditions.checkState(info.size() == 2, "field info must be name with type");
+
+            fieldNames.add(info.get(0));
             TypeInformation fieldType = convertToAtomicType(info.get(1));
             types.add(fieldType);
-            fieldNames.add(info.get(0));
         }
 
         TypeInformation[] typeArray = types.toArray(new TypeInformation[types.size()]);