diff options
Diffstat (limited to 'src/mongo/db/index')
| -rw-r--r-- | src/mongo/db/index/btree_key_generator.cpp | 20 | ||||
| -rw-r--r-- | src/mongo/db/index/expression_keys_private.cpp | 6 | ||||
| -rw-r--r-- | src/mongo/db/index/expression_params.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/db/index/index_access_method.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/db/index/s2_key_generator_test.cpp | 2 |
5 files changed, 18 insertions, 18 deletions
diff --git a/src/mongo/db/index/btree_key_generator.cpp b/src/mongo/db/index/btree_key_generator.cpp index eddeca2a6d1..d479c458915 100644 --- a/src/mongo/db/index/btree_key_generator.cpp +++ b/src/mongo/db/index/btree_key_generator.cpp @@ -38,7 +38,7 @@ #include "mongo/db/query/collation/collator_interface.h" #include "mongo/stdx/memory.h" #include "mongo/util/assert_util.h" -#include "mongo/util/mongoutils/str.h" +#include "mongo/util/str.h" namespace mongo { @@ -88,20 +88,20 @@ BSONElement BtreeKeyGenerator::_extractNextElement(const BSONObj& obj, const PositionalPathInfo& positionalInfo, const char** field, bool* arrayNestedArray) const { - std::string firstField = mongoutils::str::before(*field, '.'); + std::string firstField = str::before(*field, '.'); bool haveObjField = !obj.getField(firstField).eoo(); BSONElement arrField = positionalInfo.positionallyIndexedElt; // An index component field name cannot exist in both a document // array and one of that array's children. - uassert(16746, - mongoutils::str::stream() - << "Ambiguous field name found in array (do not use numeric field names in " - "embedded elements in an array), field: '" - << arrField.fieldName() - << "' for array: " - << positionalInfo.arrayObj, - !haveObjField || !positionalInfo.hasPositionallyIndexedElt()); + uassert( + 16746, + str::stream() << "Ambiguous field name found in array (do not use numeric field names in " + "embedded elements in an array), field: '" + << arrField.fieldName() + << "' for array: " + << positionalInfo.arrayObj, + !haveObjField || !positionalInfo.hasPositionallyIndexedElt()); *arrayNestedArray = false; if (haveObjField) { diff --git a/src/mongo/db/index/expression_keys_private.cpp b/src/mongo/db/index/expression_keys_private.cpp index 33bad468181..11ed573f27f 100644 --- a/src/mongo/db/index/expression_keys_private.cpp +++ b/src/mongo/db/index/expression_keys_private.cpp @@ -48,7 +48,7 @@ #include "mongo/db/query/collation/collation_index_key.h" #include "mongo/util/assert_util.h" #include "mongo/util/log.h" -#include "mongo/util/mongoutils/str.h" +#include "mongo/util/str.h" #include "third_party/s2/s2cell.h" #include "third_party/s2/s2regioncoverer.h" @@ -279,7 +279,7 @@ void ExpressionKeysPrivate::get2DKeys(const BSONObj& obj, BSONElement locElement = oi.next(); uassert(16804, - mongoutils::str::stream() + str::stream() << "location object expected, location array not in correct format", locElement.isABSONObj()); @@ -437,7 +437,7 @@ int ExpressionKeysPrivate::hashHaystackElement(const BSONElement& e, double buck // static std::string ExpressionKeysPrivate::makeHaystackString(int hashedX, int hashedY) { - mongoutils::str::stream ss; + str::stream ss; ss << hashedX << "_" << hashedY; return ss; } diff --git a/src/mongo/db/index/expression_params.cpp b/src/mongo/db/index/expression_params.cpp index b53dd786a24..e47ef01a5e6 100644 --- a/src/mongo/db/index/expression_params.cpp +++ b/src/mongo/db/index/expression_params.cpp @@ -35,12 +35,12 @@ #include "mongo/db/index/2d_common.h" #include "mongo/db/index/s2_common.h" #include "mongo/db/index_names.h" -#include "mongo/util/mongoutils/str.h" +#include "mongo/util/str.h" #include "third_party/s2/s2.h" namespace mongo { -using mongoutils::str::stream; +using str::stream; void ExpressionParams::parseTwoDParams(const BSONObj& infoObj, TwoDIndexingParams* out) { BSONObjIterator i(infoObj.getObjectField("key")); diff --git a/src/mongo/db/index/index_access_method.cpp b/src/mongo/db/index/index_access_method.cpp index d06e244a2a0..f017dd20f88 100644 --- a/src/mongo/db/index/index_access_method.cpp +++ b/src/mongo/db/index/index_access_method.cpp @@ -91,8 +91,8 @@ const int TempKeyMaxSize = 1024; // TODO SERVER-36385: Completely remove the key size check in 4.4 Status checkKeySize(const BSONObj& key) { if (key.objsize() >= TempKeyMaxSize) { - std::string msg = mongoutils::str::stream() << "Index key too large to index, failing " - << key.objsize() << ' ' << redact(key); + std::string msg = str::stream() << "Index key too large to index, failing " << key.objsize() + << ' ' << redact(key); return Status(ErrorCodes::KeyTooLong, msg); } return Status::OK(); diff --git a/src/mongo/db/index/s2_key_generator_test.cpp b/src/mongo/db/index/s2_key_generator_test.cpp index e607cdb9876..b57a2b58c43 100644 --- a/src/mongo/db/index/s2_key_generator_test.cpp +++ b/src/mongo/db/index/s2_key_generator_test.cpp @@ -43,7 +43,7 @@ #include "mongo/db/query/collation/collator_interface_mock.h" #include "mongo/unittest/unittest.h" #include "mongo/util/log.h" -#include "mongo/util/mongoutils/str.h" +#include "mongo/util/str.h" using namespace mongo; |