Skip to content

Only update the partition watermark iff the partition watermark in metadata table is smaller than the given watermark. #36463

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
scwhittle merged 1 commit into from
Oct 10, 2025
Merged

Only update the partition watermark iff the partition watermark in metadata table is smaller than the given watermark. #36463

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
16 changes: 14 additions & 2 deletions .../main/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/dao/PartitionMetadataDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down
33 changes: 30 additions & 3 deletions ...t/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/dao/PartitionMetadataDaoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
Loading