Merge branch '1.8_release_3.10.x' into 1.10_test_4.0.x

Author: gituser

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

@@ -46,7 +46,7 @@ public abstract class AbstractTableParser {
     private static final String CHAR_TYPE_NO_LENGTH = "CHAR";
 
     private static Pattern primaryKeyPattern = Pattern.compile("(?i)PRIMARY\\s+KEY\\s*\\((.*)\\)");
-    private static Pattern nestJsonFieldKeyPattern = Pattern.compile("(?i)((@*\\S+\\.)*\\S+)\\s+(.+)\\s+AS\\s+(\\w+)(\\s+NOT\\s+NULL)?$");
+    private static Pattern nestJsonFieldKeyPattern = Pattern.compile("(?i)((@*\\S+\\.)*\\S+)\\s+(.+?)\\s+AS\\s+(\\w+)(\\s+NOT\\s+NULL)?$");
     private static Pattern physicalFieldFunPattern = Pattern.compile("\\w+\\((\\w+)\\)$");
     private static Pattern charTypePattern = Pattern.compile("(?i)CHAR\\((\\d*)\\)$");
 

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

@@ -37,7 +37,7 @@ public class ClassUtil {
     public static Class<?> stringConvertClass(String str) {
 
         // 这部分主要是告诉Class转TypeInfomation的方法，字段是Array类型
-        String lowerStr = str.toLowerCase();
+        String lowerStr = str.toLowerCase().trim();
         if (lowerStr.startsWith("array")) {
             return Array.newInstance(Integer.class, 0).getClass();
         }