diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2017-06-24 15:26:18 -0400 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2017-06-27 09:56:58 -0400 |
| commit | 8fe4426fa36587ca40a0b6c8f1c84fd9aa61e5cf (patch) | |
| tree | 80441172024fa0d6e752e5766aacbbce8f706703 /src/mongo/db/service_context.h | |
| parent | b7f7d746eba8ec30d059352c811e9ac57618b3bd (diff) | |
| download | mongo-8fe4426fa36587ca40a0b6c8f1c84fd9aa61e5cf.tar.gz | |
SERVER-29852 Store session id and transaction number on all commands' OperationContext
Diffstat (limited to 'src/mongo/db/service_context.h')
| -rw-r--r-- | src/mongo/db/service_context.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/mongo/db/service_context.h b/src/mongo/db/service_context.h index 02bc4b6a648..3cf830c3fe7 100644 --- a/src/mongo/db/service_context.h +++ b/src/mongo/db/service_context.h @@ -28,18 +28,16 @@ #pragma once -#include <boost/optional.hpp> -#include <memory> #include <vector> #include "mongo/base/disallow_copying.h" #include "mongo/db/logical_session_cache.h" -#include "mongo/db/logical_session_id.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/platform/atomic_word.h" #include "mongo/platform/unordered_set.h" #include "mongo/stdx/condition_variable.h" #include "mongo/stdx/functional.h" +#include "mongo/stdx/memory.h" #include "mongo/stdx/mutex.h" #include "mongo/transport/session.h" #include "mongo/util/clock_source.h" @@ -227,10 +225,8 @@ public: * * "client" must not have an active operation context. * - * If provided, the LogicalSessionId links this operation to a logical session. */ - UniqueOperationContext makeOperationContext( - Client* client, boost::optional<LogicalSessionId> lsid = boost::none); + UniqueOperationContext makeOperationContext(Client* client); // // Storage @@ -453,9 +449,7 @@ private: /** * Returns a new OperationContext. Private, for use by makeOperationContext. */ - virtual std::unique_ptr<OperationContext> _newOpCtx(Client* client, - unsigned opId, - boost::optional<LogicalSessionId>) = 0; + virtual std::unique_ptr<OperationContext> _newOpCtx(Client* client, unsigned opId) = 0; /** * Kills the given operation. |