Unverified Commit 96491087 authored by aiwenmo's avatar aiwenmo Committed by GitHub

[Optimization-849][client,executor] Replace sql separator and change default...

[Optimization-849][client,executor] Replace sql separator and change default sql separator into ;\n (#850)
Co-authored-by: 's avatarwenmo <32723967+wenmo@users.noreply.github.com>
parent f713e0a6
...@@ -103,7 +103,7 @@ public class Submiter { ...@@ -103,7 +103,7 @@ public class Submiter {
if (Asserts.isNotNullString(envId)) { if (Asserts.isNotNullString(envId)) {
sb.append(envId); sb.append(envId);
} }
sb.append("\r\n"); sb.append("\n");
} }
sb.append(getFlinkSQLStatement(id, dbConfig)); sb.append(getFlinkSQLStatement(id, dbConfig));
List<String> statements = Submiter.getStatements(sb.toString()); List<String> statements = Submiter.getStatements(sb.toString());
......
...@@ -29,7 +29,7 @@ package com.dlink.sql; ...@@ -29,7 +29,7 @@ package com.dlink.sql;
public class FlinkQuery { public class FlinkQuery {
public static String separator() { public static String separator() {
return ";\r\n"; return ";\n";
} }
public static String defaultCatalog() { public static String defaultCatalog() {
......
...@@ -81,7 +81,7 @@ public class SystemConfiguration { ...@@ -81,7 +81,7 @@ public class SystemConfiguration {
"sqlSeparator", "sqlSeparator",
"FlinkSQL语句分割符", "FlinkSQL语句分割符",
ValueType.STRING, ValueType.STRING,
";\r\n|;\n", ";\n",
"Flink SQL 的语句分割符" "Flink SQL 的语句分割符"
); );
......
...@@ -37,7 +37,7 @@ public class SqlUtil { ...@@ -37,7 +37,7 @@ public class SqlUtil {
return new String[0]; return new String[0];
} }
String[] splits = sql.split(sqlSeparator); String[] splits = sql.replaceAll(";\r\n",";\n").split(sqlSeparator);
String lastStatement = splits[splits.length - 1].trim(); String lastStatement = splits[splits.length - 1].trim();
if (lastStatement.endsWith(SEMICOLON)){ if (lastStatement.endsWith(SEMICOLON)){
splits[splits.length - 1] = lastStatement.substring(0,lastStatement.length()-1); splits[splits.length - 1] = lastStatement.substring(0,lastStatement.length()-1);
...@@ -48,7 +48,9 @@ public class SqlUtil { ...@@ -48,7 +48,9 @@ public class SqlUtil {
public static String removeNote(String sql) { public static String removeNote(String sql) {
if (Asserts.isNotNullString(sql)) { if (Asserts.isNotNullString(sql)) {
sql = sql.replaceAll("\u00A0", " ").replaceAll("--([^'\r\n]{0,}('[^'\r\n]{0,}'){0,1}[^'\r\n]{0,}){0,}", "").replaceAll("[\r\n]+", "\r\n").trim(); sql = sql.replaceAll("\u00A0", " ")
.replaceAll("[\r\n]+", "\n")
.replaceAll("--([^'\n]{0,}('[^'\n]{0,}'){0,1}[^'\n]{0,}){0,}", "").trim();
} }
return sql; return sql;
} }
......
...@@ -30,7 +30,7 @@ public interface FlinkSQLConstant { ...@@ -30,7 +30,7 @@ public interface FlinkSQLConstant {
/** /**
* 分隔符 * 分隔符
*/ */
String SEPARATOR = ";"; String SEPARATOR = ";\n";
/** /**
* DDL 类型 * DDL 类型
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment