Merge branch '1.10_release_4.0.x' into 1.10_release_4.1.x

gituser · gituser · commit c2f57cdf1d46 · 2021-03-22T20:41:10.000+08:00
diff --git a/impala/impala-sink/src/main/java/com/dtstack/flink/sql/sink/impala/ImpalaOutputFormat.java b/impala/impala-sink/src/main/java/com/dtstack/flink/sql/sink/impala/ImpalaOutputFormat.java
@@ -588,7 +588,7 @@ private String buildValuesCondition(List<String> fieldTypes, Row row) {
             if (DtStringUtil.isEmptyOrNull(rowField)) {
                 valuesCondition = valuesCondition.replaceFirst("'\\?'", "null");
             } else {
-                valuesCondition = valuesCondition.replaceFirst("\\?", rowField.toString());
+                valuesCondition = valuesCondition.replaceFirst("\\?", Matcher.quoteReplacement(rowField.toString()));
             }
         }
         return "(" + valuesCondition + ")";

Original file line number	Diff line number	Diff line change
`@@ -588,7 +588,7 @@ private String buildValuesCondition(List<String> fieldTypes, Row row) {`
`588`	`588`	`if (DtStringUtil.isEmptyOrNull(rowField)) {`
`589`	`589`	`valuesCondition = valuesCondition.replaceFirst("'\\?'", "null");`
`590`	`590`	`} else {`
`591`		`- valuesCondition = valuesCondition.replaceFirst("\\?", rowField.toString());`
	`591`	`+ valuesCondition = valuesCondition.replaceFirst("\\?", Matcher.quoteReplacement(rowField.toString()));`
`592`	`592`	`}`
`593`	`593`	`}`
`594`	`594`	`return "(" + valuesCondition + ")";`