You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by mi...@apache.org on 2016/09/07 05:14:00 UTC
calcite git commit: [CALCITE-1342] PushProjector should not only work
for Logical rels, but use RelFactories to create appropriate rels
Repository: calcite
Updated Branches:
refs/heads/master 547aa67c2 -> cb356d8af
[CALCITE-1342] PushProjector should not only work for Logical rels, but use RelFactories to create appropriate rels
Close apache/calcite#265
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/cb356d8a
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/cb356d8a
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/cb356d8a
Branch: refs/heads/master
Commit: cb356d8af3453b3407af8695693127e740cd06af
Parents: 547aa67
Author: Minji Kim <mi...@dremio.com>
Authored: Wed Jun 29 21:13:28 2016 -0700
Committer: MinJi Kim <mi...@apache.org>
Committed: Tue Sep 6 22:11:36 2016 -0700
----------------------------------------------------------------------
.../org/apache/calcite/plan/RelOptUtil.java | 31 ++++++--------------
.../rel/rules/ProjectFilterTransposeRule.java | 7 +++--
.../rel/rules/ProjectJoinTransposeRule.java | 21 ++++++++-----
.../rel/rules/ProjectSetOpTransposeRule.java | 23 +++++++++------
.../apache/calcite/rel/rules/PushProjector.java | 29 +++++++++++-------
.../org/apache/calcite/tools/RelBuilder.java | 23 +++++++++++++--
6 files changed, 80 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/cb356d8a/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java b/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java
index e1ef79d..580e8cb 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java
@@ -2761,23 +2761,7 @@ public abstract class RelOptUtil {
List<Pair<RexNode, String>> projectList,
boolean optimize) {
return createProject(child, Pair.left(projectList), Pair.right(projectList),
- optimize, RelFactories.DEFAULT_PROJECT_FACTORY);
- }
-
- /**
- * Creates a relational expression which projects a list of (expression, name)
- * pairs.
- *
- * @param child input relational expression
- * @param projectList list of (expression, name) pairs
- * @param optimize Whether to optimize
- * @param projectFactory Factory to create project operators
- */
- public static RelNode createProject(
- RelNode child, List<Pair<RexNode, String>> projectList,
- boolean optimize, RelFactories.ProjectFactory projectFactory) {
- return createProject(child, Pair.left(projectList), Pair.right(projectList),
- optimize, projectFactory);
+ optimize, RelFactories.LOGICAL_BUILDER.create(child.getCluster(), null));
}
/**
@@ -2818,7 +2802,7 @@ public abstract class RelOptUtil {
List<String> fieldNames,
boolean optimize) {
return createProject(child, exprs, fieldNames, optimize,
- RelFactories.DEFAULT_PROJECT_FACTORY);
+ RelFactories.LOGICAL_BUILDER.create(child.getCluster(), null));
}
/**
@@ -2836,14 +2820,14 @@ public abstract class RelOptUtil {
* @param fieldNames aliases of the expressions, or null to generate
* @param optimize Whether to return <code>child</code> unchanged if the
* projections are trivial.
- * @param projectFactory Factory to create project operators
+ * @param relBuilder Factory to create project operators
*/
public static RelNode createProject(
RelNode child,
List<? extends RexNode> exprs,
List<String> fieldNames,
boolean optimize,
- RelFactories.ProjectFactory projectFactory) {
+ RelBuilder relBuilder) {
final RelOptCluster cluster = child.getCluster();
final RelDataType rowType =
RexUtil.createStructType(cluster.getTypeFactory(), exprs,
@@ -2858,7 +2842,9 @@ public abstract class RelOptUtil {
}
return child;
}
- return projectFactory.createProject(child, exprs, rowType.getFieldNames());
+ relBuilder.push(child);
+ relBuilder.project(exprs, rowType.getFieldNames(), !optimize);
+ return relBuilder.build();
}
/**
@@ -3004,7 +2990,8 @@ public abstract class RelOptUtil {
final int pos = posList.get(index);
return fieldNames.get(pos);
}
- }, true, factory);
+ }, true,
+ RelBuilder.proto(factory).create(child.getCluster(), null));
}
/**
http://git-wip-us.apache.org/repos/asf/calcite/blob/cb356d8a/core/src/main/java/org/apache/calcite/rel/rules/ProjectFilterTransposeRule.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectFilterTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectFilterTransposeRule.java
index d184e11..516de3b 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectFilterTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectFilterTransposeRule.java
@@ -69,8 +69,8 @@ public class ProjectFilterTransposeRule extends RelOptRule {
// implement RelOptRule
public void onMatch(RelOptRuleCall call) {
- LogicalProject origProj;
- LogicalFilter filter;
+ Project origProj;
+ Filter filter;
if (call.rels.length == 2) {
origProj = call.rel(0);
@@ -94,7 +94,8 @@ public class ProjectFilterTransposeRule extends RelOptRule {
PushProjector pushProjector =
new PushProjector(
- origProj, origFilter, rel, preserveExprCondition);
+ origProj, origFilter, rel, preserveExprCondition,
+ relBuilderFactory.create(origProj.getCluster(), null));
RelNode topProject = pushProjector.convertProject(null);
if (topProject != null) {
http://git-wip-us.apache.org/repos/asf/calcite/blob/cb356d8a/core/src/main/java/org/apache/calcite/rel/rules/ProjectJoinTransposeRule.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectJoinTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectJoinTransposeRule.java
index 8613d22..b732635 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectJoinTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectJoinTransposeRule.java
@@ -20,10 +20,12 @@ import org.apache.calcite.plan.RelOptRule;
import org.apache.calcite.plan.RelOptRuleCall;
import org.apache.calcite.rel.RelNode;
import org.apache.calcite.rel.core.Join;
+import org.apache.calcite.rel.core.Project;
+import org.apache.calcite.rel.core.RelFactories;
import org.apache.calcite.rel.core.SemiJoin;
-import org.apache.calcite.rel.logical.LogicalProject;
import org.apache.calcite.rel.type.RelDataTypeField;
import org.apache.calcite.rex.RexNode;
+import org.apache.calcite.tools.RelBuilderFactory;
import java.util.ArrayList;
import java.util.List;
@@ -36,7 +38,9 @@ import java.util.List;
*/
public class ProjectJoinTransposeRule extends RelOptRule {
public static final ProjectJoinTransposeRule INSTANCE =
- new ProjectJoinTransposeRule(PushProjector.ExprCondition.FALSE);
+ new ProjectJoinTransposeRule(
+ PushProjector.ExprCondition.FALSE,
+ RelFactories.LOGICAL_BUILDER);
//~ Instance fields --------------------------------------------------------
@@ -54,10 +58,12 @@ public class ProjectJoinTransposeRule extends RelOptRule {
* preserved in the projection
*/
public ProjectJoinTransposeRule(
- PushProjector.ExprCondition preserveExprCondition) {
+ PushProjector.ExprCondition preserveExprCondition,
+ RelBuilderFactory relFactory) {
super(
- operand(LogicalProject.class,
- operand(Join.class, any())));
+ operand(Project.class,
+ operand(Join.class, any())),
+ relFactory, null);
this.preserveExprCondition = preserveExprCondition;
}
@@ -65,7 +71,7 @@ public class ProjectJoinTransposeRule extends RelOptRule {
// implement RelOptRule
public void onMatch(RelOptRuleCall call) {
- LogicalProject origProj = call.rel(0);
+ Project origProj = call.rel(0);
final Join join = call.rel(1);
if (join instanceof SemiJoin) {
@@ -80,7 +86,8 @@ public class ProjectJoinTransposeRule extends RelOptRule {
origProj,
join.getCondition(),
join,
- preserveExprCondition);
+ preserveExprCondition,
+ relBuilderFactory.create(origProj.getCluster(), null));
if (pushProject.locateAllRefs()) {
return;
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/cb356d8a/core/src/main/java/org/apache/calcite/rel/rules/ProjectSetOpTransposeRule.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectSetOpTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectSetOpTransposeRule.java
index 2647c5c..5df05f6 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectSetOpTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectSetOpTransposeRule.java
@@ -19,9 +19,12 @@ package org.apache.calcite.rel.rules;
import org.apache.calcite.plan.RelOptRule;
import org.apache.calcite.plan.RelOptRuleCall;
import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.core.Project;
+import org.apache.calcite.rel.core.RelFactories;
import org.apache.calcite.rel.core.SetOp;
import org.apache.calcite.rel.logical.LogicalProject;
import org.apache.calcite.rex.RexInputRef;
+import org.apache.calcite.tools.RelBuilderFactory;
import java.util.ArrayList;
import java.util.List;
@@ -37,7 +40,8 @@ import java.util.List;
*/
public class ProjectSetOpTransposeRule extends RelOptRule {
public static final ProjectSetOpTransposeRule INSTANCE =
- new ProjectSetOpTransposeRule(PushProjector.ExprCondition.FALSE);
+ new ProjectSetOpTransposeRule(
+ PushProjector.ExprCondition.FALSE, RelFactories.LOGICAL_BUILDER);
//~ Instance fields --------------------------------------------------------
@@ -55,11 +59,13 @@ public class ProjectSetOpTransposeRule extends RelOptRule {
* @param preserveExprCondition Condition whether to preserve expressions
*/
public ProjectSetOpTransposeRule(
- PushProjector.ExprCondition preserveExprCondition) {
+ PushProjector.ExprCondition preserveExprCondition,
+ RelBuilderFactory relBuilderFactory) {
super(
operand(
LogicalProject.class,
- operand(SetOp.class, any())));
+ operand(SetOp.class, any())),
+ relBuilderFactory, null);
this.preserveExprCondition = preserveExprCondition;
}
@@ -77,7 +83,9 @@ public class ProjectSetOpTransposeRule extends RelOptRule {
// locate all fields referenced in the projection
PushProjector pushProject =
- new PushProjector(origProj, null, setOp, preserveExprCondition);
+ new PushProjector(
+ origProj, null, setOp, preserveExprCondition,
+ relBuilderFactory.create(origProj.getCluster(), null));
pushProject.locateAllRefs();
List<RelNode> newSetOpInputs = new ArrayList<RelNode>();
@@ -91,11 +99,8 @@ public class ProjectSetOpTransposeRule extends RelOptRule {
for (RelNode input : setOp.getInputs()) {
// be lazy: produce two ProjectRels, and let another rule
// merge them (could probably just clone origProj instead?)
- LogicalProject p =
- pushProject.createProjectRefsAndExprs(
- input, true, false);
- newSetOpInputs.add(
- pushProject.createNewProject(p, adjustments));
+ Project p = pushProject.createProjectRefsAndExprs(input, true, false);
+ newSetOpInputs.add(pushProject.createNewProject(p, adjustments));
}
// create a new setop whose children are the ProjectRels created above
http://git-wip-us.apache.org/repos/asf/calcite/blob/cb356d8a/core/src/main/java/org/apache/calcite/rel/rules/PushProjector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/PushProjector.java b/core/src/main/java/org/apache/calcite/rel/rules/PushProjector.java
index 867cf0e..75b6a73 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/PushProjector.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/PushProjector.java
@@ -20,9 +20,9 @@ import org.apache.calcite.linq4j.Ord;
import org.apache.calcite.plan.RelOptUtil;
import org.apache.calcite.rel.RelNode;
import org.apache.calcite.rel.core.Join;
+import org.apache.calcite.rel.core.Project;
import org.apache.calcite.rel.core.SemiJoin;
import org.apache.calcite.rel.core.SetOp;
-import org.apache.calcite.rel.logical.LogicalProject;
import org.apache.calcite.rel.type.RelDataTypeField;
import org.apache.calcite.rex.RexBuilder;
import org.apache.calcite.rex.RexCall;
@@ -31,10 +31,12 @@ import org.apache.calcite.rex.RexNode;
import org.apache.calcite.rex.RexUtil;
import org.apache.calcite.rex.RexVisitorImpl;
import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.tools.RelBuilder;
import org.apache.calcite.util.BitSets;
import org.apache.calcite.util.ImmutableBitSet;
import org.apache.calcite.util.Pair;
+import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
@@ -60,10 +62,11 @@ import java.util.Set;
public class PushProjector {
//~ Instance fields --------------------------------------------------------
- private final LogicalProject origProj;
+ private final Project origProj;
private final RexNode origFilter;
private final RelNode childRel;
private final ExprCondition preserveExprCondition;
+ private final RelBuilder relBuilder;
/**
* Original projection expressions
@@ -188,15 +191,16 @@ public class PushProjector {
* be preserved in the projection
*/
public PushProjector(
- LogicalProject origProj,
+ Project origProj,
RexNode origFilter,
RelNode childRel,
- ExprCondition preserveExprCondition) {
+ ExprCondition preserveExprCondition,
+ RelBuilder relBuilder) {
this.origProj = origProj;
this.origFilter = origFilter;
this.childRel = childRel;
this.preserveExprCondition = preserveExprCondition;
-
+ this.relBuilder = Preconditions.checkNotNull(relBuilder);
if (origProj == null) {
origProjExprs = ImmutableList.of();
} else {
@@ -308,7 +312,9 @@ public class PushProjector {
origFilter,
newProject.getRowType().getFieldList(),
adjustments);
- projChild = RelOptUtil.createFilter(newProject, newFilter);
+ relBuilder.push(newProject);
+ relBuilder.filter(newFilter);
+ projChild = relBuilder.build();
} else {
projChild = newProject;
}
@@ -411,7 +417,7 @@ public class PushProjector {
* of a join
* @return created projection
*/
- public LogicalProject createProjectRefsAndExprs(
+ public Project createProjectRefsAndExprs(
RelNode projChild,
boolean adjust,
boolean rightSide) {
@@ -474,10 +480,12 @@ public class PushProjector {
((RexCall) projExpr).getOperator().getName()));
}
- return (LogicalProject) RelOptUtil.createProject(
+ return (Project) RelOptUtil.createProject(
projChild,
Pair.left(newProjects),
- Pair.right(newProjects));
+ Pair.right(newProjects),
+ false,
+ relBuilder);
}
/**
@@ -565,7 +573,8 @@ public class PushProjector {
projChild,
Pair.left(projects),
Pair.right(projects),
- true /* optimize to avoid trivial projections, as per javadoc */);
+ true /* optimize to avoid trivial projections, as per javadoc */,
+ relBuilder);
}
//~ Inner Classes ----------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/cb356d8a/core/src/main/java/org/apache/calcite/tools/RelBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/tools/RelBuilder.java b/core/src/main/java/org/apache/calcite/tools/RelBuilder.java
index 30776d2..554e777 100644
--- a/core/src/main/java/org/apache/calcite/tools/RelBuilder.java
+++ b/core/src/main/java/org/apache/calcite/tools/RelBuilder.java
@@ -784,6 +784,20 @@ public class RelBuilder {
}
/** Creates a {@link org.apache.calcite.rel.core.Project} of the given list
+ * of expressions and field names.
+ *
+ * <p>Infers names as would {@link #project(Iterable, Iterable)} if all
+ * suggested names were null.
+ *
+ * @param nodes Expressions
+ * @param fieldNames field names for expressions
+ */
+ public RelBuilder project(Iterable<? extends RexNode> nodes,
+ Iterable<String> fieldNames) {
+ return project(nodes, fieldNames, false);
+ }
+
+ /** Creates a {@link org.apache.calcite.rel.core.Project} of the given list
* of expressions, using the given names.
*
* <p>Names are deduced as follows:
@@ -804,9 +818,12 @@ public class RelBuilder {
*
* @param nodes Expressions
* @param fieldNames Suggested field names
+ * @param force create project even if it is identity
*/
- public RelBuilder project(Iterable<? extends RexNode> nodes,
- Iterable<String> fieldNames) {
+ public RelBuilder project(
+ Iterable<? extends RexNode> nodes,
+ Iterable<String> fieldNames,
+ boolean force) {
final List<String> names = new ArrayList<>();
final List<RexNode> exprList = Lists.newArrayList(nodes);
final Iterator<String> nameIterator = fieldNames.iterator();
@@ -816,7 +833,7 @@ public class RelBuilder {
names.add(Util.first(name, name2));
}
final RelDataType inputRowType = peek().getRowType();
- if (RexUtil.isIdentity(exprList, inputRowType)) {
+ if (!force && RexUtil.isIdentity(exprList, inputRowType)) {
if (names.equals(inputRowType.getFieldNames())) {
// Do not create an identity project if it does not rename any fields
return this;