Skip to content

[CALCITE-3421] Reuse relMetadataQuery and fix doc in LogicalCalc #1513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
xy2953396112 wants to merge 1 commit into from
Closed

[CALCITE-3421] Reuse relMetadataQuery and fix doc in LogicalCalc #1513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/calcite/rel/logical/LogicalCalc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
*
* <ul>
* <li>{@link FilterToCalcRule} creates this from a {@link LogicalFilter}
* <li>{@link ProjectToCalcRule} creates this from a {@link LogicalFilter}
* <li>{@link ProjectToCalcRule} creates this from a {@link LogicalProject}
* <li>{@link org.apache.calcite.rel.rules.FilterCalcMergeRule}
* merges this with a {@link LogicalFilter}
* <li>{@link org.apache.calcite.rel.rules.ProjectCalcMergeRule}
Expand Down
4 changes: 2 additions & 2 deletions core/src/test/java/org/apache/calcite/plan/volcano/TraitPropagationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public class TraitPropagationTest {
RelOptUtil.dumpPlan("LOGICAL PLAN", planned, SqlExplainFormat.TEXT,
SqlExplainLevel.ALL_ATTRIBUTES));
}
final RelMetadataQuery mq = RelMetadataQuery.instance();
final RelMetadataQuery mq = planned.getCluster().getMetadataQuery();
assertEquals("Sortedness was not propagated", 3,
mq.getCumulativeCost(planned).getRows(), 0);
}
Expand Down Expand Up @@ -323,7 +323,7 @@ private static class PhysProj extends Project implements Phys {
public static PhysProj create(final RelNode input,
final List<RexNode> projects, RelDataType rowType) {
final RelOptCluster cluster = input.getCluster();
final RelMetadataQuery mq = RelMetadataQuery.instance();
final RelMetadataQuery mq = cluster.getMetadataQuery();
final RelTraitSet traitSet =
cluster.traitSet().replace(PHYSICAL)
.replaceIfs(
Expand Down
6 changes: 3 additions & 3 deletions core/src/test/java/org/apache/calcite/plan/volcano/VolcanoPlannerTraitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,12 +264,12 @@ public VolcanoPlannerTraitTest() {
RelOptCluster cluster = newCluster(planner);
NoneTinyLeafRel leaf = new NoneTinyLeafRel(cluster, "noneLeafRel");
planner.setRoot(leaf);
RelOptCost cost = planner.getCost(leaf, RelMetadataQuery.instance());
RelOptCost cost = planner.getCost(leaf, cluster.getMetadataQuery());

assertTrue(cost.isInfinite());

planner.setNoneConventionHasInfiniteCost(false);
cost = planner.getCost(leaf, RelMetadataQuery.instance());
cost = planner.getCost(leaf, cluster.getMetadataQuery());
assertTrue(!cost.isInfinite());
}

Expand Down Expand Up @@ -342,7 +342,7 @@ public RelNode convert(
RelTrait fromTrait = rel.getTraitSet().getTrait(this);

if (conversionMap.containsKey(fromTrait)) {
final RelMetadataQuery mq = RelMetadataQuery.instance();
final RelMetadataQuery mq = rel.getCluster().getMetadataQuery();
for (Pair<RelTrait, ConverterRule> traitAndRule
: conversionMap.get(fromTrait)) {
RelTrait trait = traitAndRule.left;
Expand Down
Loading