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

Author: gituser

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

@@ -21,6 +21,7 @@
 import com.dtstack.flink.sql.util.DtStringUtil;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 import java.util.Map;
@@ -74,7 +75,7 @@ private Map<String, Object> parseProp(String propsStr){
             List<String> ss = DtStringUtil.splitIgnoreQuota(str, '=');
             Preconditions.checkState(ss.size() == 2, str + " Format error");
             String key = ss.get(0).trim();
-            String value = ss.get(1).trim().replaceAll("'", "").trim();
+            String value = DtStringUtil.removeStartAndEndQuota(ss.get(1).trim());
             propMap.put(key, value);
         }
 

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

@@ -373,8 +373,7 @@ public static String getTableFullPath(String schema, String tableName) {
             return addQuoteForStr(tableName);
         }
 
-        String schemaAndTabName = addQuoteForStr(schema) + "." + addQuoteForStr(tableName);
-        return schemaAndTabName;
+        return addQuoteForStr(schema) + "." + addQuoteForStr(tableName);
     }
 
     /**
@@ -407,4 +406,9 @@ public static String getStartQuote() {
     public static String getEndQuote() {
         return "\"";
     }
+
+    public static String removeStartAndEndQuota(String str) {
+        String removeStart = StringUtils.removeStart(str, "'");
+        return StringUtils.removeEnd(removeStart, "'");
+    }
 }