Merge branch 'feat_1.8_resolveGangGangError' into '1.8_test_3.10.x'

修复 -- 问题 并添加测试类

See merge request dt-insight-engine/flinkStreamSQL!53

Author: zoudaokoulife

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

@@ -68,7 +68,7 @@ public static SqlTree parseSql(String sql) throws Exception {
             throw new RuntimeException("need to set local sql plugin root");
         }
 
-        sql = sql.replaceAll("--.*", "")
+        sql = DtStringUtil.dealSqlComment(sql)
                 .replaceAll("\r\n", " ")
                 .replaceAll("\n", " ")
                 .replace("\t", " ").trim();

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

@@ -106,6 +106,57 @@ public static String replaceIgnoreQuota(String str, String oriStr, String replac
         return str.replaceAll(splitPatternStr, replaceStr);
     }
 
+    /**
+     * 处理 sql 中 "--" 注释，而不删除引号内的内容
+     *
+     * @param sql 解析出来的 sql
+     * @return 返回无注释内容的 sql
+     */
+    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) {
+                tempSb.append(chars[index - 1]);
+                tempSb.append(chars[index]);
+            }
+
+            if (tempSb.toString().equals("--")) {
+                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') {
+                        // 判断注释内容是不是行尾或者 sql 的最后一行
+                        if (index == chars.length - 1) {
+                            break;
+                        }
+                        index++;
+                    }
+                }
+            } else if (chars[index] == '\"' && '\\' != chars[index] && !inSingleQuotes) {
+                inQuotes = !inQuotes;
+                b.append(chars[index]);
+            } else if (chars[index] == '\'' && '\\' != chars[index] && !inQuotes) {
+                inSingleQuotes = !inSingleQuotes;
+                b.append(chars[index]);
+            } else {
+                b.append(chars[index]);
+            }
+        }
+        return b.toString();
+    }
 
     public static String col2string(Object column, String type) {
         String rowData = column.toString();

core/src/test/java/com/dtstack/flink/sql/util/TestDtStringUtil.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.dtstack.flink.sql.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author tiezhu
+ * Date 2020/6/17 星期三
+ */
+public class TestDtStringUtil {
+    @Test
+    public void dealSqlCommentTest() {
+        String testSQLWithComment = "CREATE TABLE MyTable --this is a comment\n";
+        Assert.assertEquals("CREATE TABLE MyTable ", DtStringUtil.dealSqlComment(testSQLWithComment));
+        testSQLWithComment = "CREATE TABLE 'MyTable--' --this is  a comment";
+        Assert.assertEquals("CREATE TABLE 'MyTable--' ", DtStringUtil.dealSqlComment(testSQLWithComment));
+        testSQLWithComment = "CREATE TABLE MyTable -- this is a '--comment'\n";
+        Assert.assertEquals("CREATE TABLE MyTable ", DtStringUtil.dealSqlComment(testSQLWithComment));
+    }
+}