Skip to content

[core] Support partition and bucket predicate pushdown for BucketsTable #7592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JingsongLi merged 1 commit into from
Apr 3, 2026
Merged

[core] Support partition and bucket predicate pushdown for BucketsTable #7592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 62 additions & 5 deletions paimon-core/src/main/java/org/apache/paimon/table/system/BucketsTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
import org.apache.paimon.disk.IOManager;
import org.apache.paimon.fs.FileIO;
import org.apache.paimon.manifest.BucketEntry;
import org.apache.paimon.predicate.LeafPredicate;
import org.apache.paimon.predicate.LeafPredicateExtractor;
import org.apache.paimon.predicate.Predicate;
import org.apache.paimon.reader.RecordReader;
import org.apache.paimon.table.FileStoreTable;
Expand All @@ -38,6 +40,7 @@
import org.apache.paimon.table.source.SingletonSplit;
import org.apache.paimon.table.source.Split;
import org.apache.paimon.table.source.TableRead;
import org.apache.paimon.table.source.snapshot.SnapshotReader;
import org.apache.paimon.types.BigIntType;
import org.apache.paimon.types.DataField;
import org.apache.paimon.types.DataTypes;
Expand All @@ -48,6 +51,8 @@

import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;

import javax.annotation.Nullable;

import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
Expand All @@ -57,9 +62,11 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.OptionalLong;

import static org.apache.paimon.catalog.Identifier.SYSTEM_TABLE_SPLITTER;
import static org.apache.paimon.utils.PartitionPredicateHelper.applyPartitionFilter;

/** A {@link Table} for showing buckets info. */
public class BucketsTable implements ReadonlyTable {
Expand Down Expand Up @@ -121,32 +128,60 @@ public Table copy(Map<String, String> dynamicOptions) {

private static class BucketsScan extends ReadOnceTableScan {

@Nullable private LeafPredicate partitionPredicate;
@Nullable private LeafPredicate bucketPredicate;

@Override
public InnerTableScan withFilter(Predicate predicate) {
if (predicate == null) {
return this;
}

Map<String, LeafPredicate> leafPredicates =
predicate.visit(LeafPredicateExtractor.INSTANCE);
this.partitionPredicate = leafPredicates.get("partition");
this.bucketPredicate = leafPredicates.get("bucket");
return this;
}

@Override
public Plan innerPlan() {
return () -> Collections.singletonList(new BucketsSplit());
return () ->
Collections.singletonList(
new BucketsSplit(partitionPredicate, bucketPredicate));
}
}

private static class BucketsSplit extends SingletonSplit {

private static final long serialVersionUID = 1L;

@Nullable private final LeafPredicate partitionPredicate;
@Nullable private final LeafPredicate bucketPredicate;

private BucketsSplit(
@Nullable LeafPredicate partitionPredicate,
@Nullable LeafPredicate bucketPredicate) {
this.partitionPredicate = partitionPredicate;
this.bucketPredicate = bucketPredicate;
}

@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
return o != null && getClass() == o.getClass();
if (o == null || getClass() != o.getClass()) {
return false;
}
BucketsSplit that = (BucketsSplit) o;
return Objects.equals(partitionPredicate, that.partitionPredicate)
&& Objects.equals(bucketPredicate, that.bucketPredicate);
}

@Override
public int hashCode() {
return 1;
return Objects.hash(partitionPredicate, bucketPredicate);
}

@Override
Expand All @@ -167,7 +202,7 @@ public BucketsRead(FileStoreTable table) {

@Override
public InnerTableRead withFilter(Predicate predicate) {
// TODO
// filter pushdown is handled at the Scan layer through BucketsSplit
return this;
}

Expand All @@ -188,7 +223,29 @@ public RecordReader<InternalRow> createReader(Split split) {
throw new IllegalArgumentException("Unsupported split: " + split.getClass());
}

List<BucketEntry> buckets = fileStoreTable.newSnapshotReader().bucketEntries();
BucketsSplit bucketsSplit = (BucketsSplit) split;
SnapshotReader snapshotReader = fileStoreTable.newSnapshotReader();

// Apply partition filter to SnapshotReader
List<String> partitionKeys = fileStoreTable.partitionKeys();
RowType partitionType = fileStoreTable.schema().logicalPartitionType();
boolean hasResults =
applyPartitionFilter(
snapshotReader,
bucketsSplit.partitionPredicate,
partitionKeys,
partitionType);
if (!hasResults) {
return new IteratorRecordReader<>(Collections.emptyIterator());
}

// Apply bucket filter to SnapshotReader
if (bucketsSplit.bucketPredicate != null) {
LeafPredicate bp = bucketsSplit.bucketPredicate;
snapshotReader.withBucketFilter(bucket -> bp.test(GenericRow.of(null, bucket)));
}

List<BucketEntry> buckets = snapshotReader.bucketEntries();

@SuppressWarnings("unchecked")
CastExecutor<InternalRow, BinaryString> partitionCastExecutor =
Expand Down
90 changes: 8 additions & 82 deletions paimon-core/src/main/java/org/apache/paimon/table/system/FileKeyRangesTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,9 @@
import org.apache.paimon.fs.FileIO;
import org.apache.paimon.io.DataFileMeta;
import org.apache.paimon.io.DataFilePathFactory;
import org.apache.paimon.predicate.Equal;
import org.apache.paimon.predicate.In;
import org.apache.paimon.predicate.LeafBinaryFunction;
import org.apache.paimon.predicate.LeafPredicate;
import org.apache.paimon.predicate.LeafPredicateExtractor;
import org.apache.paimon.predicate.Predicate;
import org.apache.paimon.predicate.PredicateBuilder;
import org.apache.paimon.reader.RecordReader;
import org.apache.paimon.schema.SchemaManager;
import org.apache.paimon.schema.TableSchema;
Expand All @@ -52,10 +48,10 @@
import org.apache.paimon.types.IntType;
import org.apache.paimon.types.RowType;
import org.apache.paimon.utils.IteratorRecordReader;
import org.apache.paimon.utils.PartitionPredicateHelper;
import org.apache.paimon.utils.ProjectedRow;
import org.apache.paimon.utils.RowDataToObjectArrayConverter;
import org.apache.paimon.utils.SerializationUtils;
import org.apache.paimon.utils.TypeUtils;

import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;

Expand All @@ -66,7 +62,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
Expand Down Expand Up @@ -171,89 +166,20 @@ public InnerTableScan withFilter(Predicate pushdown) {
@Override
public Plan innerPlan() {
SnapshotReader snapshotReader = fileStoreTable.newSnapshotReader();
if (partitionPredicate != null) {
List<String> partitionKeys = fileStoreTable.partitionKeys();
RowType partitionType = fileStoreTable.schema().logicalPartitionType();
if (partitionPredicate.function() instanceof Equal) {
LinkedHashMap<String, String> partSpec =
parsePartitionSpec(
partitionPredicate.literals().get(0).toString(), partitionKeys);
if (partSpec == null) {
return Collections::emptyList;
}
snapshotReader.withPartitionFilter(partSpec);
} else if (partitionPredicate.function() instanceof In) {
List<Predicate> orPredicates = new ArrayList<>();
PredicateBuilder partBuilder = new PredicateBuilder(partitionType);
for (Object literal : partitionPredicate.literals()) {
LinkedHashMap<String, String> partSpec =
parsePartitionSpec(literal.toString(), partitionKeys);
if (partSpec == null) {
continue;
}
List<Predicate> andPredicates = new ArrayList<>();
for (int i = 0; i < partitionKeys.size(); i++) {
Object value =
TypeUtils.castFromString(
partSpec.get(partitionKeys.get(i)),
partitionType.getTypeAt(i));
andPredicates.add(partBuilder.equal(i, value));
}
orPredicates.add(PredicateBuilder.and(andPredicates));
}
if (!orPredicates.isEmpty()) {
snapshotReader.withPartitionFilter(PredicateBuilder.or(orPredicates));
}
} else if (partitionPredicate.function() instanceof LeafBinaryFunction) {
LinkedHashMap<String, String> partSpec =
parsePartitionSpec(
partitionPredicate.literals().get(0).toString(), partitionKeys);
if (partSpec != 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)));
}
snapshotReader.withPartitionFilter(PredicateBuilder.and(predicates));
}
}
List<String> partitionKeys = fileStoreTable.partitionKeys();
RowType partitionType = fileStoreTable.schema().logicalPartitionType();
boolean hasResults =
PartitionPredicateHelper.applyPartitionFilter(
snapshotReader, partitionPredicate, partitionKeys, partitionType);
if (!hasResults) {
return Collections::emptyList;
}

return () ->
snapshotReader.partitions().stream()
.map(p -> new FilesTable.FilesSplit(p, bucketPredicate, levelPredicate))
.collect(Collectors.toList());
}

@Nullable
private LinkedHashMap<String, String> parsePartitionSpec(
String partitionStr, List<String> partitionKeys) {
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;
}
}

private static class FileKeyRangesRead implements InnerTableRead {
Expand Down
Loading