Update upstream source from tag 'upstream/6.0.0'master

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

1 files changed, 6 insertions, 17 deletions

diff --git a/src/mongo/db/query/query_solution.cpp b/src/mongo/db/query/query_solution.cpp
index 191218b2f4d..dc24bc3653a 100644
--- a/src/mongo/db/query/query_solution.cpp
+++ b/src/mongo/db/query/query_solution.cpp
@@ -316,11 +316,7 @@ void CollectionScanNode::computeProperties() {
 
 void CollectionScanNode::appendToString(str::stream* ss, int indent) const {
     addIndent(ss, indent);
-    if (doClusteredCollectionScan()) {
-        *ss << "CLUSTERED_IDXSCAN\n";
-    } else {
-        *ss << "COLLSCAN\n";
-    }
+    *ss << "COLLSCAN\n";
     addIndent(ss, indent + 1);
     *ss << "ns = " << name << '\n';
     if (nullptr != filter) {
@@ -337,9 +333,6 @@ QuerySolutionNode* CollectionScanNode::clone() const {
     copy->name = this->name;
     copy->tailable = this->tailable;
     copy->direction = this->direction;
-    copy->minRecord = this->minRecord;
-    copy->maxRecord = this->maxRecord;
-    copy->clusteredIndex = this->clusteredIndex;
     copy->shouldTrackLatestOplogTimestamp = this->shouldTrackLatestOplogTimestamp;
     copy->assertTsHasNotFallenOffOplog = this->assertTsHasNotFallenOffOplog;
     copy->shouldWaitForOplogVisibility = this->shouldWaitForOplogVisibility;
@@ -1090,8 +1083,8 @@ bool IndexScanNode::operator==(const IndexScanNode& other) const {
 // ColumnIndexScanNode
 //
 ColumnIndexScanNode::ColumnIndexScanNode(ColumnIndexEntry indexEntry,
-                                         OrderedPathSet outputFieldsIn,
-                                         OrderedPathSet matchFieldsIn,
+                                         std::set<std::string> outputFieldsIn,
+                                         std::set<std::string> matchFieldsIn,
                                          StringMap<std::unique_ptr<MatchExpression>> filtersByPath,
                                          std::unique_ptr<MatchExpression> postAssemblyFilter)
     : indexEntry(std::move(indexEntry)),
@@ -1566,11 +1559,11 @@ void GroupNode::appendToString(str::stream* ss, int indent) const {
             if (idx > 0) {
                 *ss << ", ";
             }
-            *ss << "{" << groupName << ": " << exprObj->serialize().toString() << "}";
+            *ss << "{" << groupName << ": " << exprObj->serialize(false).toString() << "}";
             ++idx;
         }
     } else {
-        *ss << "{_id: " << groupByExpression->serialize().toString() << "}";
+        *ss << "{_id: " << groupByExpression->serialize(false).toString() << "}";
     }
     *ss << '\n';
     addIndent(ss, indent + 1);
@@ -1581,11 +1574,7 @@ void GroupNode::appendToString(str::stream* ss, int indent) const {
         }
         auto& acc = accumulators[idx];
         *ss << "{" << acc.fieldName << ": {" << acc.expr.name << ": "
-            << acc.expr.argument
-                   ->serialize(SerializationOptions{
-                       boost::make_optional(ExplainOptions::Verbosity::kQueryPlanner)})
-                   .toString()
-            << "}}";
+            << acc.expr.argument->serialize(true).toString() << "}}";
     }
     *ss << "]" << '\n';
     addCommon(ss, indent);