Merge branch 'hotfix_1.10_4.0.x_32069' into 1.10_release_4.0.x

Author: gituser

core/src/main/java/com/dtstack/flink/sql/parser/CreateTableParser.java

@@ -16,8 +16,6 @@
  * limitations under the License.
  */
 
- 
-
 package com.dtstack.flink.sql.parser;
 
 import com.dtstack.flink.sql.util.DtStringUtil;
@@ -41,8 +39,6 @@ public class CreateTableParser implements IParser {
 
     private static final Pattern PATTERN = Pattern.compile(PATTERN_STR);
 
-    private static final Pattern PROP_PATTERN = Pattern.compile("^'\\s*(.+)\\s*'$");
-
     public static CreateTableParser newInstance(){
         return new CreateTableParser();
     }
@@ -70,28 +66,19 @@ public void parseSql(String sql, SqlTree sqlTree) {
         }
     }
 
-    private Map parseProp(String propsStr){
-        propsStr = propsStr.replaceAll("'\\s*,", "'|");
-        String[] strs = propsStr.trim().split("\\|");
+    private Map<String, Object> parseProp(String propsStr){
+        List<String> strings = DtStringUtil.splitIgnoreQuota(propsStr.trim(), ',');
         Map<String, Object> propMap = Maps.newHashMap();
-        for (String str : strs) {
+        for (String str : strings) {
             List<String> ss = DtStringUtil.splitIgnoreQuota(str, '=');
             String key = ss.get(0).trim();
-            String value = extractValue(ss.get(1).trim());
+            String value = ss.get(1).trim().replaceAll("'", "").trim();
             propMap.put(key, value);
         }
 
         return propMap;
     }
 
-    private String extractValue(String value) {
-        Matcher matcher = PROP_PATTERN.matcher(value);
-        if (matcher.find()) {
-            return matcher.group(1);
-        }
-        throw new RuntimeException("[" + value + "] format is invalid");
-    }
-
     public static class SqlParserResult{
 
         private String tableName;