Skip to content

Commit 9d8155e

Browse files
committed
Simplify metrics evaluator tests
1 parent af21f35 commit 9d8155e

2 files changed

Lines changed: 3 additions & 52 deletions

File tree

‎tests/expressions/test_evaluator.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ def _to_byte_buffer(field_type: IcebergType, val: Any) -> bytes:
8484

8585

8686
class BlockingBounds(Mapping[int, bytes]):
87+
"""Pause one metrics evaluation while another runs to detect shared state between calls."""
88+
8789
def __init__(self, value: bytes, first_read: Event, release_first_read: Event) -> None:
8890
self.value = value
8991
self.first_read = first_read

‎tests/table/test_metrics_evaluator_planning.py‎

Lines changed: 1 addition & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,11 @@
1717

1818
from __future__ import annotations
1919

20-
from collections.abc import Callable
21-
2220
import pytest
2321

2422
import pyiceberg.table as table_module
2523
from pyiceberg.expressions import BooleanExpression, EqualTo
26-
from pyiceberg.io import FileIO
27-
from pyiceberg.manifest import DataFile, FileFormat, ManifestContent, ManifestEntry, ManifestFile
24+
from pyiceberg.manifest import DataFile, FileFormat
2825
from pyiceberg.schema import Schema
2926
from pyiceberg.table import ManifestGroupPlanner, Table
3027
from pyiceberg.typedef import Record
@@ -40,18 +37,6 @@ def _data_file(file_number: int) -> DataFile:
4037
)
4138

4239

43-
def _manifest_file(file_number: int) -> ManifestFile:
44-
return ManifestFile.from_args(
45-
manifest_path=f"s3://bucket/manifest-{file_number}.avro",
46-
manifest_length=1,
47-
partition_spec_id=0,
48-
content=ManifestContent.DATA,
49-
sequence_number=1,
50-
min_sequence_number=1,
51-
added_snapshot_id=1,
52-
)
53-
54-
5540
def test_build_metrics_evaluator_prepares_one_instance(table_v2: Table, monkeypatch: pytest.MonkeyPatch) -> None:
5641
class CountingMetricsEvaluator:
5742
def __init__(
@@ -79,39 +64,3 @@ def eval(self, data_file: DataFile) -> bool:
7964
assert metrics_evaluator(first_file)
8065
assert metrics_evaluator(second_file)
8166
assert instances[0].calls == [first_file, second_file]
82-
83-
84-
def test_manifest_group_planner_shares_metrics_evaluator_across_manifests(
85-
table_v2: Table, monkeypatch: pytest.MonkeyPatch
86-
) -> None:
87-
planner = ManifestGroupPlanner(table_metadata=table_v2.metadata, io=table_v2.io, row_filter=EqualTo("x", 10))
88-
built_evaluators: list[Callable[[DataFile], bool]] = []
89-
opened_evaluators: list[Callable[[DataFile], bool]] = []
90-
91-
def build_metrics_evaluator() -> Callable[[DataFile], bool]:
92-
def evaluator(_: DataFile) -> bool:
93-
return True
94-
95-
built_evaluators.append(evaluator)
96-
return evaluator
97-
98-
def open_manifest(
99-
io: FileIO,
100-
manifest: ManifestFile,
101-
partition_evaluator: Callable[[DataFile], bool],
102-
metrics_evaluator: Callable[[DataFile], bool],
103-
) -> list[ManifestEntry]:
104-
opened_evaluators.append(metrics_evaluator)
105-
return []
106-
107-
monkeypatch.setattr(planner, "_build_manifest_evaluator", lambda _: lambda _: True)
108-
monkeypatch.setattr(planner, "_build_partition_evaluator", lambda _: lambda _: True)
109-
monkeypatch.setattr(planner, "_build_metrics_evaluator", build_metrics_evaluator)
110-
monkeypatch.setattr(table_module, "_open_manifest", open_manifest)
111-
112-
list(planner.plan_manifest_entries([_manifest_file(1), _manifest_file(2)]))
113-
114-
assert len(built_evaluators) == 1
115-
assert len(opened_evaluators) == 2
116-
assert opened_evaluators[0] is built_evaluators[0]
117-
assert opened_evaluators[1] is built_evaluators[0]

0 commit comments

Comments
 (0)