Skip to content
Merged
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
4 changes: 2 additions & 2 deletions pyiceberg/table/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2191,7 +2191,7 @@ def __init__(
self.table_config = table_config

def snapshot(self) -> Snapshot | None:
if self.snapshot_id:
if self.snapshot_id is not None:
return self.table_metadata.snapshot_by_id(self.snapshot_id)
return self.table_metadata.current_snapshot()

Expand All @@ -2216,7 +2216,7 @@ def projection(self) -> Schema:
return current_schema.select(*self.selected_fields, case_sensitive=self.case_sensitive)

def use_ref(self: S, name: str) -> S:
if self.snapshot_id:
if self.snapshot_id is not None:
raise ValueError(f"Cannot override ref, already set snapshot id={self.snapshot_id}")
if snapshot := self.table_metadata.snapshot_by_name(name):
return self.update(snapshot_id=snapshot.snapshot_id)
Expand Down
25 changes: 25 additions & 0 deletions tests/table/test_init.py
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,31 @@ def test_table_scan_ref(table_v2: Table) -> None:
assert scan.use_ref("test").snapshot_id == 3051729675574597004


@pytest.mark.parametrize(
"snapshot_id, expected_snapshot_id",
[(None, 3055729675574597004), (0, 0), (3051729675574597004, 3051729675574597004)],
)
def test_table_scan_snapshot(table_v2: Table, snapshot_id: int | None, expected_snapshot_id: int) -> None:
table_v2.metadata.snapshots.append(
Snapshot(snapshot_id=0, timestamp_ms=1515100955769, manifest_list="s3://a/b/zero.avro", schema_id=0)
)

snapshot = table_v2.scan(snapshot_id=snapshot_id).snapshot()

assert snapshot is not None
assert snapshot.snapshot_id == expected_snapshot_id


def test_table_scan_missing_snapshot_zero(table_v2: Table) -> None:
assert table_v2.scan(snapshot_id=0).snapshot() is None


@pytest.mark.parametrize("snapshot_id", [0, 3051729675574597004])
def test_table_scan_ref_cannot_override_snapshot(table_v2: Table, snapshot_id: int) -> None:
with pytest.raises(ValueError, match=f"Cannot override ref, already set snapshot id={snapshot_id}"):
table_v2.scan(snapshot_id=snapshot_id).use_ref("test")


def test_table_scan_ref_does_not_exists(table_v2: Table) -> None:
scan = table_v2.scan()

Expand Down
Loading