[core] Support partition predicate pushdown for PartitionsTable #7628
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -36,27 +36,36 @@ | |
|
|
||
| /** | ||
| * Helper for applying partition predicate pushdown in system tables (BucketsTable, FilesTable, | ||
| * FileKeyRangesTable, PartitionsTable). | ||
| */ | ||
| public class PartitionPredicateHelper { | ||
|
|
||
| /** | ||
| * Build a partition-typed predicate from a string-based leaf predicate on the "partition" | ||
| * column. | ||
| * | ||
| * @return the predicate on partition fields, or {@code null} if the partition spec is invalid | ||
| * (indicating no results should be returned) | ||
| */ | ||
| @Nullable | ||
| public static Predicate buildPartitionPredicate( | ||
| LeafPredicate partitionPredicate, List<String> partitionKeys, RowType partitionType) { | ||
| if (partitionPredicate.function() instanceof Equal) { | ||
| LinkedHashMap<String, String> partSpec = | ||
| parsePartitionSpec( | ||
| partitionPredicate.literals().get(0).toString(), partitionKeys); | ||
| if (partSpec == null) { | ||
| return null; | ||
| } | ||
| PredicateBuilder partBuilder = new PredicateBuilder(partitionType); | ||
| List<Predicate> predicates = new ArrayList<>(); | ||
| for (int i = 0; i < partitionKeys.size(); i++) { | ||
| Object value = | ||
| TypeUtils.castFromString( | ||
| partSpec.get(partitionKeys.get(i)), partitionType.getTypeAt(i)); | ||
| predicates.add(partBuilder.equal(i, value)); | ||
| } | ||
| return PredicateBuilder.and(predicates); | ||
| } else if (partitionPredicate.function() instanceof In) { | ||
| List<Predicate> orPredicates = new ArrayList<>(); | ||
| PredicateBuilder partBuilder = new PredicateBuilder(partitionType); | ||
|
|
@@ -75,51 +84,88 @@ public static boolean applyPartitionFilter( | |
| } | ||
| orPredicates.add(PredicateBuilder.and(andPredicates)); | ||
| } | ||
| return orPredicates.isEmpty() ? null : PredicateBuilder.or(orPredicates); | ||
| } else if (partitionPredicate.function() instanceof LeafBinaryFunction) { | ||
| LinkedHashMap<String, String> partSpec = | ||
| parsePartitionSpec( | ||
| partitionPredicate.literals().get(0).toString(), partitionKeys); | ||
| if (partSpec == null) { | ||
| return null; | ||
| } | ||
| PredicateBuilder partBuilder = new PredicateBuilder(partitionType); | ||
| List<Predicate> predicates = new ArrayList<>(); | ||
| for (int i = 0; i < partitionKeys.size(); i++) { | ||
| Object value = | ||
| TypeUtils.castFromString( | ||
| partSpec.get(partitionKeys.get(i)), partitionType.getTypeAt(i)); | ||
| predicates.add( | ||
| new LeafPredicate( | ||
| partitionPredicate.function(), | ||
| partitionType.getTypeAt(i), | ||
| i, | ||
| partitionKeys.get(i), | ||
| Collections.singletonList(value))); | ||
| } | ||
| return PredicateBuilder.and(predicates); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public static boolean applyPartitionFilter( | ||
| SnapshotReader snapshotReader, | ||
| @Nullable LeafPredicate partitionPredicate, | ||
| List<String> partitionKeys, | ||
| RowType partitionType) { | ||
| if (partitionPredicate == null) { | ||
| return true; | ||
| } | ||
|
|
||
| Predicate predicate = | ||
| buildPartitionPredicate(partitionPredicate, partitionKeys, partitionType); | ||
| if (predicate == null) { | ||
| return false; | ||
|
Contributor
There was a problem hiding this comment. false? No record will be returned? {@code null} if the predicate cannot be pushed down (unsupported predicate type or invalid partition spec.
Member
Author
There was a problem hiding this comment. Good catch. The issue is that
Simply changing Fixed by using Added |
||
| } | ||
| snapshotReader.withPartitionFilter(predicate); | ||
| return true; | ||
| } | ||
|
|
||
| @Nullable | ||
| public static LinkedHashMap<String, String> parsePartitionSpec( | ||
| String partitionStr, List<String> partitionKeys) { | ||
| // Handle {value1, value2} format (BucketsTable, FilesTable, FileKeyRangesTable) | ||
| if (partitionStr.startsWith("{")) { | ||
| partitionStr = partitionStr.substring(1); | ||
| if (partitionStr.endsWith("}")) { | ||
| partitionStr = partitionStr.substring(0, partitionStr.length() - 1); | ||
| } | ||
| String[] partFields = partitionStr.split(", "); | ||
| if (partitionKeys.size() != partFields.length) { | ||
| return null; | ||
| } | ||
| LinkedHashMap<String, String> partSpec = new LinkedHashMap<>(); | ||
| for (int i = 0; i < partitionKeys.size(); i++) { | ||
| partSpec.put(partitionKeys.get(i), partFields[i]); | ||
| } | ||
| return partSpec; | ||
| } | ||
|
|
||
| // Handle key=value/key=value format (PartitionsTable) | ||
| String[] partFields = partitionStr.split("/"); | ||
| if (partitionKeys.size() != partFields.length) { | ||
| return null; | ||
| } | ||
| LinkedHashMap<String, String> partSpec = new LinkedHashMap<>(); | ||
| for (String field : partFields) { | ||
| int eqIndex = field.indexOf('='); | ||
| if (eqIndex < 0) { | ||
| return null; | ||
| } | ||
| partSpec.put(field.substring(0, eqIndex), field.substring(eqIndex + 1)); | ||
| } | ||
| for (String key : partitionKeys) { | ||
| if (!partSpec.containsKey(key)) { | ||
| return null; | ||
| } | ||
| } | ||
| return partSpec; | ||
| } | ||
|
|
||
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.
We should consider default partitions here. If the value is the default partition name, this should become
isNull(...)rather thanequal(...).