So clean

Author: Fokko

pyiceberg/manifest.py

@@ -22,7 +22,6 @@
 from enum import Enum
 from types import TracebackType
 from typing import (
-    TYPE_CHECKING,
     Any,
     Dict,
     Iterator,
@@ -59,9 +58,6 @@
     StructType,
 )
 
-if TYPE_CHECKING:
-    pass
-
 UNASSIGNED_SEQ = -1
 DEFAULT_BLOCK_SIZE = 67108864  # 64 * 1024 * 1024
 DEFAULT_READ_VERSION: Literal[2] = 2
@@ -989,12 +985,12 @@ def _inherit_from_manifest(entry: ManifestEntry, manifest: ManifestFile) -> Mani
 
     # in v1 tables, the sequence number is not persisted and can be safely defaulted to 0
     # in v2 tables, the sequence number should be inherited iff the entry status is ADDED
-    if entry.sequence_number is None:
+    if entry.sequence_number is None and (manifest.sequence_number == 0 or entry.status == ManifestEntryStatus.ADDED):
         entry.sequence_number = manifest.sequence_number
 
     # in v1 tables, the file sequence number is not persisted and can be safely defaulted to 0
     # in v2 tables, the file sequence number should be inherited iff the entry status is ADDED
-    if entry.file_sequence_number is None:
+    if entry.file_sequence_number is None and (manifest.sequence_number == 0 or entry.status == ManifestEntryStatus.ADDED):
         # Only available in V2, always 0 in V1
         entry.file_sequence_number = manifest.sequence_number
 

tests/catalog/test_sql.py

@@ -1440,11 +1440,11 @@ def test_concurrent_commit_table(catalog: SqlCatalog, table_schema_simple: Schem
     "catalog",
     [
         lazy_fixture("catalog_memory"),
-        # lazy_fixture("catalog_sqlite"),
-        # lazy_fixture("catalog_sqlite_without_rowcount"),
+        lazy_fixture("catalog_sqlite"),
+        lazy_fixture("catalog_sqlite_without_rowcount"),
     ],
 )
-@pytest.mark.parametrize("format_version", [2])
+@pytest.mark.parametrize("format_version", [1, 2])
 def test_write_and_evolve(catalog: SqlCatalog, format_version: int) -> None:
     identifier = f"default.arrow_write_data_and_evolve_schema_v{format_version}"
 

tests/utils/test_manifest.py

@@ -525,12 +525,9 @@ def test_write_manifest(
         assert data_file.sort_order_id == 0
 
 
-# @pytest.mark.parametrize("format_version", [1, 2])
-@pytest.mark.parametrize("format_version", [2])
-# @pytest.mark.parametrize("parent_snapshot_id", [19, None])
-@pytest.mark.parametrize("parent_snapshot_id", [19,])
-# @pytest.mark.parametrize("compression", ["null", "deflate"])
-@pytest.mark.parametrize("compression", ["null"])
+@pytest.mark.parametrize("format_version", [1, 2])
+@pytest.mark.parametrize("parent_snapshot_id", [19, None])
+@pytest.mark.parametrize("compression", ["null", "deflate"])
 def test_write_manifest_list(
     generated_manifest_file_file_v1: str,
     generated_manifest_file_file_v2: str,