diff options
| author | Andy Schwerin <schwerin@mongodb.com> | 2015-05-22 15:24:52 -0400 |
|---|---|---|
| committer | Andy Schwerin <schwerin@mongodb.com> | 2015-05-29 10:28:03 -0400 |
| commit | 4ea38c308da292f43e29d32b1b53b7324db0bafe (patch) | |
| tree | 22d166a388262ae5837d0c4e44f42748194e3e47 /src/mongo/db/query/find.cpp | |
| parent | 5c2d133871b2ad2adf6c617364d036ca25261f2d (diff) | |
| download | mongo-4ea38c308da292f43e29d32b1b53b7324db0bafe.tar.gz | |
SERVER-14995 Move operation id, lockState and client fields to OperationContext.
They have been moved from OperationContextImpl. Furthermore, the CurOp stack is
now attached to OperationContext, instead of Client.
With this change, an operation's lifetime is governed by the lifetime of an
OperationContext object. The "_active" field of CurOp is therefore no longer
meaingful. This required fixing the lifetime of OperationContext in a few
places.
A future change will adjust operation lifetime timing to time the lifetime of
the OperationContext object, as well.
Diffstat (limited to 'src/mongo/db/query/find.cpp')
| -rw-r--r-- | src/mongo/db/query/find.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mongo/db/query/find.cpp b/src/mongo/db/query/find.cpp index c1938e51852..eb2b62f8d4a 100644 --- a/src/mongo/db/query/find.cpp +++ b/src/mongo/db/query/find.cpp @@ -37,8 +37,10 @@ #include "mongo/client/dbclientinterface.h" #include "mongo/db/catalog/collection.h" #include "mongo/db/catalog/database_holder.h" +#include "mongo/db/client.h" #include "mongo/db/clientcursor.h" #include "mongo/db/commands.h" +#include "mongo/db/curop.h" #include "mongo/db/db_raii.h" #include "mongo/db/exec/filter.h" #include "mongo/db/exec/working_set_common.h" |