Preston Carman has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/994
Change subject: Rename join operator to be consistent with other join classes. ...................................................................... Rename join operator to be consistent with other join classes. Change-Id: Ib38dba95243e894a2b1950de60ac7ab53ba007ca --- R hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/NestedLoopJoinPOperator.java M hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/util/JoinUtils.java 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/94/994/1 diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/NLJoinPOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/NestedLoopJoinPOperator.java similarity index 98% rename from hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/NLJoinPOperator.java rename to hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/NestedLoopJoinPOperator.java index 5384347..e9f9db0 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/NLJoinPOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/NestedLoopJoinPOperator.java @@ -59,11 +59,11 @@ /** * The right input is broadcast and the left input can be partitioned in any way. */ -public class NLJoinPOperator extends AbstractJoinPOperator { +public class NestedLoopJoinPOperator extends AbstractJoinPOperator { private final int memSize; - public NLJoinPOperator(JoinKind kind, JoinPartitioningType partitioningType, int memSize) { + public NestedLoopJoinPOperator(JoinKind kind, JoinPartitioningType partitioningType, int memSize) { super(kind, partitioningType); this.memSize = memSize; } diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/util/JoinUtils.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/util/JoinUtils.java index 56ea55e..3332836 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/util/JoinUtils.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/util/JoinUtils.java @@ -44,7 +44,7 @@ import org.apache.hyracks.algebricks.core.algebra.operators.physical.AbstractJoinPOperator.JoinPartitioningType; import org.apache.hyracks.algebricks.core.algebra.operators.physical.HybridHashJoinPOperator; import org.apache.hyracks.algebricks.core.algebra.operators.physical.InMemoryHashJoinPOperator; -import org.apache.hyracks.algebricks.core.algebra.operators.physical.NLJoinPOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.physical.NestedLoopJoinPOperator; import org.apache.hyracks.algebricks.core.algebra.properties.ILogicalPropertiesVector; import org.apache.hyracks.algebricks.core.config.AlgebricksConfig; @@ -80,12 +80,12 @@ } } } else { - setNLJoinOp(op, context); + setNestedLoopJoinOp(op, context); } } - private static void setNLJoinOp(AbstractBinaryJoinOperator op, IOptimizationContext context) { - op.setPhysicalOperator(new NLJoinPOperator(op.getJoinKind(), JoinPartitioningType.BROADCAST, + private static void setNestedLoopJoinOp(AbstractBinaryJoinOperator op, IOptimizationContext context) { + op.setPhysicalOperator(new NestedLoopJoinPOperator(op.getJoinKind(), JoinPartitioningType.BROADCAST, context.getPhysicalOptimizationConfig().getMaxFramesForJoin())); } -- To view, visit https://asterix-gerrit.ics.uci.edu/994 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib38dba95243e894a2b1950de60ac7ab53ba007ca Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Preston Carman <prest...@apache.org>