Skip to content

Commit 5777fd4

Browse files
committed
WIP
1 parent d1c3a92 commit 5777fd4

4 files changed

Lines changed: 17 additions & 13 deletions

File tree

poetry.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyiceberg/manifest.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -985,12 +985,12 @@ def _inherit_from_manifest(entry: ManifestEntry, manifest: ManifestFile) -> Mani
985985

986986
# in v1 tables, the sequence number is not persisted and can be safely defaulted to 0
987987
# in v2 tables, the sequence number should be inherited iff the entry status is ADDED
988-
if entry.sequence_number == 0 and (manifest.sequence_number == 0 or entry.status == ManifestEntryStatus.ADDED):
988+
if entry.sequence_number is None and entry.status == ManifestEntryStatus.ADDED:
989989
entry.sequence_number = manifest.sequence_number
990990

991991
# in v1 tables, the file sequence number is not persisted and can be safely defaulted to 0
992992
# in v2 tables, the file sequence number should be inherited iff the entry status is ADDED
993-
if entry.file_sequence_number == 0 and (manifest.sequence_number == 0 or entry.status == ManifestEntryStatus.ADDED):
993+
if entry.file_sequence_number is None and entry.status == ManifestEntryStatus.ADDED:
994994
# Only available in V2, always 0 in V1
995995
entry.file_sequence_number = manifest.sequence_number
996996

@@ -1132,6 +1132,7 @@ def add_entry(self, entry: ManifestEntry) -> ManifestWriter:
11321132
self._deleted_files += 1
11331133
self._deleted_rows += entry.data_file.record_count
11341134
else:
1135+
entry
11351136
raise ValueError(f"Unknown entry: {entry.status}")
11361137

11371138
self._partitions.append(entry.data_file.partition)
@@ -1150,7 +1151,7 @@ def add(self, entry: ManifestEntry) -> ManifestWriter:
11501151
if entry.sequence_number is not None and entry.sequence_number >= 0:
11511152
self.add_entry(
11521153
ManifestEntry.from_args(
1153-
snapshot_id=self._snapshot_id, sequence_number=entry.sequence_number, data_file=entry.data_file
1154+
status=ManifestEntryStatus.ADDED, snapshot_id=self._snapshot_id, sequence_number=entry.sequence_number, data_file=entry.data_file
11541155
)
11551156
)
11561157
else:

pyiceberg/table/update/snapshot.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,14 @@ def _write_delete_manifest() -> List[ManifestFile]:
219219

220220
executor = ExecutorFactory.get_or_create()
221221

222-
added_manifests = executor.submit(_write_added_manifest)
223-
delete_manifests = executor.submit(_write_delete_manifest)
224-
existing_manifests = executor.submit(self._existing_manifests)
225-
226-
return self._process_manifests(added_manifests.result() + delete_manifests.result() + existing_manifests.result())
222+
# added_manifests = executor.submit(_write_added_manifest)
223+
# delete_manifests = executor.submit(_write_delete_manifest)
224+
# existing_manifests = executor.submit(self._existing_manifests)
225+
added_manifests = _write_added_manifest()
226+
delete_manifests = _write_delete_manifest()
227+
existing_manifests = self._existing_manifests()
228+
229+
return self._process_manifests(added_manifests + delete_manifests + existing_manifests)
227230

228231
def _summary(self, snapshot_properties: Dict[str, str] = EMPTY_DICT) -> Summary:
229232
from pyiceberg.table import TableProperties

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ sqlalchemy = { version = "^2.0.18", optional = true }
8383
bodo = { version = ">=2025.7.4", optional = true }
8484
daft = { version = ">=0.5.0", optional = true }
8585
cachetools = ">=5.5,<7.0"
86-
pyiceberg-core = { file = "/Users/fokko.driesprong/work/iceberg-rust/bindings/python/dist/pyiceberg_core-0.6.1925555-cp39-abi3-macosx_11_0_arm64.whl" }
86+
pyiceberg-core = { file = "/Users/fokko.driesprong/work/iceberg-rust/bindings/python/dist/pyiceberg_core-0.22.22-cp39-abi3-macosx_11_0_arm64.whl" }
8787
polars = { version = "^1.21.0", optional = true }
8888
thrift-sasl = { version = ">=0.4.3", optional = true }
8989
kerberos = {version = "^1.3.1", optional = true}

0 commit comments

Comments
 (0)