You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by bi...@apache.org on 2018/01/24 07:22:44 UTC
kylin git commit: KYLIN-3135
Repository: kylin
Updated Branches:
refs/heads/master b88c6223a -> cd8beb1c0
KYLIN-3135
Signed-off-by: Billy Liu <bi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/cd8beb1c
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/cd8beb1c
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/cd8beb1c
Branch: refs/heads/master
Commit: cd8beb1c0e14b250a1e5c6e647db214e1c3f0b2e
Parents: b88c622
Author: hahayuan <yh...@126.com>
Authored: Wed Jan 3 12:20:43 2018 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Wed Jan 24 15:22:33 2018 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kylin/query/util/QueryUtil.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/cd8beb1c/query/src/main/java/org/apache/kylin/query/util/QueryUtil.java
----------------------------------------------------------------------
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 24d0c06..22658f1 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,8 +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 int[] endOffset = new int[] { 0, 2 };
+ final String[] commentPatterns = new String[] { "--[^\r\n]*", "/\\*[\\s\\S]*?\\*/" };
for (int i = 0; i < commentPatterns.length; i++) {
String commentPattern = commentPatterns[i];
@@ -152,9 +151,9 @@ public class QueryUtil {
while (matcher.find()) {
if (matcher.start() == 0) {
- sql1 = sql1.substring(matcher.end() + endOffset[i]).trim();
- } else if ((matcher.start() > 0 && sql1.charAt(matcher.start() - 1) != '\'')) {
- sql1 = (sql1.substring(0, matcher.start()) + sql1.substring(matcher.end() + endOffset[i])).trim();
+ sql1 = sql1.substring(matcher.end()).trim();
+ } else {
+ sql1 = (sql1.substring(0, matcher.start()) + sql1.substring(matcher.end())).trim();
}
matcher = pattern.matcher(sql1);
}