Skip to content

API: Avoid invalid identity projection of transform predicates #18160

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

Open
sankalpsthakur wants to merge 1 commit into
base: main
Choose a base branch
from
+33 −0
Open

API: Avoid invalid identity projection of transform predicates #18160

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
10 changes: 10 additions & 0 deletions api/src/main/java/org/apache/iceberg/transforms/Identity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import java.io.ObjectStreamException;
import java.util.Set;
import org.apache.iceberg.expressions.BoundPredicate;
import org.apache.iceberg.expressions.BoundReference;
import org.apache.iceberg.expressions.BoundTransform;
import org.apache.iceberg.expressions.Expressions;
import org.apache.iceberg.expressions.UnboundPredicate;
import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
Expand Down Expand Up @@ -146,6 +148,14 @@ public UnboundPredicate<T> project(String name, BoundPredicate<T> predicate) {

@Override
public UnboundPredicate<T> projectStrict(String name, BoundPredicate<T> predicate) {
if (predicate.term() instanceof BoundTransform) {
return ProjectionUtil.projectTransformPredicate(this, name, predicate);
}

if (!(predicate.term() instanceof BoundReference)) {
return null;
}

if (predicate.isUnaryPredicate()) {
return Expressions.predicate(predicate.op(), name);
} else if (predicate.isLiteralPredicate()) {
Expand Down
23 changes: 23 additions & 0 deletions api/src/test/java/org/apache/iceberg/transforms/TestProjection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import org.apache.iceberg.expressions.BoundPredicate;
import org.apache.iceberg.expressions.Expression;
import org.apache.iceberg.expressions.Expressions;
import org.apache.iceberg.expressions.ManifestEvaluator;
import org.apache.iceberg.expressions.Or;
import org.apache.iceberg.expressions.Projections;
import org.apache.iceberg.expressions.UnboundPredicate;
Expand Down Expand Up @@ -394,4 +395,26 @@ public void testProjectionNames() {
Projections.inclusive(partitionSpec).project(equal(truncate("string", 10), "abc"));
assertThat(predicate.ref().name()).isEqualTo("string_trunc");
}

@Test
void identityProjectionWithTransformPredicate() {
// Regression test for https://github.com/apache/iceberg/issues/15502.
// Identity transform cannot project a transform-based predicate (e.g., hours(ts)),
// so projection must fall back to alwaysTrue (inclusive) or alwaysFalse (strict).
Schema schema =
new Schema(
required(1, "id", Types.LongType.get()),
required(2, "ts", Types.TimestampType.withZone()));

PartitionSpec spec = PartitionSpec.builderFor(schema).identity("ts").build();
Expression hourFilter = equal(hour("ts"), 490674);

Expression projected = Projections.inclusive(spec).project(hourFilter);
assertThat(projected).isEqualTo(Expressions.alwaysTrue());

Expression strictProjected = Projections.strict(spec).project(hourFilter);
assertThat(strictProjected).isEqualTo(Expressions.alwaysFalse());

assertThat(ManifestEvaluator.forRowFilter(hourFilter, spec, true)).isNotNull();
}
}
Loading