diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-09-26 14:02:49 -0400 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-10-06 17:30:12 -0400 |
| commit | 101e026f45dea5e9e68520238495c89a476e6172 (patch) | |
| tree | bbdd3710ffc5721527ad9f5682ef0dbb4876dfee /src/mongo/db/pipeline/pipeline_d.h | |
| parent | 10c86dc6cad9853514148e0ab59894a0d29353b9 (diff) | |
| download | mongo-101e026f45dea5e9e68520238495c89a476e6172.tar.gz | |
SERVER-14668/SERVER-15294 Collection-level locking for all read paths
Diffstat (limited to 'src/mongo/db/pipeline/pipeline_d.h')
| -rw-r--r-- | src/mongo/db/pipeline/pipeline_d.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mongo/db/pipeline/pipeline_d.h b/src/mongo/db/pipeline/pipeline_d.h index 1147755f5b6..40c7668d75d 100644 --- a/src/mongo/db/pipeline/pipeline_d.h +++ b/src/mongo/db/pipeline/pipeline_d.h @@ -28,7 +28,8 @@ #pragma once -#include <boost/smart_ptr.hpp> +#include <boost/intrusive_ptr.hpp> +#include <boost/shared_ptr.hpp> namespace mongo { class Collection; @@ -63,7 +64,7 @@ namespace mongo { * * The cursor is added to the front of the pipeline's sources. * - * Must have a ReadContext before entering. + * Must have a AutoGetCollectionForRead before entering. * * If the returned PlanExecutor is non-null, you are responsible for ensuring * it receives appropriate invalidate and kill messages. @@ -74,8 +75,8 @@ namespace mongo { static boost::shared_ptr<PlanExecutor> prepareCursorSource( OperationContext* txn, Collection* collection, - const intrusive_ptr<Pipeline> &pPipeline, - const intrusive_ptr<ExpressionContext> &pExpCtx); + const boost::intrusive_ptr<Pipeline> &pPipeline, + const boost::intrusive_ptr<ExpressionContext> &pExpCtx); private: PipelineD(); // does not exist: prevent instantiation |