Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 5 insertions, 23 deletions

diff --git a/src/mongo/db/pipeline/variables.cpp b/src/mongo/db/pipeline/variables.cpp
index 279b8630ce6..26793962efd 100644
--- a/src/mongo/db/pipeline/variables.cpp
+++ b/src/mongo/db/pipeline/variables.cpp
@@ -40,21 +40,6 @@
 
 namespace mongo {
 
-namespace {
-
-// We need to be careful when serializing values, e.g. to populate the 'let' parameter of a command
-// to be sent over the wire. First, missing values should be serialied as $$REMOVE, otherwise they
-// might be incorrectly omitted or serialized as empty objects ({}). Also, we should wrap values in
-// $literal to avoid a scenario like the following: suppose we had a user-defined 'let' specified as
-// {let: {a: {$literal: "$notAFieldName"}}}. On mongos, this will be evaluated to the string
-// "$notAFieldName". When we serialize it again for the shard commands, it must appear as {$literal:
-// "$notAFieldName"}, not simply "$notAFieldName", since the latter will be treated as a field name
-// by mongods.
-Value serializeValue(Value val) {
-    return val.missing() ? Value("$$REMOVE"_sd) : Value(DOC("$literal" << val));
-}
-}  // namespace
-
 using namespace std::string_literals;
 
 constexpr Variables::Id Variables::kRootId;
@@ -345,8 +330,7 @@ LegacyRuntimeConstants Variables::transitionalExtractRuntimeConstants() const {
 }
 
 Variables::Id VariablesParseState::defineVariable(StringData name) {
-    // Caller should have validated before hand by using
-    // variableValidation::validateNameForUserWrite.
+    // Caller should have validated before hand by using variableValidationvalidateNameForUserWrite.
     massert(17275,
             "Can't redefine a non-user-writable variable",
             Variables::kBuiltinVarNameToId.find(name) == Variables::kBuiltinVarNameToId.end());
@@ -390,9 +374,8 @@ std::set<Variables::Id> VariablesParseState::getDefinedVariableIDs() const {
 BSONObj VariablesParseState::serialize(const Variables& vars) const {
     auto bob = BSONObjBuilder{};
     for (auto&& [var_name, id] : _variables)
-        if (vars.hasValue(id)) {
-            bob << var_name << serializeValue(vars.getValue(id));
-        }
+        if (vars.hasValue(id))
+            bob << var_name << Value(DOC("$literal" << vars.getValue(id)));
 
     // System variables have to be added separately since the variable IDs are reserved and not
     // allocated like normal variables, and so not present in '_variables'.
@@ -404,9 +387,8 @@ std::pair<LegacyRuntimeConstants, BSONObj> VariablesParseState::transitionalComp
     const Variables& vars) const {
     auto bob = BSONObjBuilder{};
     for (auto&& [var_name, id] : _variables)
-        if (vars.hasValue(id)) {
-            bob << var_name << serializeValue(vars.getValue(id));
-        }
+        if (vars.hasValue(id))
+            bob << var_name << Value(DOC("$literal" << vars.getValue(id)));
 
     return {vars.transitionalExtractRuntimeConstants(), bob.obj()};
 }