summaryrefslogtreecommitdiff
path: root/src/mongo/db/exec/delete.cpp
diff options
context:
space:
mode:
authorKaloian Manassiev <kaloian.manassiev@mongodb.com>2017-07-24 15:16:48 -0400
committerKaloian Manassiev <kaloian.manassiev@mongodb.com>2017-07-26 10:53:22 -0400
commit86defa9d193f34275af2c4f3c783dffb046182ff (patch)
tree1a57517f940cecc40d99030191a411d7f32283e7 /src/mongo/db/exec/delete.cpp
parent8235ad20a6169b8713ffba991afcd50519e1345b (diff)
downloadmongo-86defa9d193f34275af2c4f3c783dffb046182ff.tar.gz
SERVER-28752 Get rid of BatchedInsertRequest::getIndexTargetingNS
In preparation for removing the Batched Insert/Update/Delete Request parser classes.
Diffstat (limited to 'src/mongo/db/exec/delete.cpp')
-rw-r--r--src/mongo/db/exec/delete.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/exec/delete.cpp b/src/mongo/db/exec/delete.cpp
index 059f66a5cdb..6262279c054 100644
--- a/src/mongo/db/exec/delete.cpp
+++ b/src/mongo/db/exec/delete.cpp
@@ -177,7 +177,7 @@ PlanStage::StageState DeleteStage::doWork(WorkingSetID* out) {
try {
docStillMatches = write_stage_common::ensureStillMatches(
_collection, getOpCtx(), _ws, id, _params.canonicalQuery);
- } catch (const WriteConflictException& wce) {
+ } catch (const WriteConflictException&) {
// There was a problem trying to detect if the document still exists, so retry.
memberFreer.Dismiss();
return prepareToRetryWSM(id, out);
@@ -207,7 +207,7 @@ PlanStage::StageState DeleteStage::doWork(WorkingSetID* out) {
WorkingSetCommon::prepareForSnapshotChange(_ws);
try {
child()->saveState();
- } catch (const WriteConflictException& wce) {
+ } catch (const WriteConflictException&) {
std::terminate();
}
@@ -218,7 +218,7 @@ PlanStage::StageState DeleteStage::doWork(WorkingSetID* out) {
_collection->deleteDocument(
getOpCtx(), _params.stmtId, recordId, _params.opDebug, _params.fromMigrate);
wunit.commit();
- } catch (const WriteConflictException& wce) {
+ } catch (const WriteConflictException&) {
memberFreer.Dismiss(); // Keep this member around so we can retry deleting it.
return prepareToRetryWSM(id, out);
}
@@ -237,7 +237,7 @@ PlanStage::StageState DeleteStage::doWork(WorkingSetID* out) {
// outside of the WriteUnitOfWork.
try {
child()->restoreState();
- } catch (const WriteConflictException& wce) {
+ } catch (const WriteConflictException&) {
// Note we don't need to retry anything in this case since the delete already was committed.
// However, we still need to return the deleted document (if it was requested).
if (_params.returnDeleted) {