This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git
The following commit(s) were added to refs/heads/master by this push:
new f19a4c9ac [core] Introduce InPredicateVisitor to refactor Predicate
handle (#4486)
f19a4c9ac is described below
commit f19a4c9acce4a320382acb96c947dd5142eb3ec8
Author: xuzifu666 <[email protected]>
AuthorDate: Mon Nov 11 15:17:40 2024 +0800
[core] Introduce InPredicateVisitor to refactor Predicate handle (#4486)
---
.../paimon/predicate/InPredicateVisitor.java | 53 ++++++++++++++++++++++
.../apache/paimon/table/system/SchemasTable.java | 21 ++++-----
.../apache/paimon/table/system/SnapshotsTable.java | 20 ++++----
.../org/apache/paimon/table/system/TagsTable.java | 33 ++++++--------
.../apache/paimon/flink/CatalogTableITCase.java | 4 +-
5 files changed, 86 insertions(+), 45 deletions(-)
diff --git
a/paimon-common/src/main/java/org/apache/paimon/predicate/InPredicateVisitor.java
b/paimon-common/src/main/java/org/apache/paimon/predicate/InPredicateVisitor.java
new file mode 100644
index 000000000..dbd31dd2d
--- /dev/null
+++
b/paimon-common/src/main/java/org/apache/paimon/predicate/InPredicateVisitor.java
@@ -0,0 +1,53 @@
+/*
+ * 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.paimon.predicate;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+/** A utils to handle {@link Predicate}. */
+public class InPredicateVisitor {
+
+ /**
+ * Method for handling with In CompoundPredicate.
+ *
+ * @param predicate CompoundPredicate to traverse handle
+ * @param leafName LeafPredicate name
+ */
+ public static Optional<List<Object>> extractInElements(Predicate
predicate, String leafName) {
+ if (!(predicate instanceof CompoundPredicate)) {
+ return Optional.empty();
+ }
+
+ CompoundPredicate compoundPredicate = (CompoundPredicate) predicate;
+ List<Object> leafValues = new ArrayList<>();
+ List<Predicate> children = compoundPredicate.children();
+ for (Predicate leaf : children) {
+ if (leaf instanceof LeafPredicate
+ && (((LeafPredicate) leaf).function() instanceof Equal)
+ &&
leaf.visit(LeafPredicateExtractor.INSTANCE).get(leafName) != null) {
+ leafValues.add(((LeafPredicate) leaf).literals().get(0));
+ } else {
+ return Optional.empty();
+ }
+ }
+ return Optional.of(leafValues);
+ }
+}
diff --git
a/paimon-core/src/main/java/org/apache/paimon/table/system/SchemasTable.java
b/paimon-core/src/main/java/org/apache/paimon/table/system/SchemasTable.java
index b6150ef75..86e2598c6 100644
--- a/paimon-core/src/main/java/org/apache/paimon/table/system/SchemasTable.java
+++ b/paimon-core/src/main/java/org/apache/paimon/table/system/SchemasTable.java
@@ -31,6 +31,7 @@ import org.apache.paimon.predicate.CompoundPredicate;
import org.apache.paimon.predicate.Equal;
import org.apache.paimon.predicate.GreaterOrEqual;
import org.apache.paimon.predicate.GreaterThan;
+import org.apache.paimon.predicate.InPredicateVisitor;
import org.apache.paimon.predicate.LeafPredicate;
import org.apache.paimon.predicate.LeafPredicateExtractor;
import org.apache.paimon.predicate.LessOrEqual;
@@ -229,18 +230,14 @@ public class SchemasTable implements ReadonlyTable {
// optimize for IN filter
if ((compoundPredicate.function()) instanceof Or) {
- List<Predicate> children = compoundPredicate.children();
- for (Predicate leaf : children) {
- if (leaf instanceof LeafPredicate
- && (((LeafPredicate) leaf).function()
instanceof Equal)
- &&
leaf.visit(LeafPredicateExtractor.INSTANCE).get(leafName)
- != null) {
- schemaIds.add((Long) ((LeafPredicate)
leaf).literals().get(0));
- } else {
- schemaIds.clear();
- break;
- }
- }
+ InPredicateVisitor.extractInElements(predicate, leafName)
+ .ifPresent(
+ leafs ->
+ leafs.forEach(
+ leaf ->
+ schemaIds.add(
+
Long.parseLong(
+
leaf.toString()))));
}
} else {
handleLeafPredicate(predicate, leafName);
diff --git
a/paimon-core/src/main/java/org/apache/paimon/table/system/SnapshotsTable.java
b/paimon-core/src/main/java/org/apache/paimon/table/system/SnapshotsTable.java
index 8bf4766d5..a95843219 100644
---
a/paimon-core/src/main/java/org/apache/paimon/table/system/SnapshotsTable.java
+++
b/paimon-core/src/main/java/org/apache/paimon/table/system/SnapshotsTable.java
@@ -32,6 +32,7 @@ import org.apache.paimon.predicate.CompoundPredicate;
import org.apache.paimon.predicate.Equal;
import org.apache.paimon.predicate.GreaterOrEqual;
import org.apache.paimon.predicate.GreaterThan;
+import org.apache.paimon.predicate.InPredicateVisitor;
import org.apache.paimon.predicate.LeafPredicate;
import org.apache.paimon.predicate.LeafPredicateExtractor;
import org.apache.paimon.predicate.LessOrEqual;
@@ -232,17 +233,14 @@ public class SnapshotsTable implements ReadonlyTable {
// optimize for IN filter
if ((compoundPredicate.function()) instanceof Or) {
- for (Predicate leaf : children) {
- if (leaf instanceof LeafPredicate
- && (((LeafPredicate) leaf).function()
instanceof Equal)
- &&
leaf.visit(LeafPredicateExtractor.INSTANCE).get(leafName)
- != null) {
- snapshotIds.add((Long) ((LeafPredicate)
leaf).literals().get(0));
- } else {
- snapshotIds.clear();
- break;
- }
- }
+ InPredicateVisitor.extractInElements(predicate, leafName)
+ .ifPresent(
+ leafs ->
+ leafs.forEach(
+ leaf ->
+ snapshotIds.add(
+
Long.parseLong(
+
leaf.toString()))));
}
} else {
handleLeafPredicate(predicate, leafName);
diff --git
a/paimon-core/src/main/java/org/apache/paimon/table/system/TagsTable.java
b/paimon-core/src/main/java/org/apache/paimon/table/system/TagsTable.java
index f3342e9f2..4d1b4e22a 100644
--- a/paimon-core/src/main/java/org/apache/paimon/table/system/TagsTable.java
+++ b/paimon-core/src/main/java/org/apache/paimon/table/system/TagsTable.java
@@ -28,6 +28,7 @@ import org.apache.paimon.fs.FileIO;
import org.apache.paimon.fs.Path;
import org.apache.paimon.predicate.CompoundPredicate;
import org.apache.paimon.predicate.Equal;
+import org.apache.paimon.predicate.InPredicateVisitor;
import org.apache.paimon.predicate.LeafPredicate;
import org.apache.paimon.predicate.LeafPredicateExtractor;
import org.apache.paimon.predicate.Or;
@@ -239,26 +240,18 @@ public class TagsTable implements ReadonlyTable {
CompoundPredicate compoundPredicate = (CompoundPredicate)
predicate;
// optimize for IN filter
if ((compoundPredicate.function()) instanceof Or) {
- List<Predicate> children =
compoundPredicate.children();
- for (Predicate leaf : children) {
- if (leaf instanceof LeafPredicate
- && (((LeafPredicate) leaf).function()
instanceof Equal
- && ((LeafPredicate)
leaf).literals().get(0)
- instanceof BinaryString)
- && predicate
-
.visit(LeafPredicateExtractor.INSTANCE)
- .get(TAG_NAME)
- != null) {
- String equalValue =
- ((LeafPredicate)
leaf).literals().get(0).toString();
- if (tagManager.tagExists(equalValue)) {
- predicateMap.put(equalValue,
tagManager.tag(equalValue));
- }
- } else {
- predicateMap.clear();
- break;
- }
- }
+ InPredicateVisitor.extractInElements(predicate,
TAG_NAME)
+ .ifPresent(
+ leafs ->
+ leafs.forEach(
+ leaf -> {
+ String leftName =
leaf.toString();
+ if
(tagManager.tagExists(leftName)) {
+
predicateMap.put(
+
leftName,
+
tagManager.tag(leftName));
+ }
+ }));
}
}
}
diff --git
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogTableITCase.java
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogTableITCase.java
index 439cdf958..ba063248e 100644
---
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogTableITCase.java
+++
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogTableITCase.java
@@ -299,7 +299,7 @@ public class CatalogTableITCase extends CatalogITCaseBase {
result =
sql(
"SELECT schema_id, fields, partition_keys, "
- + "primary_keys, options, `comment` FROM
T$schemas where schema_id>0 and schema_id<3");
+ + "primary_keys, options, `comment` FROM
T$schemas where schema_id>0 and schema_id<3 order by schema_id");
assertThat(result.toString())
.isEqualTo(
"[+I[1, [{\"id\":0,\"name\":\"a\",\"type\":\"INT NOT
NULL\"},"
@@ -313,7 +313,7 @@ public class CatalogTableITCase extends CatalogITCaseBase {
result =
sql(
"SELECT schema_id, fields, partition_keys, "
- + "primary_keys, options, `comment` FROM
T$schemas where schema_id in (1, 3)");
+ + "primary_keys, options, `comment` FROM
T$schemas where schema_id in (1, 3) order by schema_id");
assertThat(result.toString())
.isEqualTo(
"[+I[1, [{\"id\":0,\"name\":\"a\",\"type\":\"INT NOT
NULL\"},"
