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

Add support iceberg parquet predicate pushdown with iceberg column id #19066

Merged
merged 1 commit into from
Jan 11, 2024
Merged

Add support iceberg parquet predicate pushdown with iceberg column id #19066

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
5 changes: 4 additions & 1 deletion plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@
import static java.lang.String.format;
import static java.util.Locale.ENGLISH;
import static java.util.Objects.requireNonNull;
import static java.util.function.Function.identity;
import static java.util.function.Predicate.not;
import static java.util.stream.Collectors.groupingBy;
import static java.util.stream.Collectors.mapping;
Expand Down Expand Up @@ -1471,12 +1472,14 @@ private static TupleDomain<ColumnDescriptor> getParquetTupleDomain(Map<List<Stri
return TupleDomain.none();
}

Map<Integer, ColumnDescriptor> descriptorsById = descriptorsByPath.values().stream()
.collect(toImmutableMap(descriptor -> descriptor.getPrimitiveType().getId().intValue(), identity()));
ImmutableMap.Builder<ColumnDescriptor, Domain> predicate = ImmutableMap.builder();
effectivePredicate.getDomains().orElseThrow().forEach((columnHandle, domain) -> {
String baseType = columnHandle.getType().getTypeSignature().getBase();
// skip looking up predicates for complex types as Parquet only stores stats for primitives
if (columnHandle.isBaseColumn() && (!baseType.equals(StandardTypes.MAP) && !baseType.equals(StandardTypes.ARRAY) && !baseType.equals(StandardTypes.ROW))) {
ColumnDescriptor descriptor = descriptorsByPath.get(ImmutableList.of(columnHandle.getName()));
ColumnDescriptor descriptor = descriptorsById.get(columnHandle.getId());
raunaqmorarka marked this conversation as resolved.
Show resolved Hide resolved
if (descriptor != null) {
predicate.put(descriptor, domain);
}
Expand Down
30 changes: 30 additions & 0 deletions .../trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergParquetConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,36 @@ public void testIgnoreParquetStatistics()
}
}

@Test
public void testPushdownPredicateToParquetAfterColumnRename()
{
try (TestTable table = new TestTable(
getQueryRunner()::execute,
"test_pushdown_predicate_statistics",
"WITH (sorted_by = ARRAY['custkey']) AS TABLE tpch.tiny.customer WITH NO DATA")) {
assertUpdate(
withSmallRowGroups(getSession()),
"INSERT INTO " + table.getName() + " TABLE tpch.tiny.customer",
"VALUES 1500");

assertUpdate("ALTER TABLE " + table.getName() + " RENAME COLUMN custkey TO custkey1");

DistributedQueryRunner queryRunner = getDistributedQueryRunner();
MaterializedResultWithQueryId resultWithoutPredicate = queryRunner.executeWithQueryId(getSession(), "TABLE " + table.getName());
OperatorStats queryStatsWithoutPredicate = getOperatorStats(resultWithoutPredicate.getQueryId());
assertThat(queryStatsWithoutPredicate.getPhysicalInputPositions()).isGreaterThan(0);
assertThat(resultWithoutPredicate.getResult()).hasSize(1500);

@Language("SQL") String selectiveQuery = "SELECT * FROM " + table.getName() + " WHERE custkey1 = 100";
MaterializedResultWithQueryId selectiveQueryResult = queryRunner.executeWithQueryId(getSession(), selectiveQuery);
OperatorStats queryStatsSelectiveQuery = getOperatorStats(selectiveQueryResult.getQueryId());
assertThat(queryStatsSelectiveQuery.getPhysicalInputPositions()).isGreaterThan(0);
assertThat(queryStatsSelectiveQuery.getPhysicalInputPositions())
.isLessThan(queryStatsWithoutPredicate.getPhysicalInputPositions());
assertThat(selectiveQueryResult.getResult()).hasSize(1);
}
}

@Override
protected boolean isFileSorted(String path, String sortColumnName)
{
Expand Down
Loading