You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by za...@apache.org on 2023/04/26 09:52:15 UTC
[calcite] branch main updated: [CALCITE-5675] Infer predicates for anti-join
This is an automated email from the ASF dual-hosted git repository.
zabetak pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/main by this push:
new e5f7729d7d [CALCITE-5675] Infer predicates for anti-join
e5f7729d7d is described below
commit e5f7729d7d44630fc9c3b06bc326f335089b4b84
Author: Stamatis Zampetakis <za...@gmail.com>
AuthorDate: Tue Apr 25 16:17:01 2023 +0200
[CALCITE-5675] Infer predicates for anti-join
Close apache/calcite#3176
---
.../calcite/rel/metadata/RelMdPredicates.java | 2 +
.../apache/calcite/test/RelMdPredicatesTest.java | 94 ++++++++++++++++++++++
.../RelMdPredicatesTestLeftInferredFromJoin.csv | 6 ++
.../test/RelMdPredicatesTestPullUpFromJoin.csv | 6 ++
.../RelMdPredicatesTestRightInferredFromJoin.csv | 6 ++
5 files changed, 114 insertions(+)
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java
index c530b38653..c860c7c9c7 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java
@@ -657,6 +657,7 @@ public class RelMdPredicates
case SEMI:
case INNER:
case LEFT:
+ case ANTI:
infer(leftChildPredicates, allExprs, inferredPredicates,
includeEqualityInference,
joinType == JoinRelType.LEFT ? rightFieldsBitSet
@@ -719,6 +720,7 @@ public class RelMdPredicates
return RelOptPredicateList.of(rexBuilder, pulledUpPredicates,
leftInferredPredicates, rightInferredPredicates);
case LEFT:
+ case ANTI:
return RelOptPredicateList.of(rexBuilder,
RelOptUtil.conjunctions(leftChildPredicates),
leftInferredPredicates, rightInferredPredicates);
diff --git a/core/src/test/java/org/apache/calcite/test/RelMdPredicatesTest.java b/core/src/test/java/org/apache/calcite/test/RelMdPredicatesTest.java
new file mode 100644
index 0000000000..9b923a1c2f
--- /dev/null
+++ b/core/src/test/java/org/apache/calcite/test/RelMdPredicatesTest.java
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.calcite.test;
+
+import org.apache.calcite.plan.RelOptPredicateList;
+import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.core.JoinRelType;
+import org.apache.calcite.rel.metadata.RelMetadataQuery;
+import org.apache.calcite.tools.FrameworkConfig;
+import org.apache.calcite.tools.RelBuilder;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvFileSource;
+
+import static org.apache.calcite.test.Matchers.sortsAs;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+/** Tests for {@link org.apache.calcite.rel.metadata.RelMdPredicates} class. */
+public class RelMdPredicatesTest {
+
+ @ParameterizedTest(name = "{0}")
+ @CsvFileSource(resources = "RelMdPredicatesTestPullUpFromJoin.csv", delimiter = ';')
+ void testPullUpPredicatesFromJoin(JoinRelType joinType, String expectedPredicates) {
+ FrameworkConfig config = RelBuilderTest.config().build();
+ RelBuilder b = RelBuilder.create(config);
+ RelNode rel = b
+ .scan("EMP")
+ .filter(b.equals(b.field("ENAME"), b.literal("Victor")))
+ .scan("DEPT")
+ .filter(b.equals(b.field("DNAME"), b.literal("CSD")))
+ .join(
+ joinType, b.equals(
+ b.field(2, 0, "DEPTNO"),
+ b.field(2, 1, "DEPTNO")))
+ .build();
+ RelMetadataQuery mq = rel.getCluster().getMetadataQuery();
+ RelOptPredicateList list = mq.getPulledUpPredicates(rel);
+ assertThat(list.pulledUpPredicates, sortsAs(expectedPredicates));
+ }
+
+ @ParameterizedTest(name = "{0}")
+ @CsvFileSource(resources = "RelMdPredicatesTestLeftInferredFromJoin.csv", delimiter = ';')
+ void testLeftInferredPredicatesFromJoin(JoinRelType joinType, String expectedPredicates) {
+ FrameworkConfig config = RelBuilderTest.config().build();
+ RelBuilder b = RelBuilder.create(config);
+ RelNode rel = b
+ .scan("EMP")
+ .scan("DEPT")
+ .filter(b.greaterThan(b.field("DEPTNO"), b.literal(10)))
+ .join(
+ joinType, b.equals(
+ b.field(2, 0, "DEPTNO"),
+ b.field(2, 1, "DEPTNO")))
+ .build();
+ RelMetadataQuery mq = rel.getCluster().getMetadataQuery();
+ RelOptPredicateList list = mq.getPulledUpPredicates(rel);
+ assertThat(list.leftInferredPredicates, sortsAs(expectedPredicates));
+ }
+
+ @ParameterizedTest(name = "{0}")
+ @CsvFileSource(resources = "RelMdPredicatesTestRightInferredFromJoin.csv", delimiter = ';')
+ void testRightInferredPredicatesFromJoin(JoinRelType joinType, String expectedPredicates) {
+ FrameworkConfig config = RelBuilderTest.config().build();
+ RelBuilder b = RelBuilder.create(config);
+ RelNode rel = b
+ .scan("EMP")
+ .filter(b.greaterThan(b.field("DEPTNO"), b.literal(10)))
+ .scan("DEPT")
+ .join(
+ joinType, b.equals(
+ b.field(2, 0, "DEPTNO"),
+ b.field(2, 1, "DEPTNO")))
+ .build();
+ RelMetadataQuery mq = rel.getCluster().getMetadataQuery();
+ RelOptPredicateList list = mq.getPulledUpPredicates(rel);
+ assertThat(list.rightInferredPredicates, sortsAs(expectedPredicates));
+ }
+
+}
diff --git a/core/src/test/resources/org/apache/calcite/test/RelMdPredicatesTestLeftInferredFromJoin.csv b/core/src/test/resources/org/apache/calcite/test/RelMdPredicatesTestLeftInferredFromJoin.csv
new file mode 100644
index 0000000000..b74cd9ee87
--- /dev/null
+++ b/core/src/test/resources/org/apache/calcite/test/RelMdPredicatesTestLeftInferredFromJoin.csv
@@ -0,0 +1,6 @@
+INNER;[>($7, 10)]
+LEFT;[]
+RIGHT;[>($7, 10)]
+FULL;[]
+SEMI;[>($7, 10)]
+ANTI;[]
diff --git a/core/src/test/resources/org/apache/calcite/test/RelMdPredicatesTestPullUpFromJoin.csv b/core/src/test/resources/org/apache/calcite/test/RelMdPredicatesTestPullUpFromJoin.csv
new file mode 100644
index 0000000000..9604d96b2f
--- /dev/null
+++ b/core/src/test/resources/org/apache/calcite/test/RelMdPredicatesTestPullUpFromJoin.csv
@@ -0,0 +1,6 @@
+INNER;[=($1, 'Victor'), =($7, $8), =($9, 'CSD')]
+LEFT;[=($1, 'Victor')]
+RIGHT;[=($9, 'CSD')]
+FULL;[]
+SEMI;[=($1, 'Victor')]
+ANTI;[=($1, 'Victor')]
diff --git a/core/src/test/resources/org/apache/calcite/test/RelMdPredicatesTestRightInferredFromJoin.csv b/core/src/test/resources/org/apache/calcite/test/RelMdPredicatesTestRightInferredFromJoin.csv
new file mode 100644
index 0000000000..258c5fd0ca
--- /dev/null
+++ b/core/src/test/resources/org/apache/calcite/test/RelMdPredicatesTestRightInferredFromJoin.csv
@@ -0,0 +1,6 @@
+INNER;[>($0, 10)]
+LEFT;[>($0, 10)]
+RIGHT;[]
+FULL;[]
+SEMI;[>($0, 10)]
+ANTI;[>($0, 10)]