From 5e384621d664132346df3044bb5007597faa123c Mon Sep 17 00:00:00 2001
From: Jason Rassi <rassi@10gen.com>
Date: Fri, 7 Aug 2015 17:59:38 -0400
Subject: SERVER-19838 Remove member DeleteStageParams::shouldCallLogOp

---
 src/mongo/db/exec/delete.cpp | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/mongo/db/exec/delete.cpp')

diff --git a/src/mongo/db/exec/delete.cpp b/src/mongo/db/exec/delete.cpp
index 90b87cce6bc..1b970a475fc 100644
--- a/src/mongo/db/exec/delete.cpp
+++ b/src/mongo/db/exec/delete.cpp
@@ -179,17 +179,7 @@ PlanStage::StageState DeleteStage::work(WorkingSetID* out) {
             // Do the write, unless this is an explain.
             if (!_params.isExplain) {
                 WriteUnitOfWork wunit(getOpCtx());
-
-                const bool deleteCappedOK = false;
-                const bool deleteNoWarn = false;
-                BSONObj deletedId;
-
-                _collection->deleteDocument(getOpCtx(),
-                                            rloc,
-                                            deleteCappedOK,
-                                            deleteNoWarn,
-                                            _params.shouldCallLogOp ? &deletedId : NULL);
-
+                _collection->deleteDocument(getOpCtx(), rloc);
                 wunit.commit();
             }
 
@@ -260,7 +250,7 @@ void DeleteStage::doRestoreState() {
     const NamespaceString& ns(_collection->ns());
     massert(28537,
             str::stream() << "Demoted from primary while removing from " << ns.ns(),
-            !_params.shouldCallLogOp ||
+            !getOpCtx()->writesAreReplicated() ||
                 repl::getGlobalReplicationCoordinator()->canAcceptWritesFor(ns));
 }
 
-- 
cgit v1.2.1