Repository: asterixdb Updated Branches: refs/heads/master 7926f2595 -> 9f04f9746
[ASTERIXDB-2117][SQL] Eliminating '#' for line comment in SQLPP - user model changes: yes - storage format changes: no - interface changes: no Details: 1. Removed '#' for line comment in SQLPP. 2. Fixed comment stripping for '--' in test executor. Change-Id: I8fc25ad9cd4923edf0359cf90b466c8fa09a6485 Reviewed-on: https://asterix-gerrit.ics.uci.edu/2037 Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Contrib: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Michael Blow <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/9f04f974 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/9f04f974 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/9f04f974 Branch: refs/heads/master Commit: 9f04f97467b8b59059c4a553be8ff40cccdaa0e4 Parents: 7926f25 Author: Till Westmann <[email protected]> Authored: Tue Oct 3 09:26:19 2017 -0700 Committer: Xikui Wang <[email protected]> Committed: Tue Oct 3 12:11:30 2017 -0700 ---------------------------------------------------------------------- .../org/apache/asterix/test/common/TestExecutor.java | 7 +++---- .../async-compilation-failed.1.async.sqlpp | 2 +- .../async-failed/async-failed.1.async.sqlpp | 2 +- .../async-failed/async-failed.2.pollget.uri | 4 ++-- .../async-repeated/async-repeated.1.async.sqlpp | 2 +- .../async-repeated/async-repeated.2.pollget.uri | 4 ++-- .../async-running/async-running.1.async.sqlpp | 2 +- .../async-running/async-running.2.pollget.uri | 2 +- .../async-running/async-running.3.pollget.uri | 4 ++-- .../async-deferred/async/async.1.async.sqlpp | 2 +- .../async-deferred/async/async.2.pollget.uri | 4 ++-- .../async-deferred/deferred/deferred.1.deferred.sqlpp | 2 +- .../getCapital/getCapital.3.query.sqlpp | 2 +- .../external-library/mysum/mysum.3.query.sqlpp | 2 +- .../queries_sqlpp/flwor/at00/at00.4.deferred.sqlpp | 2 +- .../queries_sqlpp/flwor/at00/at00.6.async.sqlpp | 2 +- .../queries_sqlpp/flwor/at00/at00.7.pollget.uri | 4 ++-- .../global-aggregate/q10/q10.3.query.sqlpp | 4 ++-- asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj | 13 ------------- 19 files changed, 26 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f04f974/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java index 43b61b6..4ca9131 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java @@ -108,8 +108,8 @@ public class TestExecutor { private static final long MAX_URL_LENGTH = 2000l; private static final Pattern JAVA_BLOCK_COMMENT_PATTERN = Pattern.compile("/\\*.*\\*/", Pattern.MULTILINE | Pattern.DOTALL); - private static final Pattern JAVA_LINE_COMMENT_PATTERN = Pattern.compile("^//.*$", Pattern.MULTILINE); - private static final Pattern SHELL_LINE_COMMENT_PATTERN = Pattern.compile("^#.*$", Pattern.MULTILINE); + private static final Pattern JAVA_SHELL_SQL_LINE_COMMENT_PATTERN = Pattern.compile("^(//|#|--).*$", + Pattern.MULTILINE); private static final Pattern REGEX_LINES_PATTERN = Pattern.compile("^(-)?/(.*)/([im]*)$"); private static final Pattern POLL_TIMEOUT_PATTERN = Pattern.compile("polltimeoutsecs=(\\d+)(\\D|$)", Pattern.MULTILINE); @@ -1522,8 +1522,7 @@ public class TestExecutor { } public static String stripLineComments(String text) { - final String s = SHELL_LINE_COMMENT_PATTERN.matcher(text).replaceAll(""); - return JAVA_LINE_COMMENT_PATTERN.matcher(s).replaceAll(""); + return JAVA_SHELL_SQL_LINE_COMMENT_PATTERN.matcher(text).replaceAll(""); } public static String stripAllComments(String statement) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f04f974/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-compilation-failed/async-compilation-failed.1.async.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-compilation-failed/async-compilation-failed.1.async.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-compilation-failed/async-compilation-failed.1.async.sqlpp index 2b91cb6..66d97f2 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-compilation-failed/async-compilation-failed.1.async.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-compilation-failed/async-compilation-failed.1.async.sqlpp @@ -17,7 +17,7 @@ * under the License. */ -#handlevariable=status +-- handlevariable=status select count(*) from gargel http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f04f974/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-failed/async-failed.1.async.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-failed/async-failed.1.async.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-failed/async-failed.1.async.sqlpp index 2f0feff..d31a17a 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-failed/async-failed.1.async.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-failed/async-failed.1.async.sqlpp @@ -17,7 +17,7 @@ * under the License. */ -#handlevariable=status +-- handlevariable=status set `import-private-functions` `true`; select value inject_failure(sleep("result", 5000), true); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f04f974/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-failed/async-failed.2.pollget.uri ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-failed/async-failed.2.pollget.uri b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-failed/async-failed.2.pollget.uri index e20319a..1fbc932 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-failed/async-failed.2.pollget.uri +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-failed/async-failed.2.pollget.uri @@ -17,7 +17,7 @@ * under the License. */ -#polltimeoutsecs=30 -#handlevariable=result +-- polltimeoutsecs=30 +-- handlevariable=result $status http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f04f974/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-repeated/async-repeated.1.async.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-repeated/async-repeated.1.async.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-repeated/async-repeated.1.async.sqlpp index c9a2958..1e18f66 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-repeated/async-repeated.1.async.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-repeated/async-repeated.1.async.sqlpp @@ -17,6 +17,6 @@ * under the License. */ -#handlevariable=status +-- handlevariable=status select i, i * i as i2 from range(1, 10) i; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f04f974/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-repeated/async-repeated.2.pollget.uri ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-repeated/async-repeated.2.pollget.uri b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-repeated/async-repeated.2.pollget.uri index bf3f04c..bca879b 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-repeated/async-repeated.2.pollget.uri +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-repeated/async-repeated.2.pollget.uri @@ -17,7 +17,7 @@ * under the License. */ -#polltimeoutsecs=20 -#handlevariable=result +-- polltimeoutsecs=20 +-- handlevariable=result $status http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f04f974/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-running/async-running.1.async.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-running/async-running.1.async.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-running/async-running.1.async.sqlpp index 5237950..661887f 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-running/async-running.1.async.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-running/async-running.1.async.sqlpp @@ -17,6 +17,6 @@ * under the License. */ -#handlevariable=status +-- handlevariable=status select value sleep("result", 5000); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f04f974/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-running/async-running.2.pollget.uri ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-running/async-running.2.pollget.uri b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-running/async-running.2.pollget.uri index c83909b..4f793ef 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-running/async-running.2.pollget.uri +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-running/async-running.2.pollget.uri @@ -17,6 +17,6 @@ * under the License. */ -#polltimeoutsecs=10 +-- polltimeoutsecs=10 $status http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f04f974/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-running/async-running.3.pollget.uri ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-running/async-running.3.pollget.uri b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-running/async-running.3.pollget.uri index 12fcdfd..d10aed9 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-running/async-running.3.pollget.uri +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-running/async-running.3.pollget.uri @@ -17,7 +17,7 @@ * under the License. */ -#polltimeoutsecs=10 -#handlevariable=result +-- polltimeoutsecs=10 +-- handlevariable=result $status http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f04f974/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async/async.1.async.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async/async.1.async.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async/async.1.async.sqlpp index c9a2958..1e18f66 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async/async.1.async.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async/async.1.async.sqlpp @@ -17,6 +17,6 @@ * under the License. */ -#handlevariable=status +-- handlevariable=status select i, i * i as i2 from range(1, 10) i; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f04f974/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async/async.2.pollget.uri ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async/async.2.pollget.uri b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async/async.2.pollget.uri index 12fcdfd..d10aed9 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async/async.2.pollget.uri +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async/async.2.pollget.uri @@ -17,7 +17,7 @@ * under the License. */ -#polltimeoutsecs=10 -#handlevariable=result +-- polltimeoutsecs=10 +-- handlevariable=result $status http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f04f974/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/deferred/deferred.1.deferred.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/deferred/deferred.1.deferred.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/deferred/deferred.1.deferred.sqlpp index 815e49e..65143d5 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/deferred/deferred.1.deferred.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/deferred/deferred.1.deferred.sqlpp @@ -17,6 +17,6 @@ * under the License. */ -#handlevariable=result +-- handlevariable=result select i, i * i as i2 from range(1, 10) i; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f04f974/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-library/getCapital/getCapital.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-library/getCapital/getCapital.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-library/getCapital/getCapital.3.query.sqlpp index 758f048..4ef12cb 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-library/getCapital/getCapital.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-library/getCapital/getCapital.3.query.sqlpp @@ -18,4 +18,4 @@ */ use externallibtest; -SELECT VALUE `testlib#getCapital`(country) FROM ["England","Italy","China","United States","India","Jupiter"] as country +SELECT VALUE testlib#getCapital(country) FROM ["England","Italy","China","United States","India","Jupiter"] as country http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f04f974/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-library/mysum/mysum.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-library/mysum/mysum.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-library/mysum/mysum.3.query.sqlpp index 16a20c9..9402e1f 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-library/mysum/mysum.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-library/mysum/mysum.3.query.sqlpp @@ -18,5 +18,5 @@ */ use externallibtest; -let x=`testlib#mysum`(3,4) +let x=testlib#mysum(3,4) select VALUE x; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f04f974/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at00/at00.4.deferred.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at00/at00.4.deferred.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at00/at00.4.deferred.sqlpp index d834704..12c03c0 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at00/at00.4.deferred.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at00/at00.4.deferred.sqlpp @@ -22,7 +22,7 @@ * Date : 09/17/2013 */ -#handlevariable=result +-- handlevariable=result use test; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f04f974/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at00/at00.6.async.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at00/at00.6.async.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at00/at00.6.async.sqlpp index 706a92b..7ba0e96 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at00/at00.6.async.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at00/at00.6.async.sqlpp @@ -22,7 +22,7 @@ * Date : 09/17/2013 */ -#handlevariable=status +-- handlevariable=status use test; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f04f974/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at00/at00.7.pollget.uri ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at00/at00.7.pollget.uri b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at00/at00.7.pollget.uri index 12fcdfd..d10aed9 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at00/at00.7.pollget.uri +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at00/at00.7.pollget.uri @@ -17,7 +17,7 @@ * under the License. */ -#polltimeoutsecs=10 -#handlevariable=result +-- polltimeoutsecs=10 +-- handlevariable=result $status http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f04f974/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q10/q10.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q10/q10.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q10/q10.3.query.sqlpp index b7bcd7f..56f637e 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q10/q10.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q10/q10.3.query.sqlpp @@ -22,9 +22,9 @@ USE TinySocial; -- Tests the propagation for WITH binding variables for subqueries in global aggregates. WITH t AS ( SELECT VALUE MIN(v) -- aggregate - FROM [1, 2, 3] v # from clause + FROM [1, 2, 3] v -- from clause )[0] -# The main select query that uses the WITH variable t. +-- The main select query that uses the WITH variable t. SELECT COUNT(1) count, t FROM FacebookUsers u; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f04f974/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj index c451124..d3a64d8 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj +++ b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj @@ -3464,19 +3464,6 @@ SKIP: <DEFAULT,IN_DBL_BRACE> SKIP: { - <"#" (~["\n"])* "\n"> -} - - -<DEFAULT,IN_DBL_BRACE> -SKIP: -{ - <"#" (~["\n","\r"])* ("\n"|"\r"|"\r\n")?> -} - -<DEFAULT,IN_DBL_BRACE> -SKIP: -{ <"/*"> { pushState(); } : INSIDE_COMMENT }
