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 93F34200B33 for ; Wed, 15 Jun 2016 06:35:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 92A39160A56; Wed, 15 Jun 2016 04:35:01 +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 D935C160A06 for ; Wed, 15 Jun 2016 06:35:00 +0200 (CEST) Received: (qmail 62643 invoked by uid 500); 15 Jun 2016 04:35:00 -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 62631 invoked by uid 99); 15 Jun 2016 04:35:00 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Jun 2016 04:35:00 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 690651A0ADA for ; Wed, 15 Jun 2016 04:34:59 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-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 (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id MoxeJTWwjn_b for ; Wed, 15 Jun 2016 04:34:55 +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 130025F476 for ; Wed, 15 Jun 2016 04:34:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by unhygienix.ics.uci.edu (Postfix) with ESMTP id 65B98240901; Tue, 14 Jun 2016 21:34:49 -0700 (PDT) Date: Tue, 14 Jun 2016 21:34:49 -0700 From: "abdullah alamoudi (Code Review)" CC: Yingyi Bu , Jenkins , Yingyi Bu Reply-To: bamousaa@gmail.com X-Gerrit-MessageType: merged Subject: Change in asterixdb[master]: Fix partitioning for datasets with meta X-Gerrit-Change-Id: Ida2dfe2c54e4fa4ae3b4131ec5acc801fa89ca0d X-Gerrit-ChangeURL: X-Gerrit-Commit: 6c80d533339551b5306d3a8311a5929aa885b813 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: <20160615043449.65B98240901@unhygienix.ics.uci.edu> archived-at: Wed, 15 Jun 2016 04:35:01 -0000 abdullah alamoudi has submitted this change and it was merged. Change subject: Fix partitioning for datasets with meta ...................................................................... Fix partitioning for datasets with meta Change-Id: Ida2dfe2c54e4fa4ae3b4131ec5acc801fa89ca0d Reviewed-on: https://asterix-gerrit.ics.uci.edu/924 Reviewed-by: Jenkins Tested-by: Jenkins Reviewed-by: Yingyi Bu --- M hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/InsertDeleteUpsertPOperator.java 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Yingyi Bu: Looks good to me, approved Jenkins: Looks good to me, but someone else must approve; Verified diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/InsertDeleteUpsertPOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/InsertDeleteUpsertPOperator.java index f0bd603..0bc683c 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/InsertDeleteUpsertPOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/InsertDeleteUpsertPOperator.java @@ -83,7 +83,11 @@ IPhysicalPropertiesVector reqdByParent, IOptimizationContext context) { List scanVariables = new ArrayList(); scanVariables.addAll(keys); + // Why do we add $$-1 and not the payLoad variable? scanVariables.add(new LogicalVariable(-1)); + if (additionalNonFilteringFields != null) { + scanVariables.addAll(additionalNonFilteringFields); + } IPhysicalPropertiesVector r = dataSource.getPropertiesProvider().computePropertiesVector(scanVariables); r.getLocalProperties().clear(); IPhysicalPropertiesVector[] requirements = new IPhysicalPropertiesVector[1]; -- To view, visit https://asterix-gerrit.ics.uci.edu/924 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ida2dfe2c54e4fa4ae3b4131ec5acc801fa89ca0d Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudi Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Yingyi Bu Gerrit-Reviewer: Yingyi Bu Gerrit-Reviewer: abdullah alamoudi