Skip to content
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

Jump to bottom

[core] System files table distributed execute remold #4204

Merged
merged 8 commits into from
Sep 23, 2024
Merged

[core] System files table distributed execute remold #4204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e0c8299
[core] System files table distributed execute remould
Sep 18, 2024
aae1b66
fix comment
Sep 19, 2024
c8358d0
fix comment
Sep 19, 2024
c860495
fix comment
Sep 19, 2024
8b3ebcf
fix comment
Sep 23, 2024
0d38c1e
fix comment
Sep 23, 2024
ce0aba1
fix comment
Sep 23, 2024
17b993e
fix comment
Sep 23, 2024
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
71 changes: 42 additions & 29 deletions paimon-core/src/main/java/org/apache/paimon/table/system/FilesTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.apache.paimon.table.system;

import org.apache.paimon.data.BinaryRow;
import org.apache.paimon.data.BinaryString;
import org.apache.paimon.data.GenericRow;
import org.apache.paimon.data.InternalArray;
Expand Down Expand Up @@ -47,6 +48,7 @@
import org.apache.paimon.table.source.Split;
import org.apache.paimon.table.source.TableRead;
import org.apache.paimon.table.source.TableScan;
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.DataType;
Expand Down Expand Up @@ -75,6 +77,7 @@
import java.util.TreeMap;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;

import static org.apache.paimon.catalog.Catalog.SYSTEM_TABLE_SPLITTER;

Expand Down Expand Up @@ -134,7 +137,7 @@ public List<String> primaryKeys() {

@Override
public InnerTableScan newScan() {
return new FilesScan();
return new FilesScan(storeTable);
}

@Override
Expand All @@ -154,6 +157,12 @@ private static class FilesScan extends ReadOnceTableScan {
@Nullable private LeafPredicate bucketPredicate;
@Nullable private LeafPredicate levelPredicate;

private final FileStoreTable fileStoreTable;

public FilesScan(FileStoreTable fileStoreTable) {
this.fileStoreTable = fileStoreTable;
}

@Override
public InnerTableScan withFilter(Predicate pushdown) {
if (pushdown == null) {
Expand All @@ -170,23 +179,46 @@ public InnerTableScan withFilter(Predicate pushdown) {

@Override
public Plan innerPlan() {
SnapshotReader snapshotReader = fileStoreTable.newSnapshotReader();
if (partitionPredicate != null && partitionPredicate.function() instanceof Equal) {
String partitionStr = partitionPredicate.literals().get(0).toString();
if (partitionStr.startsWith("[")) {
partitionStr = partitionStr.substring(1);
}
if (partitionStr.endsWith("]")) {
partitionStr = partitionStr.substring(0, partitionStr.length() - 1);
}
String[] partFields = partitionStr.split(", ");
LinkedHashMap<String, String> partSpec = new LinkedHashMap<>();
List<String> partitionKeys = fileStoreTable.partitionKeys();
if (partitionKeys.size() != partFields.length) {
return Collections::emptyList;
}
for (int i = 0; i < partitionKeys.size(); i++) {
partSpec.put(partitionKeys.get(i), partFields[i]);
}
snapshotReader.withPartitionFilter(partSpec);
// TODO support range?
}

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

private static class FilesSplit extends SingletonSplit {

@Nullable private final LeafPredicate partitionPredicate;
@Nullable private final BinaryRow partition;
@Nullable private final LeafPredicate bucketPredicate;
@Nullable private final LeafPredicate levelPredicate;

private FilesSplit(
@Nullable LeafPredicate partitionPredicate,
@Nullable BinaryRow partition,
leaves12138 marked this conversation as resolved.
Show resolved Hide resolved
@Nullable LeafPredicate bucketPredicate,
@Nullable LeafPredicate levelPredicate) {
this.partitionPredicate = partitionPredicate;
this.partition = partition;
this.bucketPredicate = bucketPredicate;
this.levelPredicate = levelPredicate;
}
Expand All @@ -200,14 +232,14 @@ public boolean equals(Object o) {
return false;
}
FilesSplit that = (FilesSplit) o;
return Objects.equals(partitionPredicate, that.partitionPredicate)
return Objects.equals(partition, that.partition)
&& Objects.equals(bucketPredicate, that.bucketPredicate)
&& Objects.equals(this.levelPredicate, that.levelPredicate);
}

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

public List<Split> splits(FileStoreTable storeTable) {
Expand All @@ -216,27 +248,8 @@ public List<Split> splits(FileStoreTable storeTable) {

private TableScan.Plan tablePlan(FileStoreTable storeTable) {
InnerTableScan scan = storeTable.newScan();
if (partitionPredicate != null) {
if (partitionPredicate.function() instanceof Equal) {
String partitionStr = partitionPredicate.literals().get(0).toString();
if (partitionStr.startsWith("[")) {
partitionStr = partitionStr.substring(1);
}
if (partitionStr.endsWith("]")) {
partitionStr = partitionStr.substring(0, partitionStr.length() - 1);
}
String[] partFields = partitionStr.split(", ");
LinkedHashMap<String, String> partSpec = new LinkedHashMap<>();
List<String> partitionKeys = storeTable.partitionKeys();
if (partitionKeys.size() != partFields.length) {
return Collections::emptyList;
}
for (int i = 0; i < partitionKeys.size(); i++) {
partSpec.put(partitionKeys.get(i), partFields[i]);
}
scan.withPartitionFilter(partSpec);
}
// TODO support range?
if (partition != null) {
scan.withPartitionFilter(Collections.singletonList(partition));
}
if (bucketPredicate != null) {
scan.withBucketFilter(
Expand Down
3 changes: 1 addition & 2 deletions paimon-core/src/test/java/org/apache/paimon/table/system/FilesTableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@ public void testReadFilesFromSpecifiedSnapshot() throws Exception {
}

@Test
public void testReadFilesFromNotExistSnapshot() throws Exception {

public void testReadFilesFromNotExistSnapshot() {
filesTable =
(FilesTable)
filesTable.copy(
Expand Down
Loading