Update upstream source from tag 'upstream/6.0.0'master

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

1 files changed, 3 insertions, 6 deletions

diff --git a/src/mongo/db/pipeline/window_function/window_function_expression.cpp b/src/mongo/db/pipeline/window_function/window_function_expression.cpp
index a46bac72dfa..54f0552b59b 100644
--- a/src/mongo/db/pipeline/window_function/window_function_expression.cpp
+++ b/src/mongo/db/pipeline/window_function/window_function_expression.cpp
@@ -37,7 +37,6 @@
 #include "mongo/db/pipeline/document_source_set_window_fields_gen.h"
 #include "mongo/db/pipeline/lite_parsed_document_source.h"
 #include "mongo/db/query/query_feature_flags_gen.h"
-#include "mongo/db/stats/counters.h"
 
 #include "mongo/db/pipeline/window_function/partition_iterator.h"
 #include "mongo/db/pipeline/window_function/window_function_exec.h"
@@ -153,7 +152,6 @@ intrusive_ptr<Expression> Expression::parse(BSONObj obj,
                 assertLanguageFeatureIsAllowed(
                     opCtx, exprName, allowedWithApi, AllowedWithClientType::kAny);
 
-                expCtx->incrementWindowAccumulatorExprCounter(exprName);
                 return parser(obj, sortBy, expCtx);
             }
 
@@ -189,7 +187,6 @@ void Expression::registerParser(
     AllowedWithApiStrict allowedWithApi) {
     invariant(parserMap.find(functionName) == parserMap.end());
     ExpressionParserRegistration r{parser, requiredMinVersion, allowedWithApi};
-    operatorCountersWindowAccumulatorExpressions.addCounter(functionName);
     parserMap.emplace(std::move(functionName), std::move(r));
 }
 
@@ -310,12 +307,12 @@ boost::intrusive_ptr<Expression> ExpressionFirstLast::parse(
 
 template <typename WindowFunctionN, typename AccumulatorNType>
 Value ExpressionN<WindowFunctionN, AccumulatorNType>::serialize(
-    const SerializationOptions& opts) const {
+    boost::optional<ExplainOptions::Verbosity> explain) const {
     auto acc = buildAccumulatorOnly();
-    MutableDocument result(acc->serialize(nExpr, _input, opts));
+    MutableDocument result(acc->serialize(nExpr, _input, static_cast<bool>(explain)));
 
     MutableDocument windowField;
-    _bounds.serialize(windowField, opts);
+    _bounds.serialize(windowField);
     result[kWindowArg] = windowField.freezeToValue();
     return result.freezeToValue();
 }