[core] Introduce PredicateUtils to refactor Predicate handle #4469
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * 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 org.apache.paimon.utils.Preconditions; | ||
|
|
||
| import java.util.List; | ||
| import java.util.function.Consumer; | ||
|
|
||
| /** A utils to handle {@link Predicate}. */ | ||
| public class PredicateUtils { | ||
|
|
||
| /** | ||
| * Method for handling with CompoundPredicate. | ||
| * | ||
| * @param predicate CompoundPredicate to traverse handle | ||
| * @param leafName LeafPredicate name | ||
| * @param matchConsumer leafName matched handle | ||
| * @param unMatchConsumer leafName unmatched handle | ||
| */ | ||
| public static void traverseCompoundPredicate( | ||
|
There was a problem hiding this comment. Just return There was a problem hiding this comment. Get it, would modify as suggestion，Thanks @JingsongLi There was a problem hiding this comment. I'm traveling outside, would modify it in these two days. There was a problem hiding this comment. move the pr to a new pr #4486 close it first. |
||
| Predicate predicate, | ||
| String leafName, | ||
| Consumer<Predicate> matchConsumer, | ||
| Consumer<Predicate> unMatchConsumer) { | ||
| Preconditions.checkState( | ||
|
There was a problem hiding this comment. May be use Preconditions.checkArgument instead better? |
||
| predicate instanceof CompoundPredicate, | ||
| "PredicateUtils##handleCompoundPredicate should handle with a CompoundPredicate."); | ||
|
|
||
|
There was a problem hiding this comment. PredicateUtils.traverseCompoundPredicate only supports processing Predicates of CompoundPredicate type |
||
| CompoundPredicate compoundPredicate = (CompoundPredicate) predicate; | ||
| 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 | ||
| && matchConsumer != null) { | ||
| matchConsumer.accept(leaf); | ||
| } else { | ||
| if (unMatchConsumer != null) { | ||
| unMatchConsumer.accept(leaf); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,6 +37,7 @@ | |
| import org.apache.paimon.predicate.LessThan; | ||
| import org.apache.paimon.predicate.Or; | ||
| import org.apache.paimon.predicate.Predicate; | ||
| import org.apache.paimon.predicate.PredicateUtils; | ||
| import org.apache.paimon.reader.RecordReader; | ||
| import org.apache.paimon.schema.SchemaManager; | ||
| import org.apache.paimon.schema.TableSchema; | ||
|
|
@@ -205,7 +206,7 @@ private class SchemasRead implements InnerTableRead { | |
|
|
||
| private Optional<Long> optionalFilterSchemaIdMax = Optional.empty(); | ||
| private Optional<Long> optionalFilterSchemaIdMin = Optional.empty(); | ||
| private List<Long> schemaIds = new ArrayList<>(); | ||
|
|
||
| public SchemasRead(FileIO fileIO) { | ||
| this.fileIO = fileIO; | ||
|
|
@@ -221,26 +222,28 @@ public InnerTableRead withFilter(Predicate predicate) { | |
| if (predicate instanceof CompoundPredicate) { | ||
| CompoundPredicate compoundPredicate = (CompoundPredicate) predicate; | ||
| if ((compoundPredicate.function()) instanceof And) { | ||
| PredicateUtils.traverseCompoundPredicate( | ||
| predicate, | ||
| leafName, | ||
| (Predicate p) -> { | ||
|
There was a problem hiding this comment. May replaced with expression lambda better? (Predicate p) -> handleLeafPredicate(p, leafName) |
||
| handleLeafPredicate(p, leafName); | ||
| }, | ||
|
There was a problem hiding this comment. Can There was a problem hiding this comment. I had considered about it，this method common logic is less，extract may cost more codes，so keep as current maybe better. Thanks~ @LinMingQiang |
||
| null); | ||
| } | ||
|
|
||
| // optimize for IN filter | ||
| if ((compoundPredicate.function()) instanceof Or) { | ||
| PredicateUtils.traverseCompoundPredicate( | ||
| predicate, | ||
| leafName, | ||
| (Predicate p) -> { | ||
| if (schemaIds != null) { | ||
| schemaIds.add((Long) ((LeafPredicate) p).literals().get(0)); | ||
| } | ||
| }, | ||
| (Predicate p) -> { | ||
|
There was a problem hiding this comment. (Predicate p) -> schemaIds = null |
||
| schemaIds = null; | ||
|
There was a problem hiding this comment. Why not schemaIds.clear()? |
||
| }); | ||
| } | ||
| } else { | ||
| handleLeafPredicate(predicate, leafName); | ||
|
|
@@ -299,7 +302,7 @@ public RecordReader<InternalRow> createReader(Split split) { | |
| SchemaManager manager = new SchemaManager(fileIO, location, branch); | ||
|
|
||
| Collection<TableSchema> tableSchemas; | ||
| if (schemaIds != null && !schemaIds.isEmpty()) { | ||
| tableSchemas = manager.schemasWithId(schemaIds); | ||
| } else { | ||
| tableSchemas = | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
InPredicateVisitor?