SERVER-55180 Convert SBE from std::string_view to StringData

Author: BillyDonahue

src/mongo/base/string_data.h

@@ -89,12 +89,6 @@ class StringData {
      */
     StringData(const std::string& s) : StringData(s.data(), s.length(), TrustedInitTag()) {}
 
-    /**
-     * Implicitly convert a std::string_view to a StringData. We can use the trusted
-     * init path because string_view::data() points to length() bytes of data.
-     */
-    StringData(std::string_view s) : StringData(s.data(), s.length(), TrustedInitTag()) {}
-
     /**
      * Constructs a StringData with an explicit length. 'c' must
      * either be nullptr (in which case len must be zero), or be a
@@ -111,18 +105,6 @@ class StringData {
         return toString();
     }
 
-    /**
-     * Implicitly convert to a std::string_view.
-     */
-    operator std::string_view() const {
-        // std::string_view produces undefined behaviour if [pointer, pointer + size) is not a valid
-        // range. To fix this we explicitly use default constructor if StringData contains nullptr.
-        if (MONGO_unlikely(rawData() == nullptr)) {
-            return {};
-        }
-        return {rawData(), size()};
-    }
-
     /**
      * Constructs a StringData with begin and end iterators. begin points to the beginning of the
      * string. end points to the position past the end of the string. In a null-terminated string,

src/mongo/db/exec/sbe/expressions/expression.h

@@ -317,7 +317,7 @@ auto makeSV(Args&&... args) {
 class EConstant final : public EExpression {
 public:
     EConstant(value::TypeTags tag, value::Value val) : _tag(tag), _val(val) {}
-    EConstant(std::string_view str) {
+    EConstant(StringData str) {
         // Views are non-owning so we have to make a copy.
         std::tie(_tag, _val) = value::makeNewString(str);
     }
@@ -448,7 +448,7 @@ class EPrimUnary final : public EExpression {
  */
 class EFunction final : public EExpression {
 public:
-    EFunction(std::string_view name, std::vector<std::unique_ptr<EExpression>> args) : _name(name) {
+    EFunction(StringData name, std::vector<std::unique_ptr<EExpression>> args) : _name(name) {
         _nodes = std::move(args);
         validateNodes();
     }
@@ -513,7 +513,7 @@ class ELocalBind final : public EExpression {
  */
 class EFail final : public EExpression {
 public:
-    EFail(ErrorCodes::Error code, std::string_view message) : _code(code) {
+    EFail(ErrorCodes::Error code, StringData message) : _code(code) {
         std::tie(_messageTag, _messageVal) = value::makeNewString(message);
     }
 

src/mongo/db/exec/sbe/expressions/sbe_concat_test.cpp

@@ -33,8 +33,7 @@
 namespace mongo::sbe {
 class SBEConcatTest : public EExpressionTestFixture {
 protected:
-    void runAndAssertExpression(const vm::CodeFragment* compiledExpr,
-                                std::string_view expectedVal) {
+    void runAndAssertExpression(const vm::CodeFragment* compiledExpr, StringData expectedVal) {
         auto [tag, val] = runCompiledExpression(compiledExpr);
         value::ValueGuard guard(tag, val);
 

src/mongo/db/exec/sbe/expressions/sbe_regex_test.cpp

@@ -32,8 +32,7 @@
 namespace mongo::sbe {
 class SBERegexTest : public EExpressionTestFixture {
 protected:
-    void runAndAssertRegexCompile(const vm::CodeFragment* compiledExpr,
-                                  std::string_view regexString) {
+    void runAndAssertRegexCompile(const vm::CodeFragment* compiledExpr, StringData regexString) {
         auto [tag, val] = runCompiledExpression(compiledExpr);
         value::ValueGuard guard(tag, val);
 
@@ -53,7 +52,7 @@ class SBERegexTest : public EExpressionTestFixture {
     }
 
     void runAndAssertFindExpression(const vm::CodeFragment* compiledExpr,
-                                    std::string_view expectedMatch,
+                                    StringData expectedMatch,
                                     int idx) {
         auto [tag, val] = runCompiledExpression(compiledExpr);
         value::ValueGuard guard(tag, val);
@@ -72,7 +71,7 @@ class SBERegexTest : public EExpressionTestFixture {
         ASSERT_EQUALS(value::numericCast<int32_t>(idxTag, idxVal), idx);
     }
 
-    void addMatchResult(value::Array* arrayPtr, std::string_view matchStr, int32_t idx) {
+    void addMatchResult(value::Array* arrayPtr, StringData matchStr, int32_t idx) {
         auto [objTag, objVal] = value::makeNewObject();
         value::ValueGuard objGuard{objTag, objVal};
         auto obj = value::getObjectView(objVal);

src/mongo/db/exec/sbe/parser/parser.cpp

@@ -1161,7 +1161,7 @@ std::unique_ptr<PlanStage> Parser::walkPathValue(AstQuery& ast,
                 std::move(inputStage),
                 getCurrentPlanNodeId(),
                 outputSlot,
-                makeE<EFunction>("getField"sv,
+                makeE<EFunction>("getField"_sd,
                                  makeEs(makeE<EVariable>(inputSlot),
                                         makeE<EConstant>(ast.nodes[0]->identifier))));
         }
@@ -1172,7 +1172,7 @@ std::unique_ptr<PlanStage> Parser::walkPathValue(AstQuery& ast,
             makeProjectStage(std::move(inputStage),
                              getCurrentPlanNodeId(),
                              traverseIn,
-                             makeE<EFunction>("getField"sv,
+                             makeE<EFunction>("getField"_sd,
                                               makeEs(makeE<EVariable>(inputSlot),
                                                      makeE<EConstant>(ast.nodes[0]->identifier))));
         auto in = makeS<LimitSkipStage>(

src/mongo/db/exec/sbe/sbe_filter_test.cpp

@@ -33,7 +33,6 @@
 
 #include "mongo/platform/basic.h"
 
-#include <string_view>
 
 #include "mongo/db/exec/sbe/sbe_plan_stage_test.h"
 #include "mongo/db/exec/sbe/stages/filter.h"
@@ -148,7 +147,7 @@ TEST_F(FilterStageTest, FilterIsNumberTest) {
         // Build a FilterStage whose filter expression is "isNumber(scanSlot)".
         auto filter = makeS<FilterStage<false>>(
             std::move(scanStage),
-            makeE<EFunction>("isNumber"sv, makeEs(makeE<EVariable>(scanSlot))),
+            makeE<EFunction>("isNumber"_sd, makeEs(makeE<EVariable>(scanSlot))),
             kEmptyPlanNodeId);
 
         return std::make_pair(scanSlot, std::move(filter));

src/mongo/db/exec/sbe/sbe_hash_agg_test.cpp

@@ -33,7 +33,6 @@
 
 #include "mongo/platform/basic.h"
 
-#include <string_view>
 
 #include "mongo/db/exec/sbe/sbe_plan_stage_test.h"
 #include "mongo/db/exec/sbe/stages/hash_agg.h"
@@ -115,7 +114,7 @@ TEST_F(HashAggStageTest, HashAggAddToSetTest) {
 
     auto [expectedTag, expectedVal] = value::makeNewArray();
     value::ValueGuard expectedGuard{expectedTag, expectedVal};
-    for (auto&& sv : std::array<std::string_view, 4>{"Aa", "BB", "cc", "dD"}) {
+    for (auto&& sv : std::array<StringData, 4>{"Aa", "BB", "cc", "dD"}) {
         auto [tag, val] = value::makeNewString(sv);
         value::getArrayView(expectedVal)->push_back(tag, val);
     }

src/mongo/db/exec/sbe/sbe_hash_join_test.cpp

@@ -33,7 +33,6 @@
 
 #include "mongo/platform/basic.h"
 
-#include <string_view>
 
 #include "mongo/db/exec/sbe/sbe_plan_stage_test.h"
 #include "mongo/db/exec/sbe/stages/hash_join.h"

src/mongo/db/exec/sbe/sbe_plan_stage_test.cpp

@@ -36,7 +36,6 @@
 
 #include "mongo/db/exec/sbe/sbe_plan_stage_test.h"
 
-#include <string_view>
 
 #include "mongo/logv2/log.h"
 

src/mongo/db/exec/sbe/sbe_sort_test.cpp

@@ -29,7 +29,6 @@
 
 #include "mongo/platform/basic.h"
 
-#include <string_view>
 
 #include "mongo/db/exec/sbe/sbe_plan_stage_test.h"
 #include "mongo/db/exec/sbe/stages/sort.h"