Skip to content

[CALCITE-6193] If a query has more than one subexpression that matche… #3624

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

Open
JiajunBernoulli wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[CALCITE-6193] If a query has more than one subexpression that matche… #3624

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
7 changes: 5 additions & 2 deletions core/src/main/java/org/apache/calcite/plan/SubstitutionVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ assert rowTypesAreEquivalent(

final List<Replacement> attempted = new ArrayList<>();
List<List<Replacement>> substitutions = new ArrayList<>();

int globalInputIndex = 0;
for (;;) {
int count = 0;
MutableRel queryDescendant = query;
Expand All @@ -575,9 +575,11 @@ assert rowTypesAreEquivalent(
}
}
final MutableRel next = MutableRels.preOrderTraverseNext(queryDescendant);
final int currentInputIndex = queryDescendant.getInputs().size() > globalInputIndex
? globalInputIndex : 0;
final MutableRel childOrNext =
queryDescendant.getInputs().isEmpty()
? next : queryDescendant.getInputs().get(0);
? next : queryDescendant.getInputs().get(currentInputIndex);
for (MutableRel targetDescendant : targetDescendants) {
for (UnifyRule rule
: applicableRules(queryDescendant, targetDescendant)) {
Expand Down Expand Up @@ -616,6 +618,7 @@ assert rowTypesAreEquivalent(
substitutions.add(ImmutableList.copyOf(attempted));
attempted.clear();
queryDescendant = next;
globalInputIndex++;
continue outer;
}
// We will try walking the query tree all over again to see
Expand Down
37 changes: 37 additions & 0 deletions core/src/test/java/org/apache/calcite/test/MaterializedViewSubstitutionVisitorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1849,6 +1849,43 @@ protected final MaterializedViewFixture sql(String materialize,
sql(mv2, query2).ok();
}

/** Test case for
* <a href="https://issues.apache.org/jira/browse/CALCITE-6193">[CALCITE-6193]
* If a query has more than one subexpression that matches a materialized view,
* only the first is substituted</a>. */
@Test void testStopTryIncorrectSubtree() {
final String mv = ""
+ "select \"empid\", \"deptno\"\n"
+ "from \"emps\"\n"
+ "group by \"empid\", \"deptno\"";
final String matchQuery = "select \"deptno\"\n"
+ "from \"emps\"\n"
+ "group by \"deptno\"\n";
final String query = ""
+ "select t1.\"deptno\"\n"
+ "from (\n"
+ "select \"deptno\"\n"
+ "from \"emps\"\n"
+ "union all\n"
+ matchQuery
+ ") as t1 inner join (\n"
+ matchQuery
+ ") as t2 on t1.\"deptno\" = t2.\"deptno\"\n";
sql(mv, query)
.checkingThatResultContains(""
+ "LogicalCalc(expr#0..1=[{inputs}], deptno=[$t0])\n"
+ " LogicalJoin(condition=[=($0, $1)], joinType=[inner])\n"
+ " LogicalUnion(all=[true])\n"
+ " LogicalCalc(expr#0..1=[{inputs}], deptno=[$t1])\n"
+ " LogicalCalc(expr#0..4=[{inputs}], proj#0..1=[{exprs}])\n"
+ " LogicalTableScan(table=[[hr, emps]])\n"
+ " LogicalAggregate(group=[{1}])\n"
+ " EnumerableTableScan(table=[[hr, MV0]])\n"
+ " LogicalAggregate(group=[{1}])\n"
+ " EnumerableTableScan(table=[[hr, MV0]])")
.ok();
}

/** Fixture for tests for whether expressions are satisfiable,
* specifically {@link SubstitutionVisitor#mayBeSatisfiable(RexNode)}. */
private static class SatisfiabilityFixture {
Expand Down