Merge branch 'hotfix_1.8_3.10.x_29290' into 1.8_release_3.10.x

Author: gituser

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

@@ -84,7 +84,7 @@ public boolean dealKeyPattern(String fieldRow, AbstractTableInfo tableInfo){
 
     public void parseFieldsInfo(String fieldsInfo, AbstractTableInfo tableInfo) {
 
-        List<String> fieldRows = DtStringUtil.splitIgnoreQuota(fieldsInfo, ',');
+        List<String> fieldRows = DtStringUtil.splitField(fieldsInfo);
 
         for (String fieldRow : fieldRows) {
             fieldRow = fieldRow.trim();

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

@@ -46,14 +46,61 @@ public class DtStringUtil {
 
     private static ObjectMapper objectMapper = new ObjectMapper();
 
-
     /**
      * Split the specified string delimiter --- ignored quotes delimiter
      * @param str
      * @param delimiter
      * @return
      */
-    public static List<String> splitIgnoreQuota(String str, char delimiter){
+    public static List<String> splitIgnoreQuota(String str, char delimiter) {
+        List<String> tokensList = new ArrayList<>();
+        boolean inQuotes = false;
+        boolean inSingleQuotes = false;
+        int bracketLeftNum = 0;
+        StringBuilder b = new StringBuilder();
+        char[] chars = str.toCharArray();
+        int idx = 0;
+        for (char c : chars) {
+            char flag = 0;
+            if (idx > 0) {
+                flag = chars[idx - 1];
+            }
+            if (c == delimiter) {
+                if (inQuotes) {
+                    b.append(c);
+                } else if (inSingleQuotes) {
+                    b.append(c);
+                } else if (bracketLeftNum > 0) {
+                    b.append(c);
+                } else {
+                    tokensList.add(b.toString());
+                    b = new StringBuilder();
+                }
+            } else if (c == '\"' && '\\' != flag && !inSingleQuotes) {
+                inQuotes = !inQuotes;
+                b.append(c);
+            } else if (c == '\'' && '\\' != flag && !inQuotes) {
+                inSingleQuotes = !inSingleQuotes;
+                b.append(c);
+            } else if (c == '(' && !inSingleQuotes && !inQuotes) {
+                bracketLeftNum++;
+                b.append(c);
+            } else if (c == ')' && !inSingleQuotes && !inQuotes) {
+                bracketLeftNum--;
+                b.append(c);
+            } else {
+                b.append(c);
+            }
+            idx++;
+        }
+
+        tokensList.add(b.toString());
+
+        return tokensList;
+    }
+
+    public static List<String> splitField(String str) {
+        final char delimiter = ',';
         List<String> tokensList = new ArrayList<>();
         boolean inQuotes = false;
         boolean inSingleQuotes = false;
@@ -106,7 +153,6 @@ public static List<String> splitIgnoreQuota(String str, char delimiter){
         return tokensList;
     }
 
-
     public static String replaceIgnoreQuota(String str, String oriStr, String replaceStr){
         String splitPatternStr = oriStr + "(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)(?=(?:[^']*'[^']*')*[^']*$)";
         return str.replaceAll(splitPatternStr, replaceStr);