Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions pyiceberg/expressions/visitors.py
Original file line number Diff line number Diff line change
Expand Up @@ -1973,6 +1973,12 @@ def residual_for(self, partition_data: Record) -> BooleanExpression:
def residual_evaluator_of(
spec: PartitionSpec, expr: BooleanExpression, case_sensitive: bool, schema: Schema
) -> ResidualEvaluator:
"""Create a residual evaluator.

Returns a fresh evaluator instance because evaluators are stateful
(they set `self.struct` during evaluation) and may be used from multiple
threads.
"""
return (
UnpartitionedResidualEvaluator(schema=schema, expr=expr)
if spec.is_unpartitioned()
Expand Down
13 changes: 13 additions & 0 deletions tests/expressions/test_residual_evaluator.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,19 @@ def test_identity_transform_residual() -> None:
assert residual == AlwaysFalse()


def test_residual_evaluator_of_returns_fresh_instance() -> None:
Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for adding the test 👍

schema = Schema(NestedField(50, "dateint", IntegerType()), NestedField(51, "hour", IntegerType()))
spec = PartitionSpec(PartitionField(50, 1050, IdentityTransform(), "dateint_part"))
predicate = LessThan("dateint", 20170815)

res_eval_1 = residual_evaluator_of(spec=spec, expr=predicate, case_sensitive=True, schema=schema)
res_eval_2 = residual_evaluator_of(spec=spec, expr=predicate, case_sensitive=True, schema=schema)

assert res_eval_1 is not res_eval_2
assert res_eval_1.residual_for(Record(20170814)) == AlwaysTrue()
assert res_eval_2.residual_for(Record(20170816)) == AlwaysFalse()


def test_case_insensitive_identity_transform_residuals() -> None:
schema = Schema(NestedField(50, "dateint", IntegerType()), NestedField(51, "hour", IntegerType()))

Expand Down