merge release to hotfix

Author: FlechazoW

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

@@ -28,7 +28,6 @@
 import com.google.common.collect.Lists;
 import com.google.common.base.Strings;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -54,7 +53,7 @@ public static void setLocalSqlPluginRoot(String localSqlPluginRoot){
         LOCAL_SQL_PLUGIN_ROOT = localSqlPluginRoot;
     }
 
-    private static final Pattern ADD_FIlE_PATTERN = Pattern.compile("(?i).*add\\s+file\\s+.+");
+    private static final Pattern ADD_FILE_AND_JAR_PATTERN = Pattern.compile("(?i).*add\\s+file\\s+.+|(?i).*add\\s+jar\\s+.+");
 
     /**
      * flink support sql syntax
@@ -75,7 +74,7 @@ public static SqlTree parseSql(String sql, String pluginLoadMode) throws Excepti
                 .replace("\t", " ").trim();
 
         List<String> sqlArr = DtStringUtil.splitIgnoreQuota(sql, SQL_DELIMITER);
-        sqlArr = removeAddFileStmt(sqlArr);
+        sqlArr = removeAddFileAndJarStmt(sqlArr);
         SqlTree sqlTree = new SqlTree();
         AbstractTableInfoParser tableInfoParser = new AbstractTableInfoParser();
         for(String childSql : sqlArr){
@@ -158,12 +157,12 @@ public static SqlTree parseSql(String sql, String pluginLoadMode) throws Excepti
     }
 
     /**
-     * remove add file with statment etc. add file /etc/krb5.conf;
+     * remove add file and jar with statment etc. add file /etc/krb5.conf, add jar xxx.jar;
      */
-    private static List<String> removeAddFileStmt(List<String> stmts) {
-        List<String> cleanedStmts = new ArrayList<>();
+    private static List<String> removeAddFileAndJarStmt(List<String> stmts) {
+        List<String> cleanedStmts = Lists.newArrayList();
         for (String stmt : stmts) {
-            Matcher matcher = ADD_FIlE_PATTERN.matcher(stmt);
+            Matcher matcher = ADD_FILE_AND_JAR_PATTERN.matcher(stmt);
             if(!matcher.matches()) {
                 cleanedStmts.add(stmt);
             }

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

@@ -167,26 +167,20 @@ public static String replaceIgnoreQuota(String str, String oriStr, String replac
     public static String dealSqlComment(String sql) {
         boolean inQuotes = false;
         boolean inSingleQuotes = false;
-        int bracketLeftNum = 0;
         StringBuilder b = new StringBuilder(sql.length());
         char[] chars = sql.toCharArray();
         for (int index = 0; index < chars.length; index ++) {
-            if (index == chars.length) {
-                return b.toString();
-            }
             StringBuilder tempSb = new StringBuilder(2);
-            if (index > 1) {
+            if (index >= 1) {
                 tempSb.append(chars[index - 1]);
                 tempSb.append(chars[index]);
             }
 
-            if (tempSb.toString().equals("--")) {
+            if ("--".equals(tempSb.toString())) {
                 if (inQuotes) {
                     b.append(chars[index]);
                 } else if (inSingleQuotes) {
                     b.append(chars[index]);
-                } else if (bracketLeftNum > 0) {
-                    b.append(chars[index]);
                 } else {
                     b.deleteCharAt(b.length() - 1);
                     while (chars[index] != '\n') {