Skip to content

datastore: Same key in mutation batch#37751

Open
noseglid wants to merge 1 commit intoapache:masterfrom
noseglid:repeated-keys-datastore-writes
Open

datastore: Same key in mutation batch#37751
noseglid wants to merge 1 commit intoapache:masterfrom
noseglid:repeated-keys-datastore-writes

Conversation

@noseglid
Copy link

@noseglid noseglid commented Mar 3, 2026

We flush all pending mutations then we encounter a key which already exists in the pending batch.

The indication to when a duplicate key is encountered is that we fail to insert into a HashSet. It will then proceed to flush the batch and add the current element to mutations. However, this element is not added to the unique HashSet.

This means that if there's a duplicate on the key which triggered the early flush in the next batch, that will go unnoticed and cause datastore writes to fail.

This is addressed in this commit so we always keep the HashSet populated with all pending datastore changes.

Please add a meaningful description for your change here


Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests
Go tests

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

We flush all pending mutations then we encounter a key which already
exists in the pending batch.

The indication to when a duplicate key is encountered is that we fail to
insert into a HashSet. It will then proceed to flush the batch and add
the current element to mutations. However, this element is not added to
the unique HashSet.

This means that if there's a duplicate on the key which triggered the
early flush in the next batch, that will go unnoticed and cause
datastore writes to fail.

This is addressed in this commit so we always keep the HashSet populated
with all pending datastore changes.
@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a subtle bug in the Datastore writer where duplicate entity keys within a mutation batch could be missed if an early flush was triggered. The fix ensures that the internal tracking mechanism for unique keys remains accurate across batch flushes, preventing potential write failures due to undetected duplicates. A new test case has been added to specifically cover this scenario.

Highlights

  • Duplicate Key Handling: Corrected an issue where duplicate keys in Datastore mutation batches were not always detected after an early flush, potentially leading to write failures.
  • uniqueMutationKeys Set Update: Ensured that the uniqueMutationKeys set is consistently updated with all pending mutations, even after an intermediate batch flush, to maintain accurate tracking of unique keys.
  • New Test Case: Introduced testDatastoreWriterFnWithTripleDuplicateEntities to validate the fix by asserting that commit requests do not contain multiple mutations for the same entity key, even with repeated duplicates.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Changelog
  • sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/datastore/DatastoreV1.java
    • Ensured that a key is re-added to the unique mutation keys set after a batch flush if it was the cause of the flush.
  • sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/DatastoreV1Test.java
    • Added testDatastoreWriterFnWithTripleDuplicateEntities to verify correct handling of multiple duplicate keys across batches.
Activity
  • No specific activity (comments, reviews, or progress updates) has been recorded for this pull request yet.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@github-actions
Copy link
Contributor

github-actions bot commented Mar 3, 2026

Assigning reviewers:

R: @Abacn for label java.

Note: If you would like to opt out of this review, comment assign to next reviewer.

Available commands:

  • stop reviewer notifications - opt out of the automated review tooling
  • remind me after tests pass - tag the comment author after tests pass
  • waiting on author - shift the attention set back to the author (any comment or push by the author will return the attention set to the reviewers)

The PR bot will only process comments in the main thread (not review comments).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant