Update upstream source from tag 'upstream/6.0.0'master

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

1 files changed, 2 insertions, 11 deletions

diff --git a/src/mongo/db/op_observer_impl.h b/src/mongo/db/op_observer_impl.h
index ffe4cf96399..77676e9548e 100644
--- a/src/mongo/db/op_observer_impl.h
+++ b/src/mongo/db/op_observer_impl.h
@@ -209,11 +209,6 @@ public:
         const ApplyOpsOplogSlotAndOperationAssignment* applyOpsOperationAssignment,
         size_t numberOfPrePostImagesToWrite,
         Date_t wallClockTime) final;
-
-    void onTransactionPrepareNonPrimary(OperationContext* opCtx,
-                                        const std::vector<repl::OplogEntry>& statements,
-                                        const repl::OpTime& prepareOpTime) final;
-
     void onTransactionAbort(OperationContext* opCtx,
                             boost::optional<OplogSlot> abortOplogEntryOpTime) final;
     void onMajorityCommitPointUpdate(ServiceContext* service,
@@ -239,8 +234,8 @@ private:
                                       const repl::OpTime& prePostImageOpTime,
                                       const bool inMultiDocumentTransaction) {}
     virtual void shardObserveDeleteOp(OperationContext* opCtx,
-                                      const NamespaceString& nss,
-                                      const repl::DocumentKey& documentKey,
+                                      const NamespaceString nss,
+                                      const BSONObj& documentKey,
                                       const repl::OpTime& opTime,
                                       const ShardingWriteRouter& shardingWriteRouter,
                                       const repl::OpTime& preImageOpTime,
@@ -249,10 +244,6 @@ private:
         OperationContext* opCtx,
         const std::vector<repl::ReplOperation>& stmts,
         const repl::OpTime& prepareOrCommitOptime) {}
-    virtual void shardObserveNonPrimaryTransactionPrepare(
-        OperationContext* opCtx,
-        const std::vector<repl::OplogEntry>& stmts,
-        const repl::OpTime& prepareOrCommitOptime) {}
     void _onReplicationRollback(OperationContext* opCtx, const RollbackObserverInfo& rbInfo) final;
 };