SERVER-40463 String utils output StringData instead of std::string

3 files changed, 10 insertions, 13 deletions

diff --git a/src/mongo/db/query/parsed_projection.cpp b/src/mongo/db/query/parsed_projection.cpp
index 415087e7fb1..aaa3bd36f3d 100644
--- a/src/mongo/db/query/parsed_projection.cpp
+++ b/src/mongo/db/query/parsed_projection.cpp
@@ -231,15 +231,15 @@ Status ParsedProjection::make(OperationContext* opCtx,
                               "Cannot specify positional operator and $elemMatch.");
             }
 
-            std::string after = str::after(elem.fieldName(), ".$");
-            if (str::contains(after, ".$")) {
+            StringData after = str::after(elem.fieldNameStringData(), ".$");
+            if (after.find(".$"_sd) != std::string::npos) {
                 str::stream ss;
                 ss << "Positional projection '" << elem.fieldName() << "' contains "
                    << "the positional operator more than once.";
                 return Status(ErrorCodes::BadValue, ss);
             }
 
-            std::string matchfield = str::before(elem.fieldName(), '.');
+            StringData matchfield = str::before(elem.fieldNameStringData(), '.');
             if (query && !_hasPositionalOperatorMatch(query, matchfield)) {
                 str::stream ss;
                 ss << "Positional projection '" << elem.fieldName() << "' does not "
@@ -388,7 +388,7 @@ bool ParsedProjection::_isPositionalOperator(const char* fieldName) {
 
 // static
 bool ParsedProjection::_hasPositionalOperatorMatch(const MatchExpression* const query,
-                                                   const std::string& matchfield) {
+                                                   StringData matchfield) {
     if (query->getCategory() == MatchExpression::MatchCategory::kLogical) {
         for (unsigned int i = 0; i < query->numChildren(); ++i) {
             if (_hasPositionalOperatorMatch(query->getChild(i), matchfield)) {
@@ -397,14 +397,13 @@ bool ParsedProjection::_hasPositionalOperatorMatch(const MatchExpression* const
         }
     } else {
         StringData queryPath = query->path();
-        const char* pathRawData = queryPath.rawData();
         // We have to make a distinction between match expressions that are
         // initialized with an empty field/path name "" and match expressions
         // for which the path is not meaningful (eg. $where).
-        if (!pathRawData) {
+        if (!queryPath.rawData()) {
             return false;
         }
-        std::string pathPrefix = str::before(pathRawData, '.');
+        StringData pathPrefix = str::before(queryPath, '.');
         return pathPrefix == matchfield;
     }
     return false;
diff --git a/src/mongo/db/query/parsed_projection.h b/src/mongo/db/query/parsed_projection.h
index e22a594a528..0a5ee6de3c2 100644
--- a/src/mongo/db/query/parsed_projection.h
+++ b/src/mongo/db/query/parsed_projection.h
@@ -144,7 +144,7 @@ private:
      * Does not take ownership of 'query'.
      */
     static bool _hasPositionalOperatorMatch(const MatchExpression* const query,
-                                            const std::string& matchfield);
+                                            StringData matchfield);
 
     // Track fields needed by the projection so that the query planner can perform projection
     // analysis and possibly give us a covered projection.
diff --git a/src/mongo/db/query/plan_enumerator.cpp b/src/mongo/db/query/plan_enumerator.cpp
index 8bc87ce75cb..7c6d498007c 100644
--- a/src/mongo/db/query/plan_enumerator.cpp
+++ b/src/mongo/db/query/plan_enumerator.cpp
@@ -48,11 +48,9 @@ using std::string;
 using std::vector;
 
 std::string getPathPrefix(std::string path) {
-    if (str::contains(path, '.')) {
-        return str::before(path, '.');
-    } else {
-        return path;
-    }
+    if (auto dot = path.find('.'); dot != path.npos)
+        path.resize(dot);
+    return path;
 }
 
 /**