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.

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

[ARORO-3289] Avoid calling getMixedTablePartitionSpecById in the scan loop #3290

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import org.apache.amoro.shade.guava32.com.google.common.collect.Sets;
import org.apache.amoro.shade.jackson2.com.fasterxml.jackson.annotation.JsonIgnore;
import org.apache.amoro.table.MixedTable;
import org.apache.amoro.utils.MixedTableUtil;
import org.apache.amoro.utils.TablePropertyUtil;
import org.apache.iceberg.PartitionSpec;
import org.apache.iceberg.Snapshot;
Expand Down Expand Up @@ -138,9 +137,7 @@ private void initPartitionPlans(TableFileScanHelper tableFileScanHelper) {
try (CloseableIterable<TableFileScanHelper.FileScanResult> results =
tableFileScanHelper.scan()) {
for (TableFileScanHelper.FileScanResult fileScanResult : results) {
PartitionSpec partitionSpec =
MixedTableUtil.getMixedTablePartitionSpecById(
mixedTable, fileScanResult.file().specId());
PartitionSpec partitionSpec = tableFileScanHelper.getSpec(fileScanResult.file().specId());
StructLike partition = fileScanResult.file().partition();
String partitionPath = partitionSpec.partitionToPath(partition);
PartitionEvaluator evaluator =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,24 @@
import org.apache.amoro.server.AmoroServiceConstants;
import org.apache.amoro.shade.guava32.com.google.common.collect.Lists;
import org.apache.iceberg.FileScanTask;
import org.apache.iceberg.PartitionSpec;
import org.apache.iceberg.Table;
import org.apache.iceberg.expressions.Expression;
import org.apache.iceberg.expressions.Expressions;
import org.apache.iceberg.io.CloseableIterable;

import java.util.Map;

public class IcebergTableFileScanHelper implements TableFileScanHelper {
private final Table table;
private Expression partitionFilter = Expressions.alwaysTrue();
private final long snapshotId;
private final Map<Integer, PartitionSpec> specs;

public IcebergTableFileScanHelper(Table table, long snapshotId) {
this.table = table;
this.snapshotId = snapshotId;
this.specs = table.specs();
}

@Override
Expand All @@ -55,4 +60,9 @@ public TableFileScanHelper withPartitionFilter(Expression partitionFilter) {
this.partitionFilter = partitionFilter;
return this;
}

@Override
public PartitionSpec getSpec(int specId) {
return specs.get(specId);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,13 @@ public class KeyedTableFileScanHelper implements TableFileScanHelper {
private final long changeSnapshotId;
private final long baseSnapshotId;
private Expression partitionFilter = Expressions.alwaysTrue();
private final PartitionSpec spec;

public KeyedTableFileScanHelper(KeyedTable keyedTable, KeyedTableSnapshot snapshot) {
this.keyedTable = keyedTable;
this.baseSnapshotId = snapshot.baseSnapshotId();
this.changeSnapshotId = snapshot.changeSnapshotId();
this.spec = keyedTable.spec();
}

/**
Expand Down Expand Up @@ -439,4 +441,13 @@ public void setMinTransactionIdAfter(long minTransactionIdAfter) {
this.minTransactionIdAfter = minTransactionIdAfter;
}
}

@Override
public PartitionSpec getSpec(int specId) {
if (specId != spec.specId()) {
throw new IllegalArgumentException(
"Partition spec id " + specId + " not found in table " + keyedTable.name());
}
return spec;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import org.apache.iceberg.ContentFile;
import org.apache.iceberg.DataFile;
import org.apache.iceberg.PartitionSpec;
import org.apache.iceberg.expressions.Expression;
import org.apache.iceberg.io.CloseableIterable;

Expand Down Expand Up @@ -47,4 +48,6 @@ public List<ContentFile<?>> deleteFiles() {
CloseableIterable<FileScanResult> scan();

TableFileScanHelper withPartitionFilter(Expression partitionFilter);

PartitionSpec getSpec(int specId);
}
Loading