Skip to content

Commit 67e3316

Browse files
committed
Project greater-than truncate ranges to a single predicate
The wrapped value always sorts above the first block after the minimum, so GreaterThanOrEqual already includes it. Returning one predicate keeps the residual evaluator able to prune with it.
1 parent 7f0ebc5 commit 67e3316

2 files changed

Lines changed: 17 additions & 5 deletions

File tree

‎pyiceberg/transforms.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,11 +1073,12 @@ def _truncate_integer_projection(
10731073

10741074
if isinstance(pred, BoundGreaterThan):
10751075
if boundary + 1 < next_block_start:
1076-
return Or(GreaterThanOrEqual(Reference(name), next_block_start), EqualTo(Reference(name), wrapped_minimum))
1076+
# The wrapped value sorts above the first block after the minimum, so it is included
1077+
return GreaterThanOrEqual(Reference(name), next_block_start)
10771078
return _truncate_number(name, pred, transform)
10781079
elif isinstance(pred, BoundGreaterThanOrEqual):
10791080
if boundary < next_block_start:
1080-
return Or(GreaterThanOrEqual(Reference(name), next_block_start), EqualTo(Reference(name), wrapped_minimum))
1081+
return GreaterThanOrEqual(Reference(name), next_block_start)
10811082
return _truncate_number(name, pred, transform)
10821083

10831084
projected = _truncate_number(name, pred, transform)

‎tests/expressions/test_projection.py‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
)
4747
from pyiceberg.types import (
4848
DateType,
49+
IntegerType,
4950
LongType,
5051
NestedField,
5152
StringType,
@@ -277,9 +278,19 @@ def test_int_truncate_projection_near_minimum(schema: Schema) -> None:
277278

278279
assert project(EqualTo("id", -(2**63))) == EqualTo("id_trunc", wrapped_minimum)
279280
assert project(LessThan("id", 0)) == Or(LessThanOrEqual("id_trunc", -10), EqualTo("id_trunc", wrapped_minimum))
280-
assert project(GreaterThan("id", -(2**63))) == Or(
281-
GreaterThanOrEqual("id_trunc", -9223372036854775800), EqualTo("id_trunc", wrapped_minimum)
282-
)
281+
assert project(GreaterThan("id", -(2**63))) == GreaterThanOrEqual("id_trunc", -9223372036854775800)
282+
assert project(GreaterThanOrEqual("id", -(2**63) + 1)) == GreaterThanOrEqual("id_trunc", -9223372036854775800)
283+
284+
285+
def test_integer_truncate_projection_near_minimum() -> None:
286+
schema = Schema(NestedField(1, "x", IntegerType(), required=False))
287+
spec = PartitionSpec(PartitionField(1, 1000, TruncateTransform(10), "x_trunc"))
288+
project = inclusive_projection(schema, spec)
289+
wrapped_minimum = 2147483646
290+
291+
assert project(EqualTo("x", -(2**31))) == EqualTo("x_trunc", wrapped_minimum)
292+
assert project(GreaterThan("x", -(2**31))) == GreaterThanOrEqual("x_trunc", -2147483640)
293+
assert project(GreaterThanOrEqual("x", -(2**31) + 1)) == GreaterThanOrEqual("x_trunc", -2147483640)
283294

284295

285296
def test_string_truncate_projection(schema: Schema, truncate_str_spec: PartitionSpec) -> None:

0 commit comments

Comments
 (0)