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

Improve Iceberg table properties building #25183

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+57 −25
Open

Improve Iceberg table properties building #25183

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
51 changes: 28 additions & 23 deletions plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@
import static java.util.Objects.requireNonNull;
import static java.util.function.Function.identity;
import static java.util.stream.Collectors.joining;
import static java.util.stream.Collectors.toMap;
import static org.apache.iceberg.MetadataTableType.ALL_ENTRIES;
import static org.apache.iceberg.MetadataTableType.ENTRIES;
import static org.apache.iceberg.ReachableFileUtil.metadataFileLocations;
Expand Down Expand Up @@ -800,40 +801,44 @@ public ConnectorTableProperties getTableProperties(ConnectorSession session, Con
Map<Integer, IcebergColumnHandle> columns = getProjectedColumns(icebergTable.schema(), typeManager, partitionSourceIds).stream()
.collect(toImmutableMap(IcebergColumnHandle::getId, identity()));

Supplier<List<FileScanTask>> lazyFiles = Suppliers.memoize(() -> {
Supplier<Map<StructLikeWrapperWithFieldIdToIndex, PartitionSpec>> uniquePartitions = Suppliers.memoize(() -> {
TableScan tableScan = icebergTable.newScan()
.useSnapshot(table.getSnapshotId().get())
.filter(toIcebergExpression(enforcedPredicate));

try (CloseableIterable<FileScanTask> iterator = tableScan.planFiles()) {
return ImmutableList.copyOf(iterator);
return Streams.stream(iterator)
.collect(toMap(
StructLikeWrapperWithFieldIdToIndex::createStructLikeWrapper,
FileScanTask::spec,
(p, _) -> p));
}
catch (IOException e) {
throw new UncheckedIOException(e);
}
});

Iterable<FileScanTask> files = () -> lazyFiles.get().iterator();

Iterable<TupleDomain<ColumnHandle>> discreteTupleDomain = Iterables.transform(files, fileScan -> {
// Extract partition values in the data file
Map<Integer, Optional<String>> partitionColumnValueStrings = getPartitionKeys(fileScan);
Map<ColumnHandle, NullableValue> partitionValues = partitionSourceIds.stream()
.filter(partitionColumnValueStrings::containsKey)
.collect(toImmutableMap(
columns::get,
columnId -> {
IcebergColumnHandle column = columns.get(columnId);
Object prestoValue = deserializePartitionValue(
column.getType(),
partitionColumnValueStrings.get(columnId).orElse(null),
column.getName());

return new NullableValue(column.getType(), prestoValue);
}));

return TupleDomain.fromFixedValues(partitionValues);
});
Iterable<TupleDomain<ColumnHandle>> discreteTupleDomain = Iterables.transform(
() -> uniquePartitions.get().entrySet().iterator(),
entry -> {
// Extract partition values in the data file
Map<Integer, Optional<String>> partitionColumnValueStrings = getPartitionKeys(entry.getKey().getStructLikeWrapper().get(), entry.getValue());
Map<ColumnHandle, NullableValue> partitionValues = partitionSourceIds.stream()
.filter(partitionColumnValueStrings::containsKey)
.collect(toImmutableMap(
columns::get,
columnId -> {
IcebergColumnHandle column = columns.get(columnId);
Object prestoValue = deserializePartitionValue(
column.getType(),
partitionColumnValueStrings.get(columnId).orElse(null),
column.getName());

return new NullableValue(column.getType(), prestoValue);
}));

return TupleDomain.fromFixedValues(partitionValues);
});

discretePredicates = new DiscretePredicates(
columns.values().stream()
Expand Down
31 changes: 29 additions & 2 deletions ...in/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestMetadataQueryOptimization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ public void testOptimization()
anyTree(values(
ImmutableList.of("b", "c"),
ImmutableList.of(
ImmutableList.of(new Constant(INTEGER, 6L), new Constant(INTEGER, 7L)),
ImmutableList.of(new Constant(INTEGER, 9L), new Constant(INTEGER, 10L))))));
ImmutableList.of(new Constant(INTEGER, 9L), new Constant(INTEGER, 10L)),
ImmutableList.of(new Constant(INTEGER, 6L), new Constant(INTEGER, 7L))))));

assertPlan(
format("SELECT DISTINCT b, c FROM %s WHERE b > 7", testTable),
Expand All @@ -118,6 +118,33 @@ public void testOptimization()
values(ImmutableList.of("b", "c"), ImmutableList.of())));
}

@Test
public void testOptimizationOnPartitionWithMultipleFiles()
{
String testTable = "test_metadata_optimization_on_partition_with_multiple_files";

getPlanTester().executeStatement(format(
"CREATE TABLE %s (a, b, c) WITH (PARTITIONING = ARRAY['b', 'c']) AS VALUES (1, 8, 9), (2, 8, 9)",
testTable));

Session session = Session.builder(getPlanTester().getDefaultSession())
.setSystemProperty("optimize_metadata_queries", "true")
.build();

// Insert again to generate another file in same partition
getPlanTester().executeStatement(format(
"INSERT INTO %s VALUES (3, 8, 9)",
testTable));

assertPlan(
format("SELECT DISTINCT b, c FROM %s ORDER BY b", testTable),
session,
anyTree(values(
ImmutableList.of("b", "c"),
ImmutableList.of(
ImmutableList.of(new Constant(INTEGER, 8L), new Constant(INTEGER, 9L))))));
}

@Test
public void testOptimizationWithNullPartitions()
{
Expand Down