Skip to content

Commit fc98648

Browse files
committed
update API
1 parent 5b85d1c commit fc98648

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

pyiceberg/catalog/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,7 @@ def purge_table(self, identifier: Union[str, Identifier]) -> None:
835835
manifest_lists_to_delete = set()
836836
manifests_to_delete: List[ManifestFile] = []
837837
for snapshot in metadata.snapshots:
838-
manifests_to_delete += snapshot.manifests(io, snapshot.manifest_list)
838+
manifests_to_delete += snapshot.manifests(io)
839839
if snapshot.manifest_list is not None:
840840
manifest_lists_to_delete.add(snapshot.manifest_list)
841841

pyiceberg/cli/output.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def files(self, table: Table, history: bool) -> None:
144144
manifest_list_str = f": {snapshot.manifest_list}" if snapshot.manifest_list else ""
145145
list_tree = snapshot_tree.add(f"Snapshot {snapshot.snapshot_id}, schema {snapshot.schema_id}{manifest_list_str}")
146146

147-
manifest_list = snapshot.manifests(io, manifest_list_str)
147+
manifest_list = snapshot.manifests(io)
148148
for manifest in manifest_list:
149149
manifest_tree = list_tree.add(f"Manifest: {manifest.manifest_path}")
150150
for manifest_entry in manifest.fetch_manifest_entry(io, discard_deleted=False):

pyiceberg/table/snapshots.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,13 +252,17 @@ def __str__(self) -> str:
252252

253253
@staticmethod
254254
@lru_cache
255-
def manifests(io: FileIO, manifest_list: str) -> List[ManifestFile]:
255+
def _manifests(io: FileIO, manifest_list: str) -> List[ManifestFile]:
256256
"""Return the manifests for the given snapshot."""
257257
if manifest_list not in (None, ""):
258258
file = io.new_input(manifest_list)
259259
return list(read_manifest_list(file))
260260
return []
261261

262+
def manifests(self, io: FileIO) -> List[ManifestFile]:
263+
"""Return the manifests for the given snapshot."""
264+
return Snapshot._manifests(io, self.manifest_list)
265+
262266

263267
class MetadataLogEntry(IcebergBaseModel):
264268
metadata_file: str = Field(alias="metadata-file")

tests/integration/test_partitioning_key.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -763,14 +763,10 @@ def test_partition_key(
763763
snapshot = iceberg_table.current_snapshot()
764764
assert snapshot
765765
spark_partition_for_justification = (
766-
snapshot.manifests(iceberg_table.io, snapshot.manifest_list)[0]
767-
.fetch_manifest_entry(iceberg_table.io)[0]
768-
.data_file.partition
766+
snapshot.manifests(iceberg_table.io)[0].fetch_manifest_entry(iceberg_table.io)[0].data_file.partition
769767
)
770768
spark_path_for_justification = (
771-
snapshot.manifests(iceberg_table.io, snapshot.manifest_list)[0]
772-
.fetch_manifest_entry(iceberg_table.io)[0]
773-
.data_file.file_path
769+
snapshot.manifests(iceberg_table.io)[0].fetch_manifest_entry(iceberg_table.io)[0].data_file.file_path
774770
)
775771
assert spark_partition_for_justification == expected_partition_record
776772
assert expected_hive_partition_path_slice in spark_path_for_justification

tests/integration/test_rest_manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def test_write_sample_manifest(table_test_all_types: Table) -> None:
7575
if test_snapshot is None:
7676
raise ValueError("Table has no current snapshot, check the docker environment")
7777
io = table_test_all_types.io
78-
test_manifest_file = test_snapshot.manifests(io, test_snapshot.manifest_list)[0]
78+
test_manifest_file = test_snapshot.manifests(io)[0]
7979
test_manifest_entries = test_manifest_file.fetch_manifest_entry(io)
8080
entry = test_manifest_entries[0]
8181
test_schema = table_test_all_types.schema()

tests/utils/test_manifest.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ def test_read_manifest_v1(generated_manifest_file_file_v1: str) -> None:
217217
summary=Summary(Operation.APPEND),
218218
schema_id=3,
219219
)
220-
manifest_list = snapshot.manifests(io, snapshot.manifest_list)[0]
220+
manifest_list = snapshot.manifests(io)[0]
221221

222222
assert manifest_list.manifest_length == 7989
223223
assert manifest_list.partition_spec_id == 0
@@ -267,7 +267,7 @@ def test_read_manifest_v2(generated_manifest_file_file_v2: str) -> None:
267267
summary=Summary(Operation.APPEND),
268268
schema_id=3,
269269
)
270-
manifest_list = snapshot.manifests(io, manifest_list=snapshot.manifest_list)[0]
270+
manifest_list = snapshot.manifests(io)[0]
271271

272272
assert manifest_list.manifest_length == 7989
273273
assert manifest_list.partition_spec_id == 0
@@ -336,7 +336,7 @@ def test_write_manifest(
336336
summary=Summary(Operation.APPEND),
337337
schema_id=3,
338338
)
339-
demo_manifest_file = snapshot.manifests(io, snapshot.manifest_list)[0]
339+
demo_manifest_file = snapshot.manifests(io)[0]
340340
manifest_entries = demo_manifest_file.fetch_manifest_entry(io)
341341
test_schema = Schema(
342342
NestedField(1, "VendorID", IntegerType(), False), NestedField(2, "tpep_pickup_datetime", IntegerType(), False)
@@ -508,7 +508,7 @@ def test_write_manifest_list(
508508
schema_id=3,
509509
)
510510

511-
demo_manifest_list = snapshot.manifests(io, snapshot.manifest_list)
511+
demo_manifest_list = snapshot.manifests(io)
512512
with TemporaryDirectory() as tmp_dir:
513513
path = tmp_dir + "/manifest-list.avro"
514514
output = io.new_output(path)

0 commit comments

Comments
 (0)