Skip to content

Fix Iceberg ignoring filter on $path #12790

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
findepi merged 3 commits into from
Jun 13, 2022
Merged

Fix Iceberg ignoring filter on $path #12790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b195eb9
Fix Iceberg ignoring filter on $path
findepi Jun 10, 2022
36babf8
empty
findepi Jun 10, 2022
39a9664
empty
findepi Jun 11, 2022
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
4 changes: 2 additions & 2 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 @@ -1722,13 +1722,13 @@ public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(C

TupleDomain<IcebergColumnHandle> remainingConstraint = constraint.getSummary()
.transformKeys(IcebergColumnHandle.class::cast)
.filter(isIdentityPartition.negate())
.filter(isMetadataColumn.negate());
.filter(isIdentityPartition.negate());

TupleDomain<IcebergColumnHandle> newUnenforcedConstraint = remainingConstraint
// TODO: Remove after completing https://github.com/trinodb/trino/issues/8759
// Only applies to the unenforced constraint because structural types cannot be partition keys
.filter((columnHandle, predicate) -> !isStructuralType(columnHandle.getType()))
.filter(isMetadataColumn.negate())
.intersect(table.getUnenforcedPredicate());

if (newEnforcedConstraint.equals(table.getEnforcedPredicate())
Expand Down
6 changes: 6 additions & 0 deletions plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3291,6 +3291,12 @@ public void testPathHiddenColumn()
assertThat(query("SELECT file_path FROM \"" + tableName + "$files\""))
.matches("SELECT DISTINCT \"$path\" as file_path FROM " + tableName);

String somePath = (String) computeScalar("SELECT \"$path\" FROM " + tableName + " WHERE userid = 2");
assertThat(query("SELECT userid FROM " + tableName + " WHERE \"$path\" = '" + somePath + "'"))
.matches("VALUES 2, 5");
assertThat(query("SELECT userid FROM " + tableName + " WHERE \"$path\" = '" + somePath + "' AND userid > 0"))
.matches("VALUES 2, 5");
Copy link
Copy Markdown
Member Author

@findepi findepi Jun 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first one was passing, but this one was failing.


assertUpdate("DROP TABLE " + tableName);
}

Expand Down