From 09537c2791d9f184a7952efd9cf9291637604f27 Mon Sep 17 00:00:00 2001 From: hahayuan Date: Sun, 11 Feb 2018 12:38:55 +0800 Subject: [PATCH 1/1] kylin-3135 revert first regex too --- query/src/main/java/org/apache/kylin/query/util/QueryUtil.java | 2 +- query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/query/src/main/java/org/apache/kylin/query/util/QueryUtil.java b/query/src/main/java/org/apache/kylin/query/util/QueryUtil.java index da18bd708..4de6a2c33 100644 --- a/query/src/main/java/org/apache/kylin/query/util/QueryUtil.java +++ b/query/src/main/java/org/apache/kylin/query/util/QueryUtil.java @@ -142,7 +142,7 @@ public class QueryUtil { public static String removeCommentInSql(String sql1) { // match two patterns, one is "-- comment", the other is "/* comment */" - final String[] commentPatterns = new String[] { "--.*?[\r\n]", "/\\*.*?\\*/" }; + final String[] commentPatterns = new String[] { "--[^\r\n]*", "/\\*[\\s\\S]*?\\*/" }; for (int i = 0; i < commentPatterns.length; i++) { sql1 = sql1.replaceAll(commentPatterns[i], ""); diff --git a/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java b/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java index e3cd819bf..01c2f7f11 100644 --- a/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java +++ b/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java @@ -164,7 +164,12 @@ public class QueryUtilTest extends LocalFileMetadataTestCase { } { - String sqlWithComment = "/* comment1 * comment2 */ -- comment 5\n" + originSql + "/* comment3 / comment4 */"; + String sqlWithComment = "/* comment1 * \ncomment2 */ -- comment 5\n" + originSql + "/* comment3 / comment4 */"; + Assert.assertEquals(originSql, QueryUtil.removeCommentInSql(sqlWithComment)); + } + + { + String sqlWithComment = "/* comment1 * \ncomment2 */ -- comment 3\n" + originSql + "-- comment 5"; Assert.assertEquals(originSql, QueryUtil.removeCommentInSql(sqlWithComment)); } } -- 2.11.0.windows.1