diff options
| author | Tess Avitabile <tess.avitabile@mongodb.com> | 2016-08-17 12:11:32 -0400 |
|---|---|---|
| committer | Tess Avitabile <tess.avitabile@mongodb.com> | 2016-08-23 10:05:02 -0400 |
| commit | 01a1b877bc7d103646ecc8608a8df89d74de1324 (patch) | |
| tree | 7355fdfbca4f6d235bfe5fd414520c18c1a28c41 /src/mongo/db/query/collation | |
| parent | 5c115e6ad38cd81e96c05ff2be5af17baeaedd68 (diff) | |
| download | mongo-01a1b877bc7d103646ecc8608a8df89d74de1324.tar.gz | |
SERVER-24439 code cleanup for collation shard targeting
Diffstat (limited to 'src/mongo/db/query/collation')
| -rw-r--r-- | src/mongo/db/query/collation/collation_spec.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/query/collation/collation_spec.h | 3 | ||||
| -rw-r--r-- | src/mongo/db/query/collation/collator_factory_mock.cpp | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/mongo/db/query/collation/collation_spec.cpp b/src/mongo/db/query/collation/collation_spec.cpp index fd4fa4dc906..e831e89c999 100644 --- a/src/mongo/db/query/collation/collation_spec.cpp +++ b/src/mongo/db/query/collation/collation_spec.cpp @@ -53,6 +53,8 @@ const char* CollationSpec::kAlternateNonIgnorable = "non-ignorable"; const char* CollationSpec::kAlternateShifted = "shifted"; const char* CollationSpec::kMaxVariablePunct = "punct"; const char* CollationSpec::kMaxVariableSpace = "space"; +const BSONObj CollationSpec::kSimpleSpec = + BSON(CollationSpec::kLocaleField << CollationSpec::kSimpleBinaryComparison); BSONObj CollationSpec::toBSON() const { BSONObjBuilder builder; diff --git a/src/mongo/db/query/collation/collation_spec.h b/src/mongo/db/query/collation/collation_spec.h index 756a975990f..1878517d496 100644 --- a/src/mongo/db/query/collation/collation_spec.h +++ b/src/mongo/db/query/collation/collation_spec.h @@ -113,6 +113,9 @@ struct CollationSpec { static const char* kMaxVariablePunct; static const char* kMaxVariableSpace; + // Collation spec which the user can supply to represent the "simple" locale. + static const BSONObj kSimpleSpec; + /** * Constructs a CollationSpec with no locale, where all other fields have their default values. */ diff --git a/src/mongo/db/query/collation/collator_factory_mock.cpp b/src/mongo/db/query/collation/collator_factory_mock.cpp index 13784517d1d..7d7c69341d9 100644 --- a/src/mongo/db/query/collation/collator_factory_mock.cpp +++ b/src/mongo/db/query/collation/collator_factory_mock.cpp @@ -41,8 +41,7 @@ namespace mongo { StatusWith<std::unique_ptr<CollatorInterface>> CollatorFactoryMock::makeFromBSON( const BSONObj& spec) { - if (SimpleBSONObjComparator::kInstance.evaluate( - spec == BSON(CollationSpec::kLocaleField << CollationSpec::kSimpleBinaryComparison))) { + if (SimpleBSONObjComparator::kInstance.evaluate(spec == CollationSpec::kSimpleSpec)) { return {nullptr}; } auto collator = |