[core] Fix calculation of lastModifiedCommitIdentifier of writer

apache · Mar 13, 2024 · 15aa87e · 15aa87e
1 parent 2ecf300
commit 15aa87e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/paimon-core/src/main/java/org/apache/paimon/operation/AbstractFileStoreWrite.java b/paimon-core/src/main/java/org/apache/paimon/operation/AbstractFileStoreWrite.java
@@ -174,7 +174,7 @@ public List<CommitMessage> prepareCommit(boolean waitCompaction, long commitIden
         } else {
             latestCommittedIdentifier =
                     snapshotManager
-                            .latestSnapshotOfUser(commitUser)
+                            .latestSnapshotOfUser(commitUser, branchName)
                             .map(Snapshot::commitIdentifier)
                             .orElse(Long.MIN_VALUE);
         }

diff --git a/paimon-core/src/main/java/org/apache/paimon/utils/SnapshotManager.java b/paimon-core/src/main/java/org/apache/paimon/utils/SnapshotManager.java
@@ -299,7 +299,11 @@ private Predicate<Path> nonSnapshotFileFilter() {
     }
 
     public Optional<Snapshot> latestSnapshotOfUser(String user) {
-        Long latestId = latestSnapshotId();
+        return latestSnapshotOfUser(user, DEFAULT_MAIN_BRANCH);
+    }
+
+    public Optional<Snapshot> latestSnapshotOfUser(String user, String branchName) {
+        Long latestId = latestSnapshotId(branchName);
         if (latestId == null) {
             return Optional.empty();
         }
@@ -310,7 +314,7 @@ public Optional<Snapshot> latestSnapshotOfUser(String user) {
                         "Latest snapshot id is not null, but earliest snapshot id is null. "
                                 + "This is unexpected.");
         for (long id = latestId; id >= earliestId; id--) {
-            Snapshot snapshot = snapshot(id);
+            Snapshot snapshot = snapshot(branchName, id);
             if (user.equals(snapshot.commitUser())) {
                 return Optional.of(snapshot);
             }