Update upstream source from tag 'upstream/6.0.0'master

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

1 files changed, 18 insertions, 2 deletions

diff --git a/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.h b/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.h
index 62edd6ca7d9..4a02ecce883 100644
--- a/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.h
+++ b/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.h
@@ -60,8 +60,7 @@ public:
     std::deque<BSONObj> listCatalog(OperationContext* opCtx) const final;
 
     boost::optional<BSONObj> getCatalogEntry(OperationContext* opCtx,
-                                             const NamespaceString& ns,
-                                             const boost::optional<UUID>& collUUID) const final;
+                                             const NamespaceString& ns) const final;
 
     void appendLatencyStats(OperationContext* opCtx,
                             const NamespaceString& nss,
@@ -143,6 +142,23 @@ protected:
         const Document& documentKey,
         MakePipelineOptions opts);
 
+    /**
+     * Builds an ordered insert op on namespace 'nss' and documents to be written 'objs'.
+     */
+    write_ops::InsertCommandRequest buildInsertOp(const NamespaceString& nss,
+                                                  std::vector<BSONObj>&& objs,
+                                                  bool bypassDocValidation);
+
+    /**
+     * Builds an ordered update op on namespace 'nss' with update entries contained in 'batch'.
+     */
+    write_ops::UpdateCommandRequest buildUpdateOp(
+        const boost::intrusive_ptr<ExpressionContext>& expCtx,
+        const NamespaceString& nss,
+        BatchedObjects&& batch,
+        UpsertType upsert,
+        bool multi);
+
     BSONObj _reportCurrentOpForClient(OperationContext* opCtx,
                                       Client* client,
                                       CurrentOpTruncateMode truncateOps,