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 35F63200BB4 for ; Mon, 17 Oct 2016 21:54:58 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 33B2E160AF0; Mon, 17 Oct 2016 19:54:58 +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 46905160AE2 for ; Mon, 17 Oct 2016 21:54:55 +0200 (CEST) Received: (qmail 55596 invoked by uid 500); 17 Oct 2016 19:54:54 -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 54266 invoked by uid 99); 17 Oct 2016 19:54:52 -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; Mon, 17 Oct 2016 19:54:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C7DA3F0BEA; Mon, 17 Oct 2016 19:54:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: prestonc@apache.org To: commits@asterixdb.apache.org Date: Mon, 17 Oct 2016 19:55:40 -0000 Message-Id: <3c9c45f0d0ad4db38996b3abdfebea6e@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [50/50] [abbrv] asterixdb git commit: merge clean up archived-at: Mon, 17 Oct 2016 19:54:58 -0000 merge clean up Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/faa3bb45 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/faa3bb45 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/faa3bb45 Branch: refs/heads/ecarm002/interval_join_merge Commit: faa3bb457362215393e97e44c69b05109950f33a Parents: 9baab02 Author: Preston Carman Authored: Mon Oct 17 12:53:38 2016 -0700 Committer: Preston Carman Committed: Mon Oct 17 12:53:38 2016 -0700 ---------------------------------------------------------------------- .../logical/visitors/FDsAndEquivClassesVisitor.java | 12 ++++++------ .../logical/visitors/LogicalPropertiesVisitor.java | 8 -------- .../logical/visitors/SubstituteVariableVisitor.java | 10 ---------- .../prettyprint/LogicalOperatorPrettyPrintVisitor.java | 3 +-- hyracks-fullstack/algebricks/algebricks-data/pom.xml | 5 ----- .../algebricks/algebricks-rewriter/pom.xml | 12 +++++++++--- .../hyracks-examples/hyracks-integration-tests/pom.xml | 8 +++++++- 7 files changed, 23 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/faa3bb45/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/FDsAndEquivClassesVisitor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/FDsAndEquivClassesVisitor.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/FDsAndEquivClassesVisitor.java index 2bb43c9..0eaf1b3 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/FDsAndEquivClassesVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/FDsAndEquivClassesVisitor.java @@ -405,12 +405,6 @@ public class FDsAndEquivClassesVisitor implements ILogicalOperatorVisitor pair) throws AlgebricksException { - for (Mutable e : op.getExpressions()) { - e.getValue().substituteVar(pair.first, pair.second); - } - substVarTypes(op, pair); - return null; - } - - @Override public Void visitProjectOperator(ProjectOperator op, Pair pair) throws AlgebricksException { List usedVariables = op.getVariables(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/faa3bb45/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java index 566f954..7ca2b79 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java @@ -356,8 +356,7 @@ public class LogicalOperatorPrettyPrintVisitor implements ILogicalOperatorVisito @Override public Void visitRangeForwardOperator(RangeForwardOperator op, Integer indent) throws AlgebricksException { - addIndent(indent).append("range forward "); - addIndent(indent).append("split " + branchingExpression.getValue().accept(exprVisitor, indent)); + addIndent(indent).append("range forward"); return null; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/faa3bb45/hyracks-fullstack/algebricks/algebricks-data/pom.xml ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-data/pom.xml b/hyracks-fullstack/algebricks/algebricks-data/pom.xml index b35694b..d95810a 100644 --- a/hyracks-fullstack/algebricks/algebricks-data/pom.xml +++ b/hyracks-fullstack/algebricks/algebricks-data/pom.xml @@ -59,11 +59,6 @@ org.apache.hyracks - hyracks-dataflow-common - 0.2.18-SNAPSHOT - - - org.apache.hyracks hyracks-api ${project.version} http://git-wip-us.apache.org/repos/asf/asterixdb/blob/faa3bb45/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml b/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml index c507911..b434887 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml @@ -17,7 +17,8 @@ ! under the License. !--> - + 4.0.0 algebricks-rewriter algebricks-rewriter @@ -54,8 +55,13 @@ org.apache.hyracks - hyracks-dataflow-common - ${project.version} + hyracks-api + 0.2.18-SNAPSHOT + + + org.apache.hyracks + hyracks-dataflow-std + 0.2.18-SNAPSHOT org.apache.commons http://git-wip-us.apache.org/repos/asf/asterixdb/blob/faa3bb45/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml index 3692cd5..56b4c12 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml @@ -17,7 +17,8 @@ ! under the License. !--> - + 4.0.0 org.apache.hyracks.examples hyracks-integration-tests @@ -157,5 +158,10 @@ hyracks-storage-common ${project.version} + + org.apache.commons + commons-lang3 + 3.1 +