From 2a930f250a0b1e6fabcab97f423f5317b78b9dc9 Mon Sep 17 00:00:00 2001 From: "peng.jianhua" Date: Thu, 30 Nov 2017 18:56:08 +0800 Subject: [PATCH 1/1] KYLIN-3072 Fix the regular expression in function 'removeCommentInSql' --- query/src/main/java/org/apache/kylin/query/util/QueryUtil.java | 4 ++-- 1 file changed, 2 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 377ca89b6..15a3223ff 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 @@ -207,8 +207,8 @@ 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 int[] endOffset = new int[] { 0, 2 }; + final String[] commentPatterns = new String[] { "/\\*[^\\*/]*", "--[^\r\n]*" }; + final int[] endOffset = new int[] { 2, 0 }; for (int i = 0; i < commentPatterns.length; i++) { String commentPattern = commentPatterns[i]; -- 2.11.0.windows.1