SERVER-40476 remove mongoutils::str

    Rename utils/mongoutils/str.h => utils/str.h
    Rename namespace mongoutils::str => str
    Rename mongo::strcasecmp => str::caseInsensitiveCompare.

12 files changed, 27 insertions, 34 deletions

diff --git a/src/mongo/db/fts/fts_basic_tokenizer.cpp b/src/mongo/db/fts/fts_basic_tokenizer.cpp
index 72f7d3189af..0a46b562955 100644
--- a/src/mongo/db/fts/fts_basic_tokenizer.cpp
+++ b/src/mongo/db/fts/fts_basic_tokenizer.cpp
@@ -37,7 +37,7 @@
 #include "mongo/db/fts/stop_words.h"
 #include "mongo/db/fts/tokenizer.h"
 #include "mongo/stdx/memory.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 #include "mongo/util/stringutils.h"
 
 namespace mongo {
diff --git a/src/mongo/db/fts/fts_element_iterator.cpp b/src/mongo/db/fts/fts_element_iterator.cpp
index bbe09fb2ace..7589904c56e 100644
--- a/src/mongo/db/fts/fts_element_iterator.cpp
+++ b/src/mongo/db/fts/fts_element_iterator.cpp
@@ -30,7 +30,7 @@
 #include "mongo/db/fts/fts_element_iterator.h"
 #include "mongo/db/fts/fts_spec.h"
 #include "mongo/db/fts/fts_util.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 #include "mongo/util/stringutils.h"
 
 #include <stack>
@@ -63,7 +63,7 @@ inline bool _matchPrefix(const string& dottedName, const string& weight) {
     if (weight == dottedName) {
         return true;
     }
-    return mongoutils::str::startsWith(weight, dottedName + '.');
+    return str::startsWith(weight, dottedName + '.');
 }
 }
 
diff --git a/src/mongo/db/fts/fts_index_format.cpp b/src/mongo/db/fts/fts_index_format.cpp
index 4c7902146d8..2bcf35ff398 100644
--- a/src/mongo/db/fts/fts_index_format.cpp
+++ b/src/mongo/db/fts/fts_index_format.cpp
@@ -38,7 +38,7 @@
 #include "mongo/db/server_options.h"
 #include "mongo/util/hex.h"
 #include "mongo/util/md5.hpp"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 namespace mongo {
 
@@ -165,10 +165,10 @@ void FTSIndexFormat::getKeys(const FTSSpec& spec, const BSONObj& obj, BSONObjSet
         serverGlobalParams.featureCompatibility.getVersion() ==
             ServerGlobalParams::FeatureCompatibility::Version::kFullyDowngradedTo40) {
         uassert(16732,
-                mongoutils::str::stream() << "too many unique keys for a single document to"
-                                          << " have a text index, max is "
-                                          << term_freqs.size()
-                                          << obj["_id"],
+                str::stream() << "too many unique keys for a single document to"
+                              << " have a text index, max is "
+                              << term_freqs.size()
+                              << obj["_id"],
                 term_freqs.size() <= 400000);
     }
 
@@ -204,11 +204,10 @@ void FTSIndexFormat::getKeys(const FTSSpec& spec, const BSONObj& obj, BSONObjSet
             serverGlobalParams.featureCompatibility.getVersion() ==
                 ServerGlobalParams::FeatureCompatibility::Version::kFullyDowngradedTo40) {
             uassert(16733,
-                    mongoutils::str::stream()
-                        << "trying to index text where term list is too big, max is "
-                        << MaxKeyBSONSizeMB
-                        << "mb "
-                        << obj["_id"],
+                    str::stream() << "trying to index text where term list is too big, max is "
+                                  << MaxKeyBSONSizeMB
+                                  << "mb "
+                                  << obj["_id"],
                     keyBSONSize <= (MaxKeyBSONSizeMB * 1024 * 1024));
         }
     }
diff --git a/src/mongo/db/fts/fts_index_format_test.cpp b/src/mongo/db/fts/fts_index_format_test.cpp
index 990d1e4122f..b847d16dd9d 100644
--- a/src/mongo/db/fts/fts_index_format_test.cpp
+++ b/src/mongo/db/fts/fts_index_format_test.cpp
@@ -39,7 +39,7 @@
 #include "mongo/db/fts/fts_spec.h"
 #include "mongo/unittest/unittest.h"
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 namespace mongo {
 
@@ -139,7 +139,7 @@ void assertEqualsIndexKeys(std::set<std::string>& expectedKeys, const BSONObjSet
         string s = key.firstElement().String();
         std::set<string>::const_iterator j = expectedKeys.find(s);
         if (j == expectedKeys.end()) {
-            mongoutils::str::stream ss;
+            str::stream ss;
             ss << "unexpected key " << s << " in FTSIndexFormat::getKeys result. "
                << "expected keys:";
             for (std::set<string>::const_iterator k = expectedKeys.begin(); k != expectedKeys.end();
@@ -166,7 +166,7 @@ TEST(FTSIndexFormat, LongWordsTextIndexVersion1) {
     string longWordCat = longPrefix + "cat";
     // "aaa...aaasat"
     string longWordSat = longPrefix + "sat";
-    string text = mongoutils::str::stream() << longWordCat << " " << longWordSat;
+    string text = str::stream() << longWordCat << " " << longWordSat;
     FTSIndexFormat::getKeys(spec, BSON("data" << text), &keys);
 
     // Hard-coded expected computed keys for future-proofing.
@@ -198,8 +198,7 @@ TEST(FTSIndexFormat, LongWordTextIndexVersion2) {
     string longWordSat = longPrefix + "sat";
     // "aaa...aaamongodbfts"
     string longWordMongoDBFts = longPrefix + "mongodbfts";
-    string text = mongoutils::str::stream() << longWordCat << " " << longWordSat << " "
-                                            << longWordMongoDBFts;
+    string text = str::stream() << longWordCat << " " << longWordSat << " " << longWordMongoDBFts;
     FTSIndexFormat::getKeys(spec, BSON("data" << text), &keys);
 
     // Hard-coded expected computed keys for future-proofing.
@@ -231,7 +230,7 @@ TEST(FTSIndexFormat, LongWordTextIndexVersion3) {
     string longWordCat = longPrefix + "cat";
     // "aaa...aaasat"
     string longWordSat = longPrefix + "sat";
-    string text = mongoutils::str::stream() << longWordCat << " " << longWordSat;
+    string text = str::stream() << longWordCat << " " << longWordSat;
     FTSIndexFormat::getKeys(spec, BSON("data" << text), &keys);
 
     // Hard-coded expected computed keys for future-proofing.
diff --git a/src/mongo/db/fts/fts_language.cpp b/src/mongo/db/fts/fts_language.cpp
index c668bf849d0..518c8a8e9f4 100644
--- a/src/mongo/db/fts/fts_language.cpp
+++ b/src/mongo/db/fts/fts_language.cpp
@@ -38,7 +38,7 @@
 #include "mongo/db/fts/fts_unicode_tokenizer.h"
 #include "mongo/stdx/memory.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 #include "mongo/util/string_map.h"
 #include "mongo/util/stringutils.h"
 
@@ -278,9 +278,8 @@ StatusWithFTSLanguage FTSLanguage::make(StringData langName, TextIndexVersion te
 
         if (it == languageMap->end()) {
             // TEXT_INDEX_VERSION_2 and above reject unrecognized language strings.
-            Status status =
-                Status(ErrorCodes::BadValue,
-                       mongoutils::str::stream() << "unsupported language: \"" << langName
+            Status status = Status(ErrorCodes::BadValue,
+                                   str::stream() << "unsupported language: \"" << langName
                                                  << "\" for text index version "
                                                  << textIndexVersion);
             return StatusWithFTSLanguage(status);
diff --git a/src/mongo/db/fts/fts_query_impl.cpp b/src/mongo/db/fts/fts_query_impl.cpp
index e9eff03a5ea..4fc03b24746 100644
--- a/src/mongo/db/fts/fts_query_impl.cpp
+++ b/src/mongo/db/fts/fts_query_impl.cpp
@@ -35,15 +35,13 @@
 #include "mongo/db/fts/fts_spec.h"
 #include "mongo/db/fts/fts_tokenizer.h"
 #include "mongo/stdx/memory.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 #include "mongo/util/stringutils.h"
 
 namespace mongo {
 
 namespace fts {
 
-using namespace mongoutils;
-
 using std::set;
 using std::string;
 using std::stringstream;
diff --git a/src/mongo/db/fts/fts_query_parser.cpp b/src/mongo/db/fts/fts_query_parser.cpp
index bb2d05dbb32..4d86580374b 100644
--- a/src/mongo/db/fts/fts_query_parser.cpp
+++ b/src/mongo/db/fts/fts_query_parser.cpp
@@ -30,7 +30,7 @@
 #include <string>
 
 #include "mongo/db/fts/fts_query_parser.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 #include "mongo/util/stringutils.h"
 
 namespace mongo {
diff --git a/src/mongo/db/fts/fts_spec.cpp b/src/mongo/db/fts/fts_spec.cpp
index 14bb7b8bfdc..ec320a562f6 100644
--- a/src/mongo/db/fts/fts_spec.cpp
+++ b/src/mongo/db/fts/fts_spec.cpp
@@ -37,7 +37,7 @@
 #include "mongo/db/fts/fts_tokenizer.h"
 #include "mongo/db/fts/fts_util.h"
 #include "mongo/db/matcher/expression_parser.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 #include "mongo/util/stringutils.h"
 
 namespace mongo {
@@ -46,7 +46,6 @@ namespace fts {
 
 using std::map;
 using std::string;
-using namespace mongoutils;
 namespace dps = ::mongo::dotted_path_support;
 
 const double DEFAULT_WEIGHT = 1;
diff --git a/src/mongo/db/fts/fts_spec_legacy.cpp b/src/mongo/db/fts/fts_spec_legacy.cpp
index dcb7357166b..b5e61b2f535 100644
--- a/src/mongo/db/fts/fts_spec_legacy.cpp
+++ b/src/mongo/db/fts/fts_spec_legacy.cpp
@@ -30,7 +30,7 @@
 #include "mongo/db/fts/fts_spec.h"
 
 #include "mongo/db/bson/dotted_path_support.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 #include "mongo/util/stringutils.h"
 
 namespace mongo {
@@ -44,7 +44,6 @@ namespace fts {
 
 using std::map;
 using std::string;
-using namespace mongoutils;
 
 namespace dps = ::mongo::dotted_path_support;
 
diff --git a/src/mongo/db/fts/fts_unicode_tokenizer.cpp b/src/mongo/db/fts/fts_unicode_tokenizer.cpp
index 404cea9a8b6..f4db4881cb5 100644
--- a/src/mongo/db/fts/fts_unicode_tokenizer.cpp
+++ b/src/mongo/db/fts/fts_unicode_tokenizer.cpp
@@ -37,7 +37,7 @@
 #include "mongo/db/fts/stop_words.h"
 #include "mongo/db/fts/tokenizer.h"
 #include "mongo/stdx/memory.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 #include "mongo/util/stringutils.h"
 
 namespace mongo {
diff --git a/src/mongo/db/fts/stemmer.cpp b/src/mongo/db/fts/stemmer.cpp
index e7b0e899fe1..db5e97227da 100644
--- a/src/mongo/db/fts/stemmer.cpp
+++ b/src/mongo/db/fts/stemmer.cpp
@@ -30,7 +30,7 @@
 #include <cstdlib>
 
 #include "mongo/db/fts/stemmer.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/fts/tokenizer.cpp b/src/mongo/db/fts/tokenizer.cpp
index 56ee663ca55..2847f7486a8 100644
--- a/src/mongo/db/fts/tokenizer.cpp
+++ b/src/mongo/db/fts/tokenizer.cpp
@@ -30,7 +30,7 @@
 #include <string>
 
 #include "mongo/db/fts/tokenizer.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 #include "mongo/util/stringutils.h"
 
 namespace mongo {