Merge branch 'v1.5.0_dev' into 'v1.8.0_dev'

V1.5.0 dev



See merge request !100

Author: simenliuxing

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

@@ -59,7 +59,13 @@ public static List<String> splitIgnoreQuota(String str, char delimiter){
         boolean inSingleQuotes = false;
         int bracketLeftNum = 0;
         StringBuilder b = new StringBuilder();
-        for (char c : str.toCharArray()) {
+        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);
@@ -71,21 +77,16 @@ public static List<String> splitIgnoreQuota(String str, char delimiter){
                     tokensList.add(b.toString());
                     b = new StringBuilder();
                 }
-            }else if(c == '\"'){
+            }else if(c == '\"' && '\\'!=flag && !inSingleQuotes){
                 inQuotes = !inQuotes;
                 b.append(c);
-            }else if(c == '\''){
+            }else if(c == '\'' && '\\'!=flag && !inQuotes){
                 inSingleQuotes = !inSingleQuotes;
                 b.append(c);
-            }else if(c == '('){
-                bracketLeftNum++;
-                b.append(c);
-            }else if(c == ')'){
-                bracketLeftNum--;
-                b.append(c);
             }else{
                 b.append(c);
             }
+            idx++;
         }
 
         tokensList.add(b.toString());