Merge branch '1.8_release_3.10.x' into 1.8_release_4.0.x

Author: gituser

flinkx-core/src/main/java/com/dtstack/flinkx/constants/ConstantValue.java

@@ -38,6 +38,10 @@ public class ConstantValue {
     public static final String LEFT_PARENTHESIS_SYMBOL = "(";
     public static final String RIGHT_PARENTHESIS_SYMBOL = ")";
 
+
+    public static final String DATA_TYPE_UNSIGNED = "UNSIGNED";
+
+
     public static final String KEY_HTTP = "http";
 
     public static final String PROTOCOL_HTTP = "http://";

flinkx-core/src/main/java/com/dtstack/flinkx/enums/ColumnType.java

@@ -19,9 +19,11 @@
 package com.dtstack.flinkx.enums;
 
 import com.dtstack.flinkx.constants.ConstantValue;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Define standard column type for all the readers or writers that do not
@@ -66,6 +68,12 @@ public enum ColumnType {
             STRING, VARCHAR, VARCHAR2, CHAR, NVARCHAR, TEXT, KEYWORD, BINARY
     );
 
+    /**
+     * 根据字段类型的字符串找出对应的枚举
+     * 找不到直接报错 IllegalArgumentException
+     * @param type
+     * @return
+     */
     public static ColumnType fromString(String type) {
         if(type == null) {
             throw new RuntimeException("null ColumnType!");
@@ -75,15 +83,31 @@ public static ColumnType fromString(String type) {
             type = type.substring(0, type.indexOf(ConstantValue.LEFT_PARENTHESIS_SYMBOL));
         }
 
-        return valueOf(type.toUpperCase());
+        type =  type.toUpperCase(Locale.ENGLISH);
+        //为了支持无符号类型  如 int unsigned
+        if(StringUtils.contains(type,ConstantValue.DATA_TYPE_UNSIGNED)){
+            type = type.replace(ConstantValue.DATA_TYPE_UNSIGNED,"").trim();
+        }
+        return valueOf(type);
     }
 
+    /**
+     * 根据字段类型的字符串找到对应的枚举 找不到就直接返回ColumnType.STRING;
+     * @param type
+     * @return
+     */
     public static ColumnType getType(String type){
+        type = type.toUpperCase(Locale.ENGLISH);
         if(type.contains(ConstantValue.LEFT_PARENTHESIS_SYMBOL)){
             type = type.substring(0, type.indexOf(ConstantValue.LEFT_PARENTHESIS_SYMBOL));
         }
 
-        if(type.toLowerCase().contains(ColumnType.TIMESTAMP.name().toLowerCase())){
+        //为了支持无符号类型  如 int unsigned
+        if(StringUtils.contains(type,ConstantValue.DATA_TYPE_UNSIGNED)){
+            type = type.replaceAll(ConstantValue.DATA_TYPE_UNSIGNED,"").trim();
+        }
+
+        if(type.contains(ColumnType.TIMESTAMP.name())){
             return TIMESTAMP;
         }