Skip to content

Commit 3601078

Browse files
committed
Return the wrapped partition alone for less-than ranges in its block
Every value below the first block after the minimum truncates to the wrapped value, so LessThanOrEqual there no longer matches almost every partition.
1 parent 67e3316 commit 3601078

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

‎pyiceberg/transforms.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,13 @@ def _truncate_integer_projection(
10821082
return _truncate_number(name, pred, transform)
10831083

10841084
projected = _truncate_number(name, pred, transform)
1085-
if isinstance(pred, (BoundLessThan, BoundLessThanOrEqual)) and projected is not None:
1085+
if isinstance(pred, BoundLessThan) and projected is not None:
1086+
if boundary <= next_block_start:
1087+
return EqualTo(Reference(name), wrapped_minimum)
1088+
return Or(projected, EqualTo(Reference(name), wrapped_minimum))
1089+
elif isinstance(pred, BoundLessThanOrEqual) and projected is not None:
1090+
if boundary < next_block_start:
1091+
return EqualTo(Reference(name), wrapped_minimum)
10861092
return Or(projected, EqualTo(Reference(name), wrapped_minimum))
10871093
return projected
10881094

‎tests/expressions/test_projection.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@ def test_int_truncate_projection_near_minimum(schema: Schema) -> None:
277277
wrapped_minimum = 9223372036854775806
278278

279279
assert project(EqualTo("id", -(2**63))) == EqualTo("id_trunc", wrapped_minimum)
280+
assert project(LessThan("id", -(2**63) + 5)) == EqualTo("id_trunc", wrapped_minimum)
281+
assert project(LessThanOrEqual("id", -(2**63) + 5)) == EqualTo("id_trunc", wrapped_minimum)
280282
assert project(LessThan("id", 0)) == Or(LessThanOrEqual("id_trunc", -10), EqualTo("id_trunc", wrapped_minimum))
281283
assert project(GreaterThan("id", -(2**63))) == GreaterThanOrEqual("id_trunc", -9223372036854775800)
282284
assert project(GreaterThanOrEqual("id", -(2**63) + 1)) == GreaterThanOrEqual("id_trunc", -9223372036854775800)
@@ -289,6 +291,8 @@ def test_integer_truncate_projection_near_minimum() -> None:
289291
wrapped_minimum = 2147483646
290292

291293
assert project(EqualTo("x", -(2**31))) == EqualTo("x_trunc", wrapped_minimum)
294+
assert project(LessThan("x", -(2**31) + 5)) == EqualTo("x_trunc", wrapped_minimum)
295+
assert project(LessThanOrEqual("x", -(2**31) + 5)) == EqualTo("x_trunc", wrapped_minimum)
292296
assert project(GreaterThan("x", -(2**31))) == GreaterThanOrEqual("x_trunc", -2147483640)
293297
assert project(GreaterThanOrEqual("x", -(2**31) + 1)) == GreaterThanOrEqual("x_trunc", -2147483640)
294298

0 commit comments

Comments
 (0)