diff options
author | Billy Donahue <billy.donahue@mongodb.com> | 2019-04-08 16:27:50 -0400 |
---|---|---|
committer | Billy Donahue <billy.donahue@mongodb.com> | 2019-04-09 15:38:40 -0400 |
commit | 1041dd848e25e879260d1015d8da4f72ee7993fe (patch) | |
tree | f8ddb4ee7c841e4ef790ea7bd53e75c0a09c4cc2 /src/mongo/db/matcher | |
parent | 8cdc51e7810f7fd8898a4c60b935e389f04659ee (diff) | |
download | mongo-1041dd848e25e879260d1015d8da4f72ee7993fe.tar.gz |
SERVER-40476 remove mongoutils::str
Rename utils/mongoutils/str.h => utils/str.h
Rename namespace mongoutils::str => str
Rename mongo::strcasecmp => str::caseInsensitiveCompare.
Diffstat (limited to 'src/mongo/db/matcher')
-rw-r--r-- | src/mongo/db/matcher/expression_geo.cpp | 7 | ||||
-rw-r--r-- | src/mongo/db/matcher/expression_leaf.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/matcher/expression_optimize_test.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/matcher/expression_parser.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/matcher/matcher.cpp | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/src/mongo/db/matcher/expression_geo.cpp b/src/mongo/db/matcher/expression_geo.cpp index 34596d34c45..99081c3e910 100644 --- a/src/mongo/db/matcher/expression_geo.cpp +++ b/src/mongo/db/matcher/expression_geo.cpp @@ -36,7 +36,7 @@ #include "mongo/db/matcher/expression_parser.h" #include "mongo/platform/basic.h" #include "mongo/util/log.h" -#include "mongo/util/mongoutils/str.h" +#include "mongo/util/str.h" namespace mongo { @@ -216,7 +216,7 @@ Status GeoNearExpression::parseNewQuery(const BSONObj& obj) { // Just one arg. to $geoNear. if (objIt.more()) { return Status(ErrorCodes::BadValue, - mongoutils::str::stream() + str::stream() << "geo near accepts just one argument when querying for a GeoJSON " << "point. Extra field found: " << objIt.next()); @@ -231,8 +231,7 @@ Status GeoNearExpression::parseNewQuery(const BSONObj& obj) { if (PathAcceptingKeyword::GEO_NEAR != MatchExpressionParser::parsePathAcceptingKeyword(e)) { return Status(ErrorCodes::BadValue, - mongoutils::str::stream() << "invalid geo near query operator: " - << e.fieldName()); + str::stream() << "invalid geo near query operator: " << e.fieldName()); } // Iterate over the argument. diff --git a/src/mongo/db/matcher/expression_leaf.cpp b/src/mongo/db/matcher/expression_leaf.cpp index 7327f3c4a86..e379c1c24d0 100644 --- a/src/mongo/db/matcher/expression_leaf.cpp +++ b/src/mongo/db/matcher/expression_leaf.cpp @@ -44,8 +44,8 @@ #include "mongo/db/matcher/path.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/stdx/memory.h" -#include "mongo/util/mongoutils/str.h" #include "mongo/util/regex_util.h" +#include "mongo/util/str.h" namespace mongo { diff --git a/src/mongo/db/matcher/expression_optimize_test.cpp b/src/mongo/db/matcher/expression_optimize_test.cpp index 956a5d96ef9..ba9345a84a1 100644 --- a/src/mongo/db/matcher/expression_optimize_test.cpp +++ b/src/mongo/db/matcher/expression_optimize_test.cpp @@ -55,7 +55,7 @@ MatchExpression* parseMatchExpression(const BSONObj& obj) { ExtensionsCallbackNoop(), MatchExpressionParser::kAllowAllSpecialFeatures); if (!status.isOK()) { - mongoutils::str::stream ss; + str::stream ss; ss << "failed to parse query: " << obj.toString() << ". Reason: " << status.getStatus().toString(); FAIL(ss); diff --git a/src/mongo/db/matcher/expression_parser.cpp b/src/mongo/db/matcher/expression_parser.cpp index df0351cc1b9..182ff15aa25 100644 --- a/src/mongo/db/matcher/expression_parser.cpp +++ b/src/mongo/db/matcher/expression_parser.cpp @@ -67,7 +67,7 @@ #include "mongo/db/namespace_string.h" #include "mongo/db/query/query_knobs_gen.h" #include "mongo/stdx/memory.h" -#include "mongo/util/mongoutils/str.h" +#include "mongo/util/str.h" #include "mongo/util/string_map.h" namespace { diff --git a/src/mongo/db/matcher/matcher.cpp b/src/mongo/db/matcher/matcher.cpp index d51ed4b2061..4faf2fe44bf 100644 --- a/src/mongo/db/matcher/matcher.cpp +++ b/src/mongo/db/matcher/matcher.cpp @@ -35,8 +35,8 @@ #include "mongo/db/matcher/expression_parser.h" #include "mongo/db/matcher/matcher.h" #include "mongo/db/matcher/path.h" -#include "mongo/util/mongoutils/str.h" #include "mongo/util/stacktrace.h" +#include "mongo/util/str.h" namespace mongo { |