zabetak commented on code in PR #3975: URL: https://github.com/apache/calcite/pull/3975#discussion_r1776527037
########## core/src/test/java/org/apache/calcite/test/RelMetadataTest.java: ########## @@ -2593,6 +2593,79 @@ private void checkPredicates(RelOptCluster cluster, RelOptTable empTable, } + /** Test case for + * <a href="https://issues.apache.org/jira/browse/CALCITE-6592";>[CALCITE-6592] + * RelMdPredicates pull up wrong predicate from UNION when it's input include NULL VALUE</a>. */ + @Test void testPullUpPredicatesFromUnionWithValues1() { + final String sql = "select cast(null as integer) as a\n" + + "union all\n" + + "select 5 as a"; + final Union rel = (Union) sql(sql).toRel(); + final RelMetadataQuery mq = rel.getCluster().getMetadataQuery(); + RelOptPredicateList inputSet = mq.getPulledUpPredicates(rel); + ImmutableList<RexNode> pulledUpPredicates = inputSet.pulledUpPredicates; + assertThat(pulledUpPredicates, sortsAs("[OR(null, =($0, 5))]")); + } + + @Test void testPullUpPredicatesFromUnionWithValues2() { + final String sql = "select 6 as a\n" + + "union all\n" + + "select 5 as a"; + final Union rel = (Union) sql(sql).toRel(); + final RelMetadataQuery mq = rel.getCluster().getMetadataQuery(); + RelOptPredicateList inputSet = mq.getPulledUpPredicates(rel); + ImmutableList<RexNode> pulledUpPredicates = inputSet.pulledUpPredicates; + assertThat(pulledUpPredicates, sortsAs("[SEARCH($0, Sarg[5, 6])]")); + } + + @Test void testPullUpPredicatesFromUnionWithValues3() { + final String sql = "select cast(null as integer) as a, cast(null as integer) as b, 7 as c\n" + + "union all\n" + + "select 5 as a, 6 as b, 7 as c"; + final Union rel = (Union) sql(sql).toRel(); + final RelMetadataQuery mq = rel.getCluster().getMetadataQuery(); + RelOptPredicateList inputSet = mq.getPulledUpPredicates(rel); + ImmutableList<RexNode> pulledUpPredicates = inputSet.pulledUpPredicates; + assertThat(pulledUpPredicates, sortsAs("[=($2, 7), OR(null, AND(=($0, 5), =($1, 6)))]")); + } + + @Test void testPullUpPredicatesFromValues() { + final String sql = "values(1,2,3)"; + final Values values = (Values) sql(sql).toRel(); + final RelMetadataQuery mq = values.getCluster().getMetadataQuery(); + RelOptPredicateList inputSet = mq.getPulledUpPredicates(values); + ImmutableList<RexNode> pulledUpPredicates = inputSet.pulledUpPredicates; + assertThat(pulledUpPredicates, sortsAs("[=($0, 1), =($1, 2), =($2, 3)]")); + } + + @Test void testPullUpPredicatesFromValues2() { + final String sql = "values(null)"; + final Values values = (Values) sql(sql).toRel(); + final RelMetadataQuery mq = values.getCluster().getMetadataQuery(); + RelOptPredicateList inputSet = mq.getPulledUpPredicates(values); + ImmutableList<RexNode> pulledUpPredicates = inputSet.pulledUpPredicates; + assertThat(pulledUpPredicates, sortsAs("[=($0, null)]")); Review Comment: More general, I think that the `Predicates` metadata should never use the `=` operator with the `null` literal. ########## core/src/test/java/org/apache/calcite/test/RelMetadataTest.java: ########## @@ -2593,6 +2593,79 @@ private void checkPredicates(RelOptCluster cluster, RelOptTable empTable, } + /** Test case for + * <a href="https://issues.apache.org/jira/browse/CALCITE-6592";>[CALCITE-6592] + * RelMdPredicates pull up wrong predicate from UNION when it's input include NULL VALUE</a>. */ + @Test void testPullUpPredicatesFromUnionWithValues1() { + final String sql = "select cast(null as integer) as a\n" + + "union all\n" + + "select 5 as a"; + final Union rel = (Union) sql(sql).toRel(); + final RelMetadataQuery mq = rel.getCluster().getMetadataQuery(); + RelOptPredicateList inputSet = mq.getPulledUpPredicates(rel); + ImmutableList<RexNode> pulledUpPredicates = inputSet.pulledUpPredicates; + assertThat(pulledUpPredicates, sortsAs("[OR(null, =($0, 5))]")); + } + + @Test void testPullUpPredicatesFromUnionWithValues2() { + final String sql = "select 6 as a\n" + + "union all\n" + + "select 5 as a"; + final Union rel = (Union) sql(sql).toRel(); + final RelMetadataQuery mq = rel.getCluster().getMetadataQuery(); + RelOptPredicateList inputSet = mq.getPulledUpPredicates(rel); + ImmutableList<RexNode> pulledUpPredicates = inputSet.pulledUpPredicates; + assertThat(pulledUpPredicates, sortsAs("[SEARCH($0, Sarg[5, 6])]")); + } + + @Test void testPullUpPredicatesFromUnionWithValues3() { + final String sql = "select cast(null as integer) as a, cast(null as integer) as b, 7 as c\n" + + "union all\n" + + "select 5 as a, 6 as b, 7 as c"; + final Union rel = (Union) sql(sql).toRel(); + final RelMetadataQuery mq = rel.getCluster().getMetadataQuery(); + RelOptPredicateList inputSet = mq.getPulledUpPredicates(rel); + ImmutableList<RexNode> pulledUpPredicates = inputSet.pulledUpPredicates; + assertThat(pulledUpPredicates, sortsAs("[=($2, 7), OR(null, AND(=($0, 5), =($1, 6)))]")); + } + + @Test void testPullUpPredicatesFromValues() { + final String sql = "values(1,2,3)"; + final Values values = (Values) sql(sql).toRel(); + final RelMetadataQuery mq = values.getCluster().getMetadataQuery(); + RelOptPredicateList inputSet = mq.getPulledUpPredicates(values); + ImmutableList<RexNode> pulledUpPredicates = inputSet.pulledUpPredicates; + assertThat(pulledUpPredicates, sortsAs("[=($0, 1), =($1, 2), =($2, 3)]")); + } + + @Test void testPullUpPredicatesFromValues2() { + final String sql = "values(null)"; + final Values values = (Values) sql(sql).toRel(); + final RelMetadataQuery mq = values.getCluster().getMetadataQuery(); + RelOptPredicateList inputSet = mq.getPulledUpPredicates(values); + ImmutableList<RexNode> pulledUpPredicates = inputSet.pulledUpPredicates; + assertThat(pulledUpPredicates, sortsAs("[=($0, null)]")); Review Comment: The result seems wrong.The predicate `=($0, null)` does not hold in the output rows of the `values(null)` query. If you add a filter on top of the values that says `=($0, null)` it will evaluate to `false` but here we know that $0 is always null so the correct predicate to infer is `IS NULL($0)`. ########## core/src/main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java: ########## @@ -475,7 +475,7 @@ public RelOptPredicateList getPredicates(Union union, RelMetadataQuery mq) { RexNode disjunctivePredicate = new RexSimplify(rexBuilder, RelOptPredicateList.EMPTY, executor) .simplifyUnknownAs(rexBuilder.makeCall(SqlStdOperatorTable.OR, finalResidualPredicates), - RexUnknownAs.FALSE); Review Comment: This question needs to be answered before merging. ########## core/src/test/java/org/apache/calcite/test/RelMetadataTest.java: ########## @@ -2593,6 +2593,31 @@ private void checkPredicates(RelOptCluster cluster, RelOptTable empTable, } + /** Test case for + * <a href="https://issues.apache.org/jira/browse/CALCITE-6592";>[CALCITE-6592] + * RelMdPredicates pull up wrong predicate from UNION when it's input include NULL VALUE</a>. */ + @Test void testPullUpPredicatesFromUnionWithValues1() { + final String sql = "select cast(null as integer) as a\n" + + "union all\n" + + "select 5 as a"; + final Union rel = (Union) sql(sql).toRel(); + final RelMetadataQuery mq = rel.getCluster().getMetadataQuery(); + RelOptPredicateList inputSet = mq.getPulledUpPredicates(rel); + ImmutableList<RexNode> pulledUpPredicates = inputSet.pulledUpPredicates; + assertThat(pulledUpPredicates, sortsAs("[OR(null, =($0, 5))]")); Review Comment: I don't understand why we can't extract `IS NULL($0)` in this case. Can you please elaborate? -- 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]
