Fix rewrite of near & nearSphere count queries using geoJson to geoWithin. #4006
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
$near and $nearSphere queries are not supported via countDocuments and the used aggregation match stage and need to be rewritten to $geoWithin. The existing logic did not cover usage of geoJson types, which is fixed now. In case of nearSphere it is also required to convert the $maxDistance argument (given in meters for geoJson) to radians which is used by $geoWithin $centerSphere. Related to #2925
mp911de
reviewed
Mar 23, 2022
| @@ -193,6 +196,24 @@ private static Document createGeoWithin(String key, Document source, @Nullable O | |||
| return new Document("$and", criteria); | |||
| } | |||
|
|
|||
| private static Number getMaxDistance(Document source, Object $near, boolean spheric) { | |||
There was a problem hiding this comment.
We have MetricConversion for some conversion calculations. It would make sense to reuse those bits.
There was a problem hiding this comment.
for some, not all. Still we could move those bits there 👍
mp911de
pushed a commit
that referenced
this pull request
Sep 21, 2022
$near and $nearSphere queries are not supported via countDocuments and the used aggregation match stage and need to be rewritten to $geoWithin. The existing logic did not cover usage of geoJson types, which is fixed now. In case of nearSphere it is also required to convert the $maxDistance argument (given in meters for geoJson) to radians which is used by $geoWithin $centerSphere. Closes #4004 Original pull request: #4006. Related to #2925
mp911de
pushed a commit
that referenced
this pull request
Sep 21, 2022
$near and $nearSphere queries are not supported via countDocuments and the used aggregation match stage and need to be rewritten to $geoWithin. The existing logic did not cover usage of geoJson types, which is fixed now. In case of nearSphere it is also required to convert the $maxDistance argument (given in meters for geoJson) to radians which is used by $geoWithin $centerSphere. Closes #4004 Original pull request: #4006. Related to #2925
|
That's merged, polished, and backported now. |
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.
$nearand$nearSpherequeries are not supported viacountDocumentsand the used aggregation match stage and need to be rewritten to$geoWithin. The existing logic did not cover usage of geoJson types, which is fixed now. In case ofnearSphereit is also required to convert the$maxDistanceargument (given in meters for geoJson) to radians which is used by$geoWithin $centerSphere.Resolves: #4004