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

diff --git a/src/mongo/db/views/view_graph.cpp b/src/mongo/db/views/view_graph.cpp
index 716dd4e9d32..4282a0469a4 100644
--- a/src/mongo/db/views/view_graph.cpp
+++ b/src/mongo/db/views/view_graph.cpp
@@ -126,9 +126,10 @@ void ViewGraph::insertWithoutValidating(const ViewDefinition& view,
     // pointers for its children.
     Node* node = &(_graph[nodeId]);
     invariant(node->children.empty());
+    invariant(!static_cast<bool>(node->collator));
 
     node->size = pipelineSize;
-    node->collator = CollatorInterface::cloneCollator(view.defaultCollator());
+    node->collator = view.defaultCollator();
 
     for (const NamespaceString& childNss : refs) {
         uint64_t childId = _getNodeId(childNss);
@@ -164,7 +165,7 @@ void ViewGraph::remove(const NamespaceString& viewNss) {
     // This node no longer represents a view, so its children must be cleared and its collator
     // unset.
     node->children.clear();
-    node->collator = nullptr;
+    node->collator = boost::none;
 
     // Only remove node if there are no remaining references to this node.
     if (node->parents.size() == 0) {