[BEAM-22089] Fix query retry in Java FirestoreIO #22175
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
|
R: @yixiaoshen |
yixiaoshen
reviewed
Jul 6, 2022
...d-platform/src/test/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreV1FnRunQueryTest.java
Outdated
Show resolved
Hide resolved
yixiaoshen
reviewed
Jul 6, 2022
...d-platform/src/test/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreV1FnRunQueryTest.java
Outdated
Show resolved
Hide resolved
...d-platform/src/test/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreV1FnRunQueryTest.java
Outdated
Show resolved
Hide resolved
yixiaoshen
reviewed
Jul 7, 2022
.../io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/QueryUtils.java
Show resolved
Hide resolved
.../io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/QueryUtils.java
Outdated
Show resolved
Hide resolved
.../io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/QueryUtils.java
Outdated
Show resolved
Hide resolved
.../io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/QueryUtils.java
Outdated
Show resolved
Hide resolved
.../io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/QueryUtils.java
Outdated
Show resolved
Hide resolved
...gle-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreV1ReadFn.java
Outdated
Show resolved
Hide resolved
yixiaoshen
reviewed
Jul 8, 2022
.../io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/QueryUtils.java
Outdated
Show resolved
Hide resolved
...d-platform/src/test/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreV1FnRunQueryTest.java
Outdated
Show resolved
Hide resolved
|
LGTM. please also get a review from someone else. |
|
R: @johnjcasey |
|
Nothing looks bad to me, but a lot of this is firestore specific, so its hard to judge from a BeamIO perspective |
johnjcasey
reviewed
Jul 8, 2022
...gle-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreV1ReadFn.java
Outdated
Show resolved
Hide resolved
clement
suggested changes
Jul 8, 2022
...gle-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreV1ReadFn.java
Outdated
Show resolved
Hide resolved
...gle-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreV1ReadFn.java
Outdated
Show resolved
Hide resolved
...gle-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreV1ReadFn.java
Outdated
Show resolved
Hide resolved
...gle-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreV1ReadFn.java
Outdated
Show resolved
Hide resolved
...gle-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreV1ReadFn.java
Outdated
Show resolved
Hide resolved
.../io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/QueryUtils.java
Outdated
Show resolved
Hide resolved
.../io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/QueryUtils.java
Outdated
Show resolved
Hide resolved
.../io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/QueryUtils.java
Show resolved
Hide resolved
.../io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/QueryUtils.java
Show resolved
Hide resolved
clement
reviewed
Jul 9, 2022
.../io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/QueryUtils.java
Outdated
Show resolved
Hide resolved
.../io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/QueryUtils.java
Outdated
Show resolved
Hide resolved
...gle-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreV1ReadFn.java
Outdated
Show resolved
Hide resolved
|
Code is ready again, fixed some spotless errors after adding all the unit tests, filter sorting etc. |
clement
suggested changes
Jul 12, 2022
.../io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/QueryUtils.java
Outdated
Show resolved
Hide resolved
.../io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/QueryUtils.java
Outdated
Show resolved
Hide resolved
...google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/firestore/QueryUtilsTest.java
Show resolved
Hide resolved
clement
approved these changes
Jul 12, 2022
.../io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/QueryUtils.java
Outdated
Show resolved
Hide resolved
danthev
force-pushed
the
fix/beam_fs_query_resume
branch
from
73ed328 to
c314775
Compare
danthev
force-pushed
the
fix/beam_fs_query_resume
branch
from
c314775 to
ad3af31
Compare
johnjcasey
approved these changes
Jul 13, 2022
|
@pabloem @chamikaramj for final pass & merge |
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.
This fixes a condition where, when a RunQuery request is retried, the cursor inferred from the last received value is set incorrectly, potentially yielding no or skipping some results. This can happen due to nested field paths in the orderBy or when the implicit order (e.g. by name) is not filled correctly. See also #22089.
This PR fixes both root-causes along with unit test cases for each.