Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 40D68200C49 for ; Fri, 17 Mar 2017 15:08:13 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 3EF21160B80; Fri, 17 Mar 2017 14:08:13 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8A4B7160B6D for ; Fri, 17 Mar 2017 15:08:12 +0100 (CET) Received: (qmail 43372 invoked by uid 500); 17 Mar 2017 14:08:11 -0000 Mailing-List: contact commits-help@asterixdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.apache.org Delivered-To: mailing list commits@asterixdb.apache.org Received: (qmail 43363 invoked by uid 99); 17 Mar 2017 14:08:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Mar 2017 14:08:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CE6A7DFC4A; Fri, 17 Mar 2017 14:08:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mblow@apache.org To: commits@asterixdb.apache.org Message-Id: <6515ee27656640efa01dba4c79110b21@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: asterixdb git commit: Allow spurious semicolons at the end of statements Date: Fri, 17 Mar 2017 14:08:10 +0000 (UTC) archived-at: Fri, 17 Mar 2017 14:08:13 -0000 Repository: asterixdb Updated Branches: refs/heads/master 58e0184e5 -> 81870d71a Allow spurious semicolons at the end of statements Change-Id: Iea49d46ed361a3540c391a681b5ed16d8958cea4 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1593 Reviewed-by: Yingyi Bu Sonar-Qube: Jenkins Tested-by: Jenkins BAD: Jenkins Integration-Tests: Jenkins Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/81870d71 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/81870d71 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/81870d71 Branch: refs/heads/master Commit: 81870d71a10b7be0a0792d3fb73ea954da280ff3 Parents: 58e0184 Author: Till Westmann Authored: Thu Mar 16 18:11:23 2017 -0700 Committer: Michael Blow Committed: Fri Mar 17 07:07:54 2017 -0700 ---------------------------------------------------------------------- .../org/apache/asterix/api/http/server/QueryServiceServlet.java | 2 +- asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj | 1 + asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/81870d71/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java index b0a9586..101fa97 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java @@ -426,7 +426,7 @@ public class QueryServiceServlet extends AbstractQueryApiServlet { if (param.statement == null || param.statement.isEmpty()) { throw new AsterixException("Empty request, no statement provided"); } - IParser parser = compilationProvider.getParserFactory().createParser(param.statement); + IParser parser = compilationProvider.getParserFactory().createParser(param.statement + ";"); List statements = parser.parse(); MetadataManager.INSTANCE.init(); IStatementExecutor translator = http://git-wip-us.apache.org/repos/asf/asterixdb/blob/81870d71/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 f4cdfb8..33b154e 100644 --- a/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj +++ b/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj @@ -288,6 +288,7 @@ List Statement() throws ParseException: decls.add(stmt); } )* + (";") * { return decls; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/81870d71/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 d791c85..f8685be 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj +++ b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj @@ -335,6 +335,7 @@ List Statement() throws ParseException: decls.add(stmt); } )* + ()* { return decls;