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 5FBA3200C00 for ; Wed, 4 Jan 2017 07:01:56 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 5E33F160B46; Wed, 4 Jan 2017 06:01:56 +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 71A51160B43 for ; Wed, 4 Jan 2017 07:01:55 +0100 (CET) Received: (qmail 33724 invoked by uid 500); 4 Jan 2017 06:01:54 -0000 Mailing-List: contact notifications-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 notifications@asterixdb.apache.org Received: (qmail 33715 invoked by uid 99); 4 Jan 2017 06:01:54 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jan 2017 06:01:54 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 04391C0258 for ; Wed, 4 Jan 2017 06:01:53 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 2.126 X-Spam-Level: ** X-Spam-Status: No, score=2.126 tagged_above=-999 required=6.31 tests=[MISSING_HEADERS=1.207, SPF_FAIL=0.919] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id gmeEJ2PyLLAD for ; Wed, 4 Jan 2017 06:01:52 +0000 (UTC) Received: from unhygienix.ics.uci.edu (unhygienix.ics.uci.edu [128.195.14.130]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 11C315F30C for ; Wed, 4 Jan 2017 06:01:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by unhygienix.ics.uci.edu (Postfix) with ESMTP id CAC05241F01; Tue, 3 Jan 2017 22:01:29 -0800 (PST) Date: Tue, 3 Jan 2017 22:01:29 -0800 From: "Steven Jacobs (Code Review)" CC: Yingyi Bu , Jenkins Reply-To: sjaco002@ucr.edu X-Gerrit-MessageType: merged Subject: Change in asterixdb-bad[master]: Match Changes to Asterix insert with return clause X-Gerrit-Change-Id: I9fc3b5ebcaab5f00965e654f061967251a0febd8 X-Gerrit-ChangeURL: X-Gerrit-Commit: c817765454b9f882b457c96e3001aae8bddade43 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Content-Disposition: inline User-Agent: Gerrit/2.8.4 Message-Id: <20170104060129.CAC05241F01@unhygienix.ics.uci.edu> archived-at: Wed, 04 Jan 2017 06:01:56 -0000 Steven Jacobs has submitted this change and it was merged. Change subject: Match Changes to Asterix insert with return clause ...................................................................... Match Changes to Asterix insert with return clause Change-Id: I9fc3b5ebcaab5f00965e654f061967251a0febd8 --- M asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelSubscribeStatement.java M asterix-bad/src/test/resources/optimizerts/results/channel/channel-create.plan M asterix-bad/src/test/resources/optimizerts/results/channel/channel-subscribe.plan M asterix-bad/src/test/resources/optimizerts/results/channel/channel-unsubscribe.plan 4 files changed, 8 insertions(+), 9 deletions(-) Approvals: Yingyi Bu: Looks good to me, approved Jenkins: Verified diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelSubscribeStatement.java b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelSubscribeStatement.java index 85ee0fc..af7394e 100644 --- a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelSubscribeStatement.java +++ b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelSubscribeStatement.java @@ -196,20 +196,18 @@ VariableExpr useResultVar = new VariableExpr(new VarIdentifier("$result", 0)); useResultVar.setIsNewVar(false); useSubscriptionVar.setIsNewVar(false); - Query returnQuery = new Query(false); List clauseList = new ArrayList<>(); LetClause let = new LetClause(subscriptionVar, new FieldAccessor(useResultVar, new Identifier(BADConstants.SubscriptionId))); clauseList.add(let); FLWOGRExpression body = new FLWOGRExpression(clauseList, useSubscriptionVar); - returnQuery.setBody(body); metadataProvider.setResultSetId(new ResultSetId(resultSetIdCounter++)); metadataProvider.setResultAsyncMode( resultDelivery == ResultDelivery.ASYNC || resultDelivery == ResultDelivery.DEFERRED); InsertStatement insert = new InsertStatement(new Identifier(dataverse), new Identifier(subscriptionsDatasetName), subscriptionTuple, varCounter, resultVar, - returnQuery); + body); ((QueryTranslator) statementExecutor).handleInsertUpsertStatement(metadataProvider, insert, hcc, hdc, resultDelivery, stats, false); } else { diff --git a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-create.plan b/asterix-bad/src/test/resources/optimizerts/results/channel/channel-create.plan index 889af1f..b642fed 100644 --- a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-create.plan +++ b/asterix-bad/src/test/resources/optimizerts/results/channel/channel-create.plan @@ -17,7 +17,7 @@ -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- INSERT_DELETE |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$36] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$35] |PARTITIONED| -- ASSIGN |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ASSIGN |PARTITIONED| diff --git a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-subscribe.plan b/asterix-bad/src/test/resources/optimizerts/results/channel/channel-subscribe.plan index c5871f9..68d1c86 100644 --- a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-subscribe.plan +++ b/asterix-bad/src/test/resources/optimizerts/results/channel/channel-subscribe.plan @@ -17,7 +17,7 @@ -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- INSERT_DELETE |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$36] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$35] |PARTITIONED| -- ASSIGN |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ASSIGN |PARTITIONED| @@ -62,10 +62,11 @@ -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- INSERT_DELETE |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$5] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$8] |PARTITIONED| -- ASSIGN |UNPARTITIONED| -- STREAM_PROJECT |UNPARTITIONED| -- ASSIGN |UNPARTITIONED| - -- ASSIGN |UNPARTITIONED| + -- STREAM_PROJECT |UNPARTITIONED| -- ASSIGN |UNPARTITIONED| - -- EMPTY_TUPLE_SOURCE |UNPARTITIONED| + -- ASSIGN |UNPARTITIONED| + -- EMPTY_TUPLE_SOURCE |UNPARTITIONED| \ No newline at end of file diff --git a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-unsubscribe.plan b/asterix-bad/src/test/resources/optimizerts/results/channel/channel-unsubscribe.plan index bdb8734..79aaa8c 100644 --- a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-unsubscribe.plan +++ b/asterix-bad/src/test/resources/optimizerts/results/channel/channel-unsubscribe.plan @@ -17,7 +17,7 @@ -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- INSERT_DELETE |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$36] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$35] |PARTITIONED| -- ASSIGN |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ASSIGN |PARTITIONED| -- To view, visit https://asterix-gerrit.ics.uci.edu/1412 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9fc3b5ebcaab5f00965e654f061967251a0febd8 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb-bad Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Steven Jacobs Gerrit-Reviewer: Yingyi Bu