From 8f9d39763cc5da8c3b5e9e8ae8a93fc3ffce2e9e Mon Sep 17 00:00:00 2001 From: Hanumath Rao Maduri Date: Sun, 29 Jul 2018 12:29:25 -0700 Subject: DRILL-6617: Changing name of implicit RowId column from implicitColumn to implicitRIDColumn. closes #1401 --- .../drill/exec/planner/physical/ComplexToJsonPrel.java | 5 ----- .../org/apache/drill/exec/planner/physical/FilterPrel.java | 14 +++----------- .../org/apache/drill/exec/planner/physical/JoinPrel.java | 4 ---- .../drill/exec/planner/physical/LateralJoinPrel.java | 5 ----- .../java/org/apache/drill/exec/planner/physical/Prel.java | 5 ++++- .../drill/exec/planner/physical/ProducerConsumerPrel.java | 5 ----- .../apache/drill/exec/planner/physical/ProjectPrel.java | 14 +++----------- .../org/apache/drill/exec/planner/physical/ScanPrel.java | 5 ----- .../org/apache/drill/exec/planner/physical/ScreenPrel.java | 5 ----- .../org/apache/drill/exec/planner/physical/SinglePrel.java | 6 ------ .../org/apache/drill/exec/planner/physical/UnionPrel.java | 5 ----- .../org/apache/drill/exec/planner/physical/ValuesPrel.java | 5 ----- .../org/apache/drill/exec/planner/physical/WindowPrel.java | 5 ----- .../org/apache/drill/exec/planner/physical/WriterPrel.java | 5 ----- 14 files changed, 10 insertions(+), 78 deletions(-) (limited to 'exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical') diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ComplexToJsonPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ComplexToJsonPrel.java index 47ef87594..1a96d605c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ComplexToJsonPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ComplexToJsonPrel.java @@ -71,9 +71,4 @@ public class ComplexToJsonPrel extends SingleRel implements Prel { return true; } - @Override - public Prel addImplicitRowIDCol(List children) { - throw new UnsupportedOperationException("Adding Implicit RowID column is not supported for " + - this.getClass().getSimpleName() + " operator "); - } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/FilterPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/FilterPrel.java index 1548d3516..1c9112c56 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/FilterPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/FilterPrel.java @@ -18,10 +18,8 @@ package org.apache.drill.exec.planner.physical; import java.io.IOException; -import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Map; import org.apache.calcite.rex.RexBuilder; import org.apache.drill.exec.physical.base.PhysicalOperator; @@ -89,14 +87,8 @@ public class FilterPrel extends DrillFilterRelBase implements Prel { @Override public Prel addImplicitRowIDCol(List children) { RexBuilder builder = this.getCluster().getRexBuilder(); - return (Prel) this.copy(this.traitSet, children.get(0), DrillRelOptUtil.transformExpr(builder, condition, buildMap())); - } - - private Map buildMap() { - Map map = new HashMap<>(); - for (int i=0;i children) { - throw new UnsupportedOperationException("Adding Implicit RowID column is not supported for " + this.getClass().getSimpleName() + " operator "); - } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LateralJoinPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LateralJoinPrel.java index 64e59e951..44163bac1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LateralJoinPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LateralJoinPrel.java @@ -156,9 +156,4 @@ public class LateralJoinPrel extends DrillLateralJoinRelBase implements Prel { return BatchSchema.SelectionVectorMode.NONE; } - @Override - public Prel addImplicitRowIDCol(List children) { - throw new UnsupportedOperationException("Adding Implicit RowID column is not supported for " + - this.getClass().getSimpleName() + " operator "); - } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/Prel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/Prel.java index d7628ee5a..b72aff70b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/Prel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/Prel.java @@ -56,6 +56,9 @@ public interface Prel extends DrillRelNode, Iterable { SelectionVectorMode getEncoding(); boolean needsFinalColumnReordering(); - Prel addImplicitRowIDCol(List children); + default Prel addImplicitRowIDCol(List children) { + throw new UnsupportedOperationException("Adding Implicit RowID column is not supported for " + + this.getClass().getSimpleName() + " operator "); + } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProducerConsumerPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProducerConsumerPrel.java index c22bd007c..4d320eb13 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProducerConsumerPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProducerConsumerPrel.java @@ -80,9 +80,4 @@ public class ProducerConsumerPrel extends SingleRel implements DrillRelNode, Pre return true; } - @Override - public Prel addImplicitRowIDCol(List children) { - throw new UnsupportedOperationException("Adding Implicit RowID column is not supported for " + - this.getClass().getSimpleName() + " operator "); - } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrel.java index dd8e81bba..0a9e8bf1a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrel.java @@ -19,10 +19,8 @@ package org.apache.drill.exec.planner.physical; import java.io.IOException; import java.util.ArrayList; -import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Map; import com.google.common.collect.Lists; import org.apache.calcite.rel.type.RelDataTypeFactory; @@ -143,7 +141,9 @@ public class ProjectPrel extends DrillProjectRelBase implements Prel{ RexBuilder builder = this.getCluster().getRexBuilder(); List projects = Lists.newArrayList(); projects.add(builder.makeInputRef(typeFactory.createSqlType(SqlTypeName.INTEGER), 0)); - projects.addAll(DrillRelOptUtil.transformExprs(builder, this.getProjects(), buildMap())); + // right shift the previous field indices. + projects.addAll(DrillRelOptUtil.transformExprs(builder, this.getProjects(), + DrillRelOptUtil.rightShiftColsInRowType(this.getInput().getRowType()))); List fieldNames = new ArrayList<>(); List fieldTypes = new ArrayList<>(); @@ -160,12 +160,4 @@ public class ProjectPrel extends DrillProjectRelBase implements Prel{ return (Prel) this.copy(this.getTraitSet(), children.get(0), projects, newRowType); } - - private Map buildMap() { - Map map = new HashMap<>(); - for (int i=0;i children) { - throw new UnsupportedOperationException("Adding Implicit RowID column is not supported for " + - this.getClass().getSimpleName() + " operator "); - } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ScreenPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ScreenPrel.java index c65914c54..ee2b30919 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ScreenPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ScreenPrel.java @@ -85,9 +85,4 @@ public class ScreenPrel extends DrillScreenRelBase implements Prel, HasDistribut return DistributionAffinity.HARD; } - @Override - public Prel addImplicitRowIDCol(List children) { - throw new UnsupportedOperationException("Adding Implicit RowID column is not supported for " + - this.getClass().getSimpleName() + " operator "); - } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SinglePrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SinglePrel.java index e403f6789..959acb4ca 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SinglePrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SinglePrel.java @@ -18,7 +18,6 @@ package org.apache.drill.exec.planner.physical; import java.util.Iterator; -import java.util.List; import org.apache.drill.exec.planner.physical.visitor.PrelVisitor; import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode; @@ -53,9 +52,4 @@ public abstract class SinglePrel extends SingleRel implements Prel{ return true; } - @Override - public Prel addImplicitRowIDCol(List children) { - throw new UnsupportedOperationException("Adding Implicit RowID column is not supported for " + - this.getClass().getSimpleName() + " operator "); - } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionPrel.java index 202e1cc2e..79d5611c8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionPrel.java @@ -49,9 +49,4 @@ public abstract class UnionPrel extends DrillUnionRelBase implements Prel{ return false; } - @Override - public Prel addImplicitRowIDCol(List children) { - throw new UnsupportedOperationException("Adding Implicit RowID column is not supported for " + - this.getClass().getSimpleName() + " operator "); - } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ValuesPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ValuesPrel.java index 89daf2cfc..095519fa1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ValuesPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ValuesPrel.java @@ -88,9 +88,4 @@ public class ValuesPrel extends DrillValuesRelBase implements Prel { return false; } - @Override - public Prel addImplicitRowIDCol(List children) { - throw new UnsupportedOperationException("Adding Implicit RowID column is not supported for " + - this.getClass().getSimpleName() + " operator "); - } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrel.java index 224a2cd09..275dd4869 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrel.java @@ -182,9 +182,4 @@ public class WindowPrel extends DrillWindowRelBase implements Prel { return rowType; } - @Override - public Prel addImplicitRowIDCol(List children) { - throw new UnsupportedOperationException("Adding Implicit RowID column is not supported for " + - this.getClass().getSimpleName() + " operator "); - } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrel.java index 957641085..a4f283db6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrel.java @@ -79,9 +79,4 @@ public class WriterPrel extends DrillWriterRelBase implements Prel { return true; } - @Override - public Prel addImplicitRowIDCol(List children) { - throw new UnsupportedOperationException("Adding Implicit RowID column is not supported for " + - this.getClass().getSimpleName() + " operator "); - } } -- cgit v1.2.3