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 73DEF200B4A for ; Wed, 6 Jul 2016 05:35:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 724D2160A76; Wed, 6 Jul 2016 03:35:25 +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 BDD4B160A6F for ; Wed, 6 Jul 2016 05:35:24 +0200 (CEST) Received: (qmail 86411 invoked by uid 500); 6 Jul 2016 03:35:23 -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 86402 invoked by uid 99); 6 Jul 2016 03:35:23 -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; Wed, 06 Jul 2016 03:35:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5DF91E01C1; Wed, 6 Jul 2016 03:35:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tillw@apache.org To: commits@asterixdb.apache.org Message-Id: <700bd730dd654ce5872074267a2b1a5c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: asterixdb git commit: ASTERIXDB-1515: fix the NPE. Date: Wed, 6 Jul 2016 03:35:23 +0000 (UTC) archived-at: Wed, 06 Jul 2016 03:35:25 -0000 Repository: asterixdb Updated Branches: refs/heads/master 7f30303c3 -> 640705a79 ASTERIXDB-1515: fix the NPE. Change-Id: I39412b02d503866588990020af1ea3252e83e1a0 Reviewed-on: https://asterix-gerrit.ics.uci.edu/976 Sonar-Qube: Jenkins Tested-by: Jenkins Integration-Tests: Jenkins Reviewed-by: Till Westmann Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/640705a7 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/640705a7 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/640705a7 Branch: refs/heads/master Commit: 640705a79a58518dd78dc60154445868a20558d9 Parents: 7f30303 Author: Yingyi Bu Authored: Tue Jul 5 17:13:24 2016 -0700 Committer: Till Westmann Committed: Tue Jul 5 20:34:56 2016 -0700 ---------------------------------------------------------------------- .../queries_sqlpp/user-defined-functions/udf30/udf30.1.query.sqlpp | 2 +- .../asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml | 2 +- .../sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/640705a7/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf30/udf30.1.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf30/udf30.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf30/udf30.1.query.sqlpp index 5f0148b..ac2562f 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf30/udf30.1.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf30/udf30.1.query.sqlpp @@ -28,5 +28,5 @@ declare function abc(y) { }; let z =y -select element z +select element z; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/640705a7/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml index a34689e..f2d5704 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml @@ -6534,7 +6534,7 @@ udf30 - Error: + org.apache.hyracks.algebricks.common.exceptions.AlgebricksException: Undefined alias (variable) reference for identifier y http://git-wip-us.apache.org/repos/asf/asterixdb/blob/640705a7/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java index 599654b..dfb15b0 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java @@ -274,7 +274,7 @@ public class AbstractSqlppExpressionScopingVisitor extends AbstractSqlppSimpleEx // variables defined in the parent scope. Scope scope = new Scope(scopeChecker, scopeChecker.getCurrentScope(), true); scopeChecker.pushExistingScope(scope); - independentSubquery.getExpr().accept(this, arg); + independentSubquery.setExpr(independentSubquery.getExpr().accept(this, arg)); scopeChecker.removeCurrentScope(); return independentSubquery; }