Update upstream source from tag 'upstream/6.0.0'master

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

1 files changed, 24 insertions, 25 deletions

diff --git a/src/mongo/db/pipeline/window_function/window_function_expression.h b/src/mongo/db/pipeline/window_function/window_function_expression.h
index b14a81d1ae3..0d638ac1350 100644
--- a/src/mongo/db/pipeline/window_function/window_function_expression.h
+++ b/src/mongo/db/pipeline/window_function/window_function_expression.h
@@ -189,16 +189,17 @@ public:
         }
     };
 
-    virtual Value serialize(const SerializationOptions& opts) const {
+    virtual Value serialize(boost::optional<ExplainOptions::Verbosity> explain) const {
         MutableDocument args;
 
-        args[_accumulatorName] = _input->serialize(opts);
+        args[_accumulatorName] = _input->serialize(static_cast<bool>(explain));
         MutableDocument windowField;
-        _bounds.serialize(windowField, opts);
+        _bounds.serialize(windowField);
         args[kWindowArg] = windowField.freezeToValue();
         return args.freezeToValue();
     }
 
+
 protected:
     ExpressionContext* _expCtx;
     std::string _accumulatorName;
@@ -325,9 +326,9 @@ public:
                                 << " is not supported as a removable window function");
     }
 
-    Value serialize(const SerializationOptions& opts) const final {
+    Value serialize(boost::optional<ExplainOptions::Verbosity> explain) const final {
         MutableDocument args;
-        args.addField(_accumulatorName, Value(_input->serialize(opts)));
+        args.addField(_accumulatorName, Value(_input->serialize(static_cast<bool>(explain))));
         return args.freezeToValue();
     }
 };
@@ -443,7 +444,7 @@ public:
                                 << " is not supported with a removable window");
     }
 
-    Value serialize(const SerializationOptions& opts) const final {
+    Value serialize(boost::optional<ExplainOptions::Verbosity> explain) const final {
         MutableDocument args;
         args.addField(_accumulatorName, Value(Document()));
         return args.freezeToValue();
@@ -492,17 +493,15 @@ public:
                                 << " is not supported with a removable window");
     }
 
-    Value serialize(const SerializationOptions& opts) const final {
+    Value serialize(boost::optional<ExplainOptions::Verbosity> explain) const final {
         MutableDocument subObj;
         tassert(5433604, "ExpMovingAvg neither N nor alpha was set", _N || _alpha);
         if (_N) {
-            subObj[kNArg] = opts.serializeLiteral(_N.get());
+            subObj[kNArg] = Value(_N.get());
         } else {
-            // Alpha must be between zero and one (exclusive), so choose a legal representative
-            // value if applicable.
-            subObj[kAlphaArg] = opts.serializeLiteral(_alpha.get(), Value(0.1));
+            subObj[kAlphaArg] = Value(_alpha.get());
         }
-        subObj[kInputArg] = _input->serialize(opts);
+        subObj[kInputArg] = _input->serialize(static_cast<bool>(explain));
         MutableDocument outerObj;
         outerObj[kAccName] = subObj.freezeToValue();
         return outerObj.freezeToValue();
@@ -529,15 +528,15 @@ public:
         return _unit;
     }
 
-    Value serialize(const SerializationOptions& opts) const final {
+    Value serialize(boost::optional<ExplainOptions::Verbosity> explain) const final {
         MutableDocument result;
-        result[_accumulatorName][kArgInput] = _input->serialize(opts);
+        result[_accumulatorName][kArgInput] = _input->serialize(static_cast<bool>(explain));
         if (_unit) {
             result[_accumulatorName][kArgUnit] = Value(serializeTimeUnit(*_unit));
         }
 
         MutableDocument windowField;
-        _bounds.serialize(windowField, opts);
+        _bounds.serialize(windowField);
         result[kWindowArg] = windowField.freezeToValue();
         return result.freezeToValue();
     }
@@ -556,7 +555,7 @@ protected:
                 case TimeUnit::year:
                 case TimeUnit::quarter:
                 case TimeUnit::month:
-                    uasserted(5490710, "unit must be 'week' or smaller");
+                    uasserted(5490704, "unit must be 'week' or smaller");
                 // Only these time units are allowed.
                 case TimeUnit::week:
                 case TimeUnit::day:
@@ -804,16 +803,16 @@ public:
     }
 
     boost::intrusive_ptr<AccumulatorState> buildAccumulatorOnly() const final {
-        MONGO_UNREACHABLE_TASSERT(5490704);
+        MONGO_UNREACHABLE_TASSERT(5490701);
     }
 
     std::unique_ptr<WindowFunctionState> buildRemovable() const final {
-        MONGO_UNREACHABLE_TASSERT(5490705);
+        MONGO_UNREACHABLE_TASSERT(5490702);
     }
 
-    Value serialize(const SerializationOptions& opts) const final {
+    Value serialize(boost::optional<ExplainOptions::Verbosity> explain) const final {
         MutableDocument args;
-        args.addField(_accumulatorName, Value(_input->serialize(opts)));
+        args.addField(_accumulatorName, Value(_input->serialize(static_cast<bool>(explain))));
         return args.freezeToValue();
     }
 };
@@ -852,11 +851,11 @@ public:
     }
 
     boost::intrusive_ptr<AccumulatorState> buildAccumulatorOnly() const final {
-        MONGO_UNREACHABLE_TASSERT(5490706);
+        MONGO_UNREACHABLE_TASSERT(5490701);
     }
 
     std::unique_ptr<WindowFunctionState> buildRemovable() const final {
-        MONGO_UNREACHABLE_TASSERT(5490707);
+        MONGO_UNREACHABLE_TASSERT(5490702);
     }
 };
 
@@ -874,11 +873,11 @@ public:
     }
 
     boost::intrusive_ptr<AccumulatorState> buildAccumulatorOnly() const final {
-        MONGO_UNREACHABLE_TASSERT(5490708);
+        MONGO_UNREACHABLE_TASSERT(5490701);
     }
 
     std::unique_ptr<WindowFunctionState> buildRemovable() const final {
-        MONGO_UNREACHABLE_TASSERT(5490709);
+        MONGO_UNREACHABLE_TASSERT(5490702);
     }
 };
 
@@ -905,7 +904,7 @@ public:
           nExpr(std::move(nExpr)),
           sortPattern(std::move(sortPattern)) {}
 
-    Value serialize(const SerializationOptions& opts) const final;
+    Value serialize(boost::optional<ExplainOptions::Verbosity> explain) const final;
 
     boost::intrusive_ptr<AccumulatorState> buildAccumulatorOnly() const final;