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, 7 deletions

diff --git a/src/mongo/db/pipeline/expression_trim_test.cpp b/src/mongo/db/pipeline/expression_trim_test.cpp
index bf5a5d63302..620b371c5f7 100644
--- a/src/mongo/db/pipeline/expression_trim_test.cpp
+++ b/src/mongo/db/pipeline/expression_trim_test.cpp
@@ -722,16 +722,14 @@ TEST(ExpressionTrimTest, DoesSerializeCorrectly) {
                                             BSON("$trim" << BSON("input"
                                                                  << " abc ")),
                                             expCtx.variablesParseState);
-    ASSERT_VALUE_EQ(trim->serialize(),
-                    trim->serialize(SerializationOptions{
-                        boost::make_optional(ExplainOptions::Verbosity::kQueryPlanner)}));
+    ASSERT_VALUE_EQ(trim->serialize(false), trim->serialize(true));
     ASSERT_VALUE_EQ(
-        trim->serialize(),
+        trim->serialize(false),
         Value(Document{{"$trim", Document{{"input", Document{{"$const", " abc "_sd}}}}}}));
 
     // Make sure we can re-parse it and evaluate it.
     auto reparsedTrim = Expression::parseExpression(
-        &expCtx, trim->serialize().getDocument().toBson(), expCtx.variablesParseState);
+        &expCtx, trim->serialize(false).getDocument().toBson(), expCtx.variablesParseState);
     ASSERT_VALUE_EQ(reparsedTrim->evaluate({}, &expCtx.variables), Value("abc"_sd));
 
     // Use $ltrim, and specify the 'chars' option.
@@ -742,12 +740,12 @@ TEST(ExpressionTrimTest, DoesSerializeCorrectly) {
                                                              << "$$CURRENT.a")),
                                        expCtx.variablesParseState);
     ASSERT_VALUE_EQ(
-        trim->serialize(),
+        trim->serialize(false),
         Value(Document{{"$ltrim", Document{{"input", "$inputField"_sd}, {"chars", "$a"_sd}}}}));
 
     // Make sure we can re-parse it and evaluate it.
     reparsedTrim = Expression::parseExpression(
-        &expCtx, trim->serialize().getDocument().toBson(), expCtx.variablesParseState);
+        &expCtx, trim->serialize(false).getDocument().toBson(), expCtx.variablesParseState);
     ASSERT_VALUE_EQ(reparsedTrim->evaluate(Document{{"inputField", " , 4"_sd}, {"a", " ,"_sd}},
                                            &expCtx.variables),
                     Value("4"_sd));