From 98b32bfd3f71a4c2d83bc04d206ba4f339e799ed Mon Sep 17 00:00:00 2001
From: Jiang Zhu <jiangzzhu@google.com>
Date: Fri, 10 Oct 2025 02:57:22 +0000
Subject: [PATCH] Only update the partition watermark iff the partition
 watermark in metadata table is smaller than the given watermark.

---
 .../dao/PartitionMetadataDao.java             | 16 +++++++--
 .../dao/PartitionMetadataDaoTest.java         | 33 +++++++++++++++++--
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/dao/PartitionMetadataDao.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/dao/PartitionMetadataDao.java
index d850ea2d2799..b407d5b0b6cc 100644
--- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/dao/PartitionMetadataDao.java
+++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/dao/PartitionMetadataDao.java
@@ -32,6 +32,7 @@
 import com.google.cloud.Timestamp;
 import com.google.cloud.spanner.DatabaseClient;
 import com.google.cloud.spanner.Dialect;
+import com.google.cloud.spanner.Key;
 import com.google.cloud.spanner.Mutation;
 import com.google.cloud.spanner.Options;
 import com.google.cloud.spanner.ResultSet;
@@ -528,14 +529,25 @@ public Void updateToFinished(String partitionToken) {
     }
 
     /**
-     * Update the partition watermark to the given timestamp.
+     * Update the partition watermark to the given timestamp iff the partition watermark in metadata
+     * table is smaller than the given watermark.
      *
      * @param partitionToken the partition unique identifier
      * @param watermark the new partition watermark
      * @return the commit timestamp of the read / write transaction
      */
     public Void updateWatermark(String partitionToken, Timestamp watermark) {
-      transaction.buffer(createUpdateMetadataWatermarkMutationFrom(partitionToken, watermark));
+      Struct row =
+          transaction.readRow(
+              metadataTableName, Key.of(partitionToken), Collections.singleton(COLUMN_WATERMARK));
+      if (row == null) {
+        LOG.error("[{}] Failed to read Watermark column", partitionToken);
+        return null;
+      }
+      Timestamp partitionWatermark = row.getTimestamp(COLUMN_WATERMARK);
+      if (partitionWatermark.compareTo(watermark) < 0) {
+        transaction.buffer(createUpdateMetadataWatermarkMutationFrom(partitionToken, watermark));
+      }
       return null;
     }
 
diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/dao/PartitionMetadataDaoTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/dao/PartitionMetadataDaoTest.java
index dc35c2ea4934..dba8c4792c6b 100644
--- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/dao/PartitionMetadataDaoTest.java
+++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/dao/PartitionMetadataDaoTest.java
@@ -36,6 +36,8 @@
 import com.google.cloud.spanner.TransactionContext;
 import com.google.cloud.spanner.TransactionRunner;
 import com.google.cloud.spanner.Value;
+import java.time.Duration;
+import java.time.Instant;
 import java.util.Collections;
 import java.util.Map;
 import org.apache.beam.sdk.io.gcp.spanner.changestreams.model.PartitionMetadata;
@@ -238,14 +240,39 @@ public void testInTransactionContextUpdateToFinished() {
   @Test
   public void testInTransactionContextUpdateWatermark() {
     ArgumentCaptor<Mutation> mutation = ArgumentCaptor.forClass(Mutation.class);
-    doNothing().when(transaction).buffer(mutation.capture());
-    assertNull(inTransactionContext.updateWatermark(PARTITION_TOKEN, WATERMARK));
+    when(transaction.readRow(any(), any(), any()))
+        .thenReturn(
+            Struct.newBuilder()
+                .set(PartitionMetadataAdminDao.COLUMN_WATERMARK)
+                .to(WATERMARK)
+                .build());
+    Instant largerWatermark = WATERMARK.toSqlTimestamp().toInstant().plus(Duration.ofSeconds(1));
+    assertNull(
+        inTransactionContext.updateWatermark(
+            PARTITION_TOKEN,
+            Timestamp.ofTimeSecondsAndNanos(
+                largerWatermark.getEpochSecond(), largerWatermark.getNano())));
+    verify(transaction).buffer(mutation.capture());
     Map<String, Value> mutationValueMap = mutation.getValue().asMap();
     assertEquals(
         PARTITION_TOKEN,
         mutationValueMap.get(PartitionMetadataAdminDao.COLUMN_PARTITION_TOKEN).getString());
     assertEquals(
-        WATERMARK, mutationValueMap.get(PartitionMetadataAdminDao.COLUMN_WATERMARK).getTimestamp());
+        Timestamp.ofTimeSecondsAndNanos(
+            largerWatermark.getEpochSecond(), largerWatermark.getNano()),
+        mutationValueMap.get(PartitionMetadataAdminDao.COLUMN_WATERMARK).getTimestamp());
+  }
+
+  @Test
+  public void testInTransactionContextDoNotUpdateWatermark() {
+    when(transaction.readRow(any(), any(), any()))
+        .thenReturn(
+            Struct.newBuilder()
+                .set(PartitionMetadataAdminDao.COLUMN_WATERMARK)
+                .to(WATERMARK)
+                .build());
+    assertNull(inTransactionContext.updateWatermark(PARTITION_TOKEN, WATERMARK));
+    verify(transaction, times(0)).buffer(any(Mutation.class));
   }
 
   @Test