summaryrefslogtreecommitdiff
path: root/src/mongo/db/exec/text_or.h
diff options
context:
space:
mode:
authorMathias Stearn <mathias@10gen.com>2015-07-06 19:16:30 -0400
committerMathias Stearn <mathias@10gen.com>2015-07-16 14:37:02 -0400
commitb9d2e18ca68246e5d21ed42a846ff4094867f159 (patch)
treecdbbac6dc5ee00404cf6452f5dd70612983127e3 /src/mongo/db/exec/text_or.h
parentc832bc753c29f91597b75fa02c0d9019c3c20b0f (diff)
downloadmongo-b9d2e18ca68246e5d21ed42a846ff4094867f159.tar.gz
SERVER-17364 Don't stash RecoveryUnits across getMores
We now tell PlanExecutors to detach from their OperationContexts and to shed all storage engine resources before stashing the ClientCursor. This is a heavier weight operation than a normal save/restoreState which is no longer allowed to change the OperationContext.
Diffstat (limited to 'src/mongo/db/exec/text_or.h')
-rw-r--r--src/mongo/db/exec/text_or.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mongo/db/exec/text_or.h b/src/mongo/db/exec/text_or.h
index a51a91a3919..c2018bda166 100644
--- a/src/mongo/db/exec/text_or.h
+++ b/src/mongo/db/exec/text_or.h
@@ -87,7 +87,9 @@ public:
StageState work(WorkingSetID* out) final;
void doSaveState() final;
- void doRestoreState(OperationContext* opCtx) final;
+ void doRestoreState() final;
+ void doDetachFromOperationContext() final;
+ void doReattachToOperationContext(OperationContext* opCtx) final;
void doInvalidate(OperationContext* txn, const RecordId& dl, InvalidationType type) final;
StageType stageType() const final {