|
27 | 27 |
|
28 | 28 | from sortedcontainers import SortedList |
29 | 29 |
|
| 30 | +from pyiceberg.exceptions import CommitFailedException |
30 | 31 | from pyiceberg.expressions import ( |
31 | 32 | AlwaysFalse, |
32 | 33 | BooleanExpression, |
@@ -248,7 +249,7 @@ def refresh(self) -> TableMetadata: |
248 | 249 | return self._transaction._table.metadata |
249 | 250 |
|
250 | 251 | @abstractmethod |
251 | | - def _validate(self, current_metadata: TableMetadata, Snapshot: Optional[Snapshot]) -> None: ... |
| 252 | + def _validate(self, current_metadata: TableMetadata, snapshot: Optional[Snapshot]) -> None: ... |
252 | 253 |
|
253 | 254 | def _commit(self) -> UpdatesAndRequirements: |
254 | 255 | current_snapshot = self._transaction.table_metadata.current_snapshot() |
@@ -461,12 +462,12 @@ def files_affected(self) -> bool: |
461 | 462 | """Indicate if any manifest-entries can be dropped.""" |
462 | 463 | return len(self._deleted_entries()) > 0 |
463 | 464 |
|
464 | | - def _validate(self, current_metadata: TableMetadata, Snapshot: Optional[Snapshot]) -> None: |
465 | | - if Snapshot is None: |
466 | | - raise ValueError("Snapshot cannot be None.") |
| 465 | + def _validate(self, current_metadata: TableMetadata, snapshot: Optional[Snapshot]) -> None: |
| 466 | + if snapshot is None: |
| 467 | + raise CommitFailedException("Snapshot cannot be None.") |
467 | 468 |
|
468 | | - if Snapshot.snapshot_id != current_metadata.snapshot_id: |
469 | | - raise ValueError("Operation conflicts are not allowed when performing deleting.") |
| 469 | + if snapshot.snapshot_id != current_metadata.snapshot_id: |
| 470 | + raise CommitFailedException("Operation conflicts are not allowed when performing deleting.") |
470 | 471 | return |
471 | 472 |
|
472 | 473 |
|
@@ -498,7 +499,7 @@ def _deleted_entries(self) -> List[ManifestEntry]: |
498 | 499 | """ |
499 | 500 | return [] |
500 | 501 |
|
501 | | - def _validate(self, current_metadata: TableMetadata, Snapshot: Optional[Snapshot]) -> None: |
| 502 | + def _validate(self, current_metadata: TableMetadata, snapshot: Optional[Snapshot]) -> None: |
502 | 503 | """Other operations don't affect the appending operation, and we can just append.""" |
503 | 504 | return |
504 | 505 |
|
@@ -630,12 +631,12 @@ def _get_entries(manifest: ManifestFile) -> List[ManifestEntry]: |
630 | 631 | else: |
631 | 632 | return [] |
632 | 633 |
|
633 | | - def _validate(self, current_metadata: TableMetadata, Snapshot: Optional[Snapshot]) -> None: |
634 | | - if Snapshot is None: |
635 | | - raise ValueError("Snapshot cannot be None.") |
| 634 | + def _validate(self, current_metadata: TableMetadata, snapshot: Optional[Snapshot]) -> None: |
| 635 | + if snapshot is None: |
| 636 | + raise CommitFailedException("Snapshot cannot be None.") |
636 | 637 |
|
637 | | - if Snapshot.snapshot_id != current_metadata.snapshot_id: |
638 | | - raise ValueError("Operation conflicts are not allowed when performing overwriting.") |
| 638 | + if snapshot.snapshot_id != current_metadata.snapshot_id: |
| 639 | + raise CommitFailedException("Operation conflicts are not allowed when performing overwriting.") |
639 | 640 | return |
640 | 641 |
|
641 | 642 |
|
|
0 commit comments