fix(datastore): Update mutations to filter out extra fields on clientside conflict resolution retry #12815
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stocaaro
commented
Jan 8, 2024
packages/datastore/__tests__/conflictResolutionBehavior.test.ts
Outdated
Show resolved
Hide resolved
Comment on lines
+684
to
+685
| // @ts-ignore - This operation isn't supported in ts-strict, but needed to clone the needed fields across | ||
| returnObject[sKey] = inputObject[sKey]; |
There was a problem hiding this comment.
This was the best way I found to enable this behavior. Very open to alternatives that achieve the same guarantees of honoring custom error handeling and while also not passing along more fields than the original request.
There was a problem hiding this comment.
Talking with @svidgen there may be a way to leverage copyOf here that is worth investigating. I'm fuzzy on how we would do this without introducing a breaking change.
…side conflict resolution retry
stocaaro
force-pushed
the
05-occ-null-bug-fix
branch
from
4bb6066
to
afd1c36
Compare
|
This would have breaking side effects on how custom conflict resolution behaves. With this input I am closing this review. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Problem:
When Optimistic Concurrency resolution returns failures (when the posted version is different than the remote version), these failures are retried, updating to the remove version from the failure.
When this happens, new DataStore instances are created. The original objects may not contain all fields and missing fields are created on the new object with
nullcontent. The retry then saves thesenullvalues overwriting.Solution:
After conflict resolution has happened, filter the resulting object down to only the fields from the original update.
This solution stops the overwriting of data with
nulls and doesn't change any of the existing interfaces in potentially breaking ways.Other solutions considered:
Issue #, if available
Description of how you validated changes
Checklist
yarn testpassesBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.