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 <prest...@apache.org> Authored: Mon Oct 17 12:53:38 2016 -0700 Committer: Preston Carman <prest...@apache.org> 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<Void, } @Override - public Void visitPartitioningSplitOperator(PartitioningSplitOperator op, IOptimizationContext ctx) - throws AlgebricksException { - throw new NotImplementedException(); - } - - @Override public Void visitProjectOperator(ProjectOperator op, IOptimizationContext ctx) throws AlgebricksException { propagateFDsAndEquivClassesForUsedVars(op, ctx, op.getVariables()); return null; @@ -429,6 +423,12 @@ public class FDsAndEquivClassesVisitor implements ILogicalOperatorVisitor<Void, } @Override + public Void visitSplitOperator(SplitOperator op, IOptimizationContext ctx) throws AlgebricksException { + propagateFDsAndEquivClasses(op, ctx); + return null; + } + + @Override public Void visitMaterializeOperator(MaterializeOperator op, IOptimizationContext ctx) throws AlgebricksException { propagateFDsAndEquivClasses(op, ctx); return null; 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/LogicalPropertiesVisitor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/LogicalPropertiesVisitor.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/LogicalPropertiesVisitor.java index f7113c0..4863917 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/LogicalPropertiesVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/LogicalPropertiesVisitor.java @@ -47,7 +47,6 @@ import org.apache.hyracks.algebricks.core.algebra.operators.logical.LimitOperato import org.apache.hyracks.algebricks.core.algebra.operators.logical.MaterializeOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; -import org.apache.hyracks.algebricks.core.algebra.operators.logical.PartitioningSplitOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.RangeForwardOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator; @@ -176,13 +175,6 @@ public class LogicalPropertiesVisitor implements ILogicalOperatorVisitor<Void, I } @Override - public Void visitPartitioningSplitOperator(PartitioningSplitOperator op, IOptimizationContext arg) - throws AlgebricksException { - // TODO Auto-generated method stub - return null; - } - - @Override public Void visitProjectOperator(ProjectOperator op, IOptimizationContext context) throws AlgebricksException { propagateCardinalityAndFrameNumber(op, context); return null; 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/SubstituteVariableVisitor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/SubstituteVariableVisitor.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/SubstituteVariableVisitor.java index 5d6a7b3..14388aa 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/SubstituteVariableVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/SubstituteVariableVisitor.java @@ -220,16 +220,6 @@ public class SubstituteVariableVisitor } @Override - public Void visitPartitioningSplitOperator(PartitioningSplitOperator op, - Pair<LogicalVariable, LogicalVariable> pair) throws AlgebricksException { - for (Mutable<ILogicalExpression> e : op.getExpressions()) { - e.getValue().substituteVar(pair.first, pair.second); - } - substVarTypes(op, pair); - return null; - } - - @Override public Void visitProjectOperator(ProjectOperator op, Pair<LogicalVariable, LogicalVariable> pair) throws AlgebricksException { List<LogicalVariable> 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 @@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>0.2.18-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${project.version}</version> </dependency> 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. !--> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <artifactId>algebricks-rewriter</artifactId> <name>algebricks-rewriter</name> @@ -54,8 +55,13 @@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> + <artifactId>hyracks-api</artifactId> + <version>0.2.18-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-dataflow-std</artifactId> + <version>0.2.18-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> 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. !--> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.hyracks.examples</groupId> <artifactId>hyracks-integration-tests</artifactId> @@ -157,5 +158,10 @@ <artifactId>hyracks-storage-common</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.1</version> + </dependency> </dependencies> </project>