You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by bu...@apache.org on 2016/08/10 22:07:58 UTC
asterixdb git commit: ASTERIXDB-1529: remove "not" from reserved
keywords in AQL.
Repository: asterixdb
Updated Branches:
refs/heads/master 52f183f69 -> dcd9112fa
ASTERIXDB-1529: remove "not" from reserved keywords in AQL.
Change-Id: Ib79fee208acc7ae28f8e082eebb26ed728b39723
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1062
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/dcd9112f
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/dcd9112f
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/dcd9112f
Branch: refs/heads/master
Commit: dcd9112fa71689c015a525adcdbe3ce78c79f17f
Parents: 52f183f
Author: Yingyi Bu <yi...@couchbase.com>
Authored: Wed Aug 10 12:13:36 2016 -0700
Committer: Yingyi Bu <bu...@gmail.com>
Committed: Wed Aug 10 15:07:39 2016 -0700
----------------------------------------------------------------------
.../tinysocial-suite.13.query.aql | 2 +-
.../asterix-lang-aql/src/main/javacc/AQL.jj | 19 ++++++++++++++++---
2 files changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dcd9112f/asterixdb/asterix-app/src/test/resources/runtimets/queries/tinysocial/tinysocial-suite/tinysocial-suite.13.query.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/tinysocial/tinysocial-suite/tinysocial-suite.13.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/tinysocial/tinysocial-suite/tinysocial-suite.13.query.aql
index 573c38c..b6f302d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/tinysocial/tinysocial-suite/tinysocial-suite.13.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/tinysocial/tinysocial-suite/tinysocial-suite.13.query.aql
@@ -24,6 +24,6 @@ use dataverse TinySocial;
for $fbu in dataset FacebookUsers
-where (every $e in $fbu.employment satisfies "not"(is-missing($e.end-date)))
+where (every $e in $fbu.employment satisfies not(is-missing($e.end-date)))
order by $fbu.id
return $fbu;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dcd9112f/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj b/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj
index b3f6200..b690f03 100644
--- a/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj
+++ b/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj
@@ -769,7 +769,19 @@ boolean IfNotExists() throws ParseException:
{
}
{
- ( <IF> <NOT> <EXISTS>
+ (
+ LOOKAHEAD(1)
+ <IF>
+ <IDENTIFIER>
+ (
+ {
+ if(!token.image.equals("not")){
+ throw new ParseException("Expect word \"not\" at line " + token.beginLine + ", column "
+ + token.beginColumn +"!");
+ }
+ }
+ )
+ <EXISTS>
{
return true;
}
@@ -900,7 +912,9 @@ boolean IfExists() throws ParseException :
{
}
{
- ( <IF> <EXISTS>
+ (
+ LOOKAHEAD(1)
+ <IF> <EXISTS>
{
return true;
}
@@ -2621,7 +2635,6 @@ TOKEN :
| <LOAD : "load">
| <NGRAM : "ngram">
| <NODEGROUP : "nodegroup">
- | <NOT : "not">
| <OFFSET : "offset">
| <ON : "on">
| <OPEN : "open">