ILuffZhe commented on code in PR #4118:
URL: https://github.com/apache/calcite/pull/4118#discussion_r1900334938
##########
core/src/test/java/org/apache/calcite/sql2rel/RelFieldTrimmerTest.java:
##########
@@ -672,5 +672,52 @@ public static Frameworks.ConfigBuilder config() {
assertThat(trimmed, hasTree(expected));
}
+ /**
+ * Test case for
+ * <a
href="https://issues.apache.org/jira/browse/CALCITE-3772";>[CALCITE-3772]
+ * RelFieldTrimmer incorrectly trims fields when the query includes
correlated-subquery</a>.
+ */
+ @Test void testTrimCorrelatedSubquery() {
+ final RelBuilder builder = RelBuilder.create(config().build());
+ final Holder<@Nullable RexCorrelVariable> v = Holder.empty();
+ RelNode root = builder.scan("EMP")
+ .variable(v::set)
+ .filter(
+ builder.call(SqlStdOperatorTable.GREATER_THAN, builder.field(5),
+ builder.literal(10)))
+ .project(
+ builder.field(0),
+ builder.scalarQuery(
+ b2 -> builder.scan("EMP").filter(
+ builder.call(SqlStdOperatorTable.LESS_THAN,
+ builder.field(3), builder.field(v.get(), "MGR")))
+ .project(builder.field(0))
+ .aggregate(builder.groupKey(), builder.countStar("c"))
+ .build()))
+ .build();
+
+ String origTree = ""
+ + "LogicalProject(EMPNO=[$0], $f1=[$SCALAR_QUERY({\n"
+ + "LogicalAggregate(group=[{}], c=[COUNT()])\n"
+ + " LogicalFilter(condition=[<($3, $cor0.MGR)])\n"
+ + " LogicalTableScan(table=[[scott, EMP]])\n})])\n"
+ + " LogicalFilter(condition=[>($5, 10)])\n"
+ + " LogicalTableScan(table=[[scott, EMP]])\n";
+ assertThat(root, hasTree(origTree));
+
+ final RelFieldTrimmer fieldTrimmer = new RelFieldTrimmer(null, builder);
+ final RelNode trimmed = fieldTrimmer.trim(root);
+ final String expected = ""
+ + "LogicalProject(EMPNO=[$0], $f1=[$SCALAR_QUERY({\n"
+ + "LogicalAggregate(group=[{}], c=[COUNT()])\n"
+ + " LogicalFilter(condition=[<($3, $cor0.MGR)])\n"
+ + " LogicalTableScan(table=[[scott, EMP]])\n"
+ + "})])\n"
+ + " LogicalFilter(condition=[>($2, 10)])\n"
+ + " LogicalProject(EMPNO=[$0], MGR=[$3], SAL=[$5])\n"
Review Comment:
The fields are trimmed by introducing a Project? Is this the expected
behavior?
##########
core/src/test/java/org/apache/calcite/sql2rel/RelFieldTrimmerTest.java:
##########
@@ -672,5 +672,52 @@ public static Frameworks.ConfigBuilder config() {
assertThat(trimmed, hasTree(expected));
}
+ /**
+ * Test case for
+ * <a
href="https://issues.apache.org/jira/browse/CALCITE-3772";>[CALCITE-3772]
+ * RelFieldTrimmer incorrectly trims fields when the query includes
correlated-subquery</a>.
Review Comment:
Unit test are always welcome.
Can you please add a related link in JIRA
[CALCITE-3772](https://issues.apache.org/jira/browse/CALCITE-3772), so
reviewers can take a quick glance if they are interested in how this issue is
resolved.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
