Skip to content

[python] Inherit watermark in PyPaimon commits #9090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JingsongLi merged 1 commit into from
Aug 7, 2026
+18 −1
Merged

[python] Inherit watermark in PyPaimon commits #9090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 16 additions & 1 deletion paimon-python/pypaimon/tests/file_store_commit_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ def test_manifest_merge_result_copies_and_freezes_lists(
def _run_manifest_commit_attempt(self, commit_side_effect=None,
commit_result=None, retry_result=None,
existing_manifests=None,
merged_manifests=None):
merged_manifests=None,
latest_watermark=None):
file_store_commit = self._create_file_store_commit()
self.mock_table.identifier = 'default.test_table'
self.mock_table.table_schema.id = 7
Expand Down Expand Up @@ -179,6 +180,7 @@ def _run_manifest_commit_attempt(self, commit_side_effect=None,
uuid='base-snapshot-uuid',
total_record_count=10,
index_manifest=None,
watermark=latest_watermark,
)
commit_entry = Mock(kind=0)
commit_entry.file.row_count = 2
Expand All @@ -192,6 +194,18 @@ def _run_manifest_commit_attempt(self, commit_side_effect=None,
)
return file_store_commit, result

def test_append_commit_inherits_watermark(
self, mock_manifest_list_manager, mock_manifest_file_manager):
file_store_commit, result = self._run_manifest_commit_attempt(
commit_result=True,
latest_watermark=123,
)

self.assertTrue(result.is_success())
committed_snapshot = (
file_store_commit.snapshot_commit.commit.call_args[0][1])
self.assertEqual(123, committed_snapshot.watermark)

def test_false_atomic_commit_retains_manifest_merge_result(
self, mock_manifest_list_manager, mock_manifest_file_manager):
file_store_commit, result = self._run_manifest_commit_attempt(
Expand Down Expand Up @@ -750,6 +764,7 @@ def test_append_commit_inherits_index_manifest(
latest_snapshot.uuid = "base-snapshot-uuid"
latest_snapshot.total_record_count = 10
latest_snapshot.index_manifest = "index-manifest-existing"
latest_snapshot.watermark = None

commit_entry = Mock()
commit_entry.kind = 0
Expand Down
2 changes: 2 additions & 0 deletions paimon-python/pypaimon/write/file_store_commit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,8 @@ def _try_commit_once(self, retry_result: Optional[RetryResult], commit_kind: str
commit_identifier=commit_identifier,
commit_kind=commit_kind,
time_millis=int(time.time() * 1000),
watermark=(
latest_snapshot.watermark if latest_snapshot else None),
next_row_id=next_row_id,
index_manifest=index_manifest,
)
Expand Down
Loading