Fix Firestore conformance tests #5344
Merged
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
google-cla
bot
added
the
cla: yes
amanda-tarafa
added
the
do not merge
|
Note: using the precondition to determine whether or not to use an empty update mask may not be a good idea. It may be as simple as depending on which method is calling it (so just have an extra flag...) |
Deciding when to use an update mask is currently slightly tricky, and may be simplified a bit later when we have more detailed specifications.
We don't need the concept of "should we include the write result or not" any more.
- Create never specifies an update mask - Set specifies an update mask if and only if the merge option is true - Update always specifies an update mask In all cases there's a single Write (so I've renamed the method). All tests still pass, and I'm now happy to merge this.
jskeet
force-pushed
the
fix-firestore
branch
from
94b8fc4 to
d099662
Compare
jskeet
removed
the
do not merge
|
Amanda: I've added an extra commit to this based on internal guidance. Please could you have a look? If you're happy, we can merge this and we're done :) |
jskeet
commented
Sep 25, 2020
| @@ -264,7 +244,9 @@ internal async Task<IList<WriteResult>> CommitAsync(ByteString transactionId, Ca | |||
| Fields = { fields }, | |||
| Name = documentReference.Path, | |||
| }, | |||
| UpdateMask = includeEmptyUpdateMask || updatePaths.Count > 0 ? new DocumentMask { FieldPaths = { updatePaths.Select(fp => fp.EncodedPath) } } : null, | |||
| UpdateMask = updatePaths is null | |||
There was a problem hiding this comment.
I could compute the DocumentMask (or null) outside the object initializer if you'd prefer.
amanda-tarafa
approved these changes
Sep 25, 2020
| @@ -264,7 +244,9 @@ internal async Task<IList<WriteResult>> CommitAsync(ByteString transactionId, Ca | |||
| Fields = { fields }, | |||
| Name = documentReference.Path, | |||
| }, | |||
| UpdateMask = includeEmptyUpdateMask || updatePaths.Count > 0 ? new DocumentMask { FieldPaths = { updatePaths.Select(fp => fp.EncodedPath) } } : null, | |||
| UpdateMask = updatePaths is null | |||
2 tasks
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.
Fixes #5343.
This should not be merged until we've seen a spec for update transforms.