summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTess Avitabile <tess.avitabile@mongodb.com>2016-05-25 16:27:09 -0400
committerTess Avitabile <tess.avitabile@mongodb.com>2016-05-26 16:32:22 -0400
commit646cc051cae9a87d2b27c43a45a13dbf507faf60 (patch)
treeba97f9a7a164dcc91dacd4740c1305976ad47b92 /src
parent0ecd6231c8afe487e8716ac8e8f7d28ba7eff377 (diff)
downloadmongo-646cc051cae9a87d2b27c43a45a13dbf507faf60.tar.gz
SERVER-23968 Make GEO_NEAR_2DSPHERE stage respect the collation
Diffstat (limited to 'src')
-rw-r--r--src/mongo/db/exec/geo_near.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mongo/db/exec/geo_near.cpp b/src/mongo/db/exec/geo_near.cpp
index 83ac0a6d5bd..b40e9be02eb 100644
--- a/src/mongo/db/exec/geo_near.cpp
+++ b/src/mongo/db/exec/geo_near.cpp
@@ -743,7 +743,11 @@ GeoNear2DSphereStage::GeoNear2DSphereStage(const GeoNearParams& nearParams,
_specificStats.keyPattern = s2Index->keyPattern();
_specificStats.indexName = s2Index->indexName();
_specificStats.indexVersion = s2Index->version();
- // TODO SERVER-23968: change nullptr to the appropriate collator.
+
+ // initialize2dsphereParams() does not require the collator during the GEO_NEAR_2DSPHERE stage.
+ // It only requires the collator for index key generation. For query execution,
+ // _nearParams.baseBounds should have collator-generated comparison keys in place of raw
+ // strings, and _nearParams.filter should have the collator.
const CollatorInterface* collator = nullptr;
ExpressionParams::initialize2dsphereParams(s2Index->infoObj(), collator, &_indexParams);
}