Preston Carman has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/995
Change subject: Updated exchange operator names to include 'exchange' in the
class name.
......................................................................
Updated exchange operator names to include 'exchange' in the class name.
Change-Id: Icd10c9a7ba0ad9e7b899a350d14213c2c0951e75
---
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceRandomPartitioningFeedComputationRule.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/UsedVariableVisitor.java
R
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/BroadcastExchangePOperator.java
R
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RandomPartitionExchangePOperator.java
R
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RangePartitionExchangePOperator.java
R
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RangePartitionMergeExchangePOperator.java
M
hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/EnforceStructuralPropertiesRule.java
7 files changed, 22 insertions(+), 22 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/95/995/1
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceRandomPartitioningFeedComputationRule.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceRandomPartitioningFeedComputationRule.java
index fb81885..4f5a848 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceRandomPartitioningFeedComputationRule.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceRandomPartitioningFeedComputationRule.java
@@ -34,7 +34,7 @@
import
org.apache.hyracks.algebricks.core.algebra.operators.logical.DataSourceScanOperator;
import
org.apache.hyracks.algebricks.core.algebra.operators.logical.ExchangeOperator;
import
org.apache.hyracks.algebricks.core.algebra.operators.physical.AssignPOperator;
-import
org.apache.hyracks.algebricks.core.algebra.operators.physical.RandomPartitionPOperator;
+import
org.apache.hyracks.algebricks.core.algebra.operators.physical.RandomPartitionExchangePOperator;
import org.apache.hyracks.algebricks.core.algebra.properties.INodeDomain;
import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
@@ -77,7 +77,7 @@
}
};
- exchangeOp.setPhysicalOperator(new RandomPartitionPOperator(domain));
+ exchangeOp.setPhysicalOperator(new
RandomPartitionExchangePOperator(domain));
op.getInputs().get(0).setValue(exchangeOp);
exchangeOp.getInputs().add(new
MutableObject<ILogicalOperator>(scanOp));
ExecutionMode em = ((AbstractLogicalOperator)
scanOp).getExecutionMode();
diff --git
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/UsedVariableVisitor.java
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/UsedVariableVisitor.java
index efb45de..e966406 100644
---
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/UsedVariableVisitor.java
+++
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/UsedVariableVisitor.java
@@ -68,8 +68,8 @@
import
org.apache.hyracks.algebricks.core.algebra.operators.logical.WriteResultOperator;
import
org.apache.hyracks.algebricks.core.algebra.operators.physical.HashPartitionExchangePOperator;
import
org.apache.hyracks.algebricks.core.algebra.operators.physical.HashPartitionMergeExchangePOperator;
-import
org.apache.hyracks.algebricks.core.algebra.operators.physical.RangePartitionMergePOperator;
-import
org.apache.hyracks.algebricks.core.algebra.operators.physical.RangePartitionPOperator;
+import
org.apache.hyracks.algebricks.core.algebra.operators.physical.RangePartitionMergeExchangePOperator;
+import
org.apache.hyracks.algebricks.core.algebra.operators.physical.RangePartitionExchangePOperator;
import
org.apache.hyracks.algebricks.core.algebra.operators.physical.SortMergeExchangePOperator;
import org.apache.hyracks.algebricks.core.algebra.properties.OrderColumn;
import
org.apache.hyracks.algebricks.core.algebra.visitors.ILogicalOperatorVisitor;
@@ -155,14 +155,14 @@
break;
}
case RANGE_PARTITION_EXCHANGE: {
- RangePartitionPOperator concreteOp =
(RangePartitionPOperator) physOp;
+ RangePartitionExchangePOperator concreteOp =
(RangePartitionExchangePOperator) physOp;
for (OrderColumn partCol :
concreteOp.getPartitioningFields()) {
usedVariables.add(partCol.getColumn());
}
break;
}
case RANGE_PARTITION_MERGE_EXCHANGE: {
- RangePartitionMergePOperator concreteOp =
(RangePartitionMergePOperator) physOp;
+ RangePartitionMergeExchangePOperator concreteOp =
(RangePartitionMergeExchangePOperator) physOp;
for (OrderColumn partCol :
concreteOp.getPartitioningFields()) {
usedVariables.add(partCol.getColumn());
}
diff --git
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/BroadcastPOperator.java
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/BroadcastExchangePOperator.java
similarity index 96%
rename from
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/BroadcastPOperator.java
rename to
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/BroadcastExchangePOperator.java
index 69bfe2a..d9e1540 100644
---
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/BroadcastPOperator.java
+++
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/BroadcastExchangePOperator.java
@@ -39,11 +39,11 @@
import org.apache.hyracks.api.job.IConnectorDescriptorRegistry;
import
org.apache.hyracks.dataflow.std.connectors.MToNReplicatingConnectorDescriptor;
-public class BroadcastPOperator extends AbstractExchangePOperator {
+public class BroadcastExchangePOperator extends AbstractExchangePOperator {
private INodeDomain domain;
- public BroadcastPOperator(INodeDomain domain) {
+ public BroadcastExchangePOperator(INodeDomain domain) {
this.domain = domain;
}
diff --git
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RandomPartitionPOperator.java
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RandomPartitionExchangePOperator.java
similarity index 96%
rename from
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RandomPartitionPOperator.java
rename to
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RandomPartitionExchangePOperator.java
index 7237d24..cba8f97 100644
---
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RandomPartitionPOperator.java
+++
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RandomPartitionExchangePOperator.java
@@ -39,11 +39,11 @@
import
org.apache.hyracks.dataflow.common.data.partition.RandomPartitionComputerFactory;
import
org.apache.hyracks.dataflow.std.connectors.MToNPartitioningConnectorDescriptor;
-public class RandomPartitionPOperator extends AbstractExchangePOperator {
+public class RandomPartitionExchangePOperator extends
AbstractExchangePOperator {
private final INodeDomain domain;
- public RandomPartitionPOperator(INodeDomain domain) {
+ public RandomPartitionExchangePOperator(INodeDomain domain) {
this.domain = domain;
}
diff --git
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RangePartitionPOperator.java
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RangePartitionExchangePOperator.java
similarity index 96%
rename from
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RangePartitionPOperator.java
rename to
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RangePartitionExchangePOperator.java
index 9046ce2..225ffa0 100644
---
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RangePartitionPOperator.java
+++
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RangePartitionExchangePOperator.java
@@ -52,13 +52,13 @@
import org.apache.hyracks.dataflow.common.data.partition.range.IRangeMap;
import
org.apache.hyracks.dataflow.std.connectors.MToNPartitioningConnectorDescriptor;
-public class RangePartitionPOperator extends AbstractExchangePOperator {
+public class RangePartitionExchangePOperator extends AbstractExchangePOperator
{
private List<OrderColumn> partitioningFields;
private INodeDomain domain;
private IRangeMap rangeMap;
- public RangePartitionPOperator(List<OrderColumn> partitioningFields,
INodeDomain domain, IRangeMap rangeMap) {
+ public RangePartitionExchangePOperator(List<OrderColumn>
partitioningFields, INodeDomain domain, IRangeMap rangeMap) {
this.partitioningFields = partitioningFields;
this.domain = domain;
this.rangeMap = rangeMap;
diff --git
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RangePartitionMergePOperator.java
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RangePartitionMergeExchangePOperator.java
similarity index 97%
rename from
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RangePartitionMergePOperator.java
rename to
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RangePartitionMergeExchangePOperator.java
index 1f70f2a..f56a5dc 100644
---
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RangePartitionMergePOperator.java
+++
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RangePartitionMergeExchangePOperator.java
@@ -57,13 +57,13 @@
import org.apache.hyracks.dataflow.common.data.partition.range.IRangeMap;
import
org.apache.hyracks.dataflow.std.connectors.MToNPartitioningMergingConnectorDescriptor;
-public class RangePartitionMergePOperator extends AbstractExchangePOperator {
+public class RangePartitionMergeExchangePOperator extends
AbstractExchangePOperator {
private List<OrderColumn> partitioningFields;
private INodeDomain domain;
private IRangeMap rangeMap;
- public RangePartitionMergePOperator(List<OrderColumn> partitioningFields,
INodeDomain domain, IRangeMap rangeMap) {
+ public RangePartitionMergeExchangePOperator(List<OrderColumn>
partitioningFields, INodeDomain domain, IRangeMap rangeMap) {
this.partitioningFields = partitioningFields;
this.domain = domain;
this.rangeMap = rangeMap;
diff --git
a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/EnforceStructuralPropertiesRule.java
b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/EnforceStructuralPropertiesRule.java
index 53f7dbf..8edf0ba 100644
---
a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/EnforceStructuralPropertiesRule.java
+++
b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/EnforceStructuralPropertiesRule.java
@@ -51,7 +51,7 @@
import
org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator.IOrder.OrderKind;
import
org.apache.hyracks.algebricks.core.algebra.operators.logical.visitors.FDsAndEquivClassesVisitor;
import
org.apache.hyracks.algebricks.core.algebra.operators.physical.AbstractStableSortPOperator;
-import
org.apache.hyracks.algebricks.core.algebra.operators.physical.BroadcastPOperator;
+import
org.apache.hyracks.algebricks.core.algebra.operators.physical.BroadcastExchangePOperator;
import
org.apache.hyracks.algebricks.core.algebra.operators.physical.ExternalGroupByPOperator;
import
org.apache.hyracks.algebricks.core.algebra.operators.physical.HashPartitionExchangePOperator;
import
org.apache.hyracks.algebricks.core.algebra.operators.physical.HashPartitionMergeExchangePOperator;
@@ -59,9 +59,9 @@
import
org.apache.hyracks.algebricks.core.algebra.operators.physical.PreSortedDistinctByPOperator;
import
org.apache.hyracks.algebricks.core.algebra.operators.physical.PreclusteredGroupByPOperator;
import
org.apache.hyracks.algebricks.core.algebra.operators.physical.RandomMergeExchangePOperator;
-import
org.apache.hyracks.algebricks.core.algebra.operators.physical.RandomPartitionPOperator;
-import
org.apache.hyracks.algebricks.core.algebra.operators.physical.RangePartitionMergePOperator;
-import
org.apache.hyracks.algebricks.core.algebra.operators.physical.RangePartitionPOperator;
+import
org.apache.hyracks.algebricks.core.algebra.operators.physical.RandomPartitionExchangePOperator;
+import
org.apache.hyracks.algebricks.core.algebra.operators.physical.RangePartitionMergeExchangePOperator;
+import
org.apache.hyracks.algebricks.core.algebra.operators.physical.RangePartitionExchangePOperator;
import
org.apache.hyracks.algebricks.core.algebra.operators.physical.SortMergeExchangePOperator;
import
org.apache.hyracks.algebricks.core.algebra.operators.physical.StableSortPOperator;
import
org.apache.hyracks.algebricks.core.algebra.prettyprint.LogicalOperatorPrettyPrintVisitor;
@@ -540,7 +540,7 @@
if
(op.getAnnotations().containsKey(OperatorAnnotations.USE_RANGE_CONNECTOR)) {
IRangeMap rangeMap = (IRangeMap)
op.getAnnotations()
.get(OperatorAnnotations.USE_RANGE_CONNECTOR);
- pop = new RangePartitionMergePOperator(ordCols,
domain, rangeMap);
+ pop = new
RangePartitionMergeExchangePOperator(ordCols, domain, rangeMap);
} else {
OrderColumn[] sortColumns = new
OrderColumn[ordCols.size()];
sortColumns = ordCols.toArray(sortColumns);
@@ -573,18 +573,18 @@
break;
}
case ORDERED_PARTITIONED: {
- pop = new
RangePartitionPOperator(((OrderedPartitionedProperty) pp).getOrderColumns(),
domain,
+ pop = new
RangePartitionExchangePOperator(((OrderedPartitionedProperty)
pp).getOrderColumns(), domain,
null);
break;
}
case BROADCAST: {
- pop = new BroadcastPOperator(domain);
+ pop = new BroadcastExchangePOperator(domain);
break;
}
case RANDOM: {
RandomPartitioningProperty rpp =
(RandomPartitioningProperty) pp;
INodeDomain nd = rpp.getNodeDomain();
- pop = new RandomPartitionPOperator(nd);
+ pop = new RandomPartitionExchangePOperator(nd);
break;
}
default: {
--
To view, visit https://asterix-gerrit.ics.uci.edu/995
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd10c9a7ba0ad9e7b899a350d14213c2c0951e75
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Preston Carman <prest...@apache.org>
