diff options
| author | Henrik Edin <henrik.edin@mongodb.com> | 2020-09-30 11:19:31 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-10-13 00:32:43 +0000 |
| commit | bcab0c7e1c1b2e1516d06d23233fea9a425b99f7 (patch) | |
| tree | 8d805048d69ece52bb64e740532f5968b671865c /src/mongo/db/query/internal_plans.h | |
| parent | 0dadef8dd93175bf3a75412d8a32b377d9eba42c (diff) | |
| download | mongo-bcab0c7e1c1b2e1516d06d23233fea9a425b99f7.tar.gz | |
SERVER-51200 CollectionPtr in RequiresCollectionStage point to instance owned by AutoGetCollection
RequiresCollectionStage now holds a pointer to CollectionPtr owned by an AutoGetCollection.
When we save and restore the executor a new CollectionPtr pointer needs to be assigned.
Plan executors can no longer be created with temporary CollectionPtr instances and their interface have been changed to take pointers to avoid binding to rvalues.
RequiresCollectionStage no longer loads collections from the catalog and will be in sync with the owning AutoGetCollection.
Diffstat (limited to 'src/mongo/db/query/internal_plans.h')
| -rw-r--r-- | src/mongo/db/query/internal_plans.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mongo/db/query/internal_plans.h b/src/mongo/db/query/internal_plans.h index c7507243369..7baf271db97 100644 --- a/src/mongo/db/query/internal_plans.h +++ b/src/mongo/db/query/internal_plans.h @@ -73,7 +73,7 @@ public: static std::unique_ptr<PlanExecutor, PlanExecutor::Deleter> collectionScan( OperationContext* opCtx, StringData ns, - const CollectionPtr& collection, + const CollectionPtr* collection, PlanYieldPolicy::YieldPolicy yieldPolicy, const Direction direction = FORWARD, boost::optional<RecordId> resumeAfterRecordId = boost::none); @@ -83,7 +83,7 @@ public: */ static std::unique_ptr<PlanExecutor, PlanExecutor::Deleter> deleteWithCollectionScan( OperationContext* opCtx, - const CollectionPtr& collection, + const CollectionPtr* collection, std::unique_ptr<DeleteStageParams> params, PlanYieldPolicy::YieldPolicy yieldPolicy, Direction direction = FORWARD); @@ -93,7 +93,7 @@ public: */ static std::unique_ptr<PlanExecutor, PlanExecutor::Deleter> indexScan( OperationContext* opCtx, - const CollectionPtr& collection, + const CollectionPtr* collection, const IndexDescriptor* descriptor, const BSONObj& startKey, const BSONObj& endKey, @@ -107,7 +107,7 @@ public: */ static std::unique_ptr<PlanExecutor, PlanExecutor::Deleter> deleteWithIndexScan( OperationContext* opCtx, - const CollectionPtr& collection, + const CollectionPtr* collection, std::unique_ptr<DeleteStageParams> params, const IndexDescriptor* descriptor, const BSONObj& startKey, @@ -121,7 +121,7 @@ public: */ static std::unique_ptr<PlanExecutor, PlanExecutor::Deleter> updateWithIdHack( OperationContext* opCtx, - const CollectionPtr& collection, + const CollectionPtr* collection, const UpdateStageParams& params, const IndexDescriptor* descriptor, const BSONObj& key, @@ -136,7 +136,7 @@ private: static std::unique_ptr<PlanStage> _collectionScan( const boost::intrusive_ptr<ExpressionContext>& expCtx, WorkingSet* ws, - const CollectionPtr& collection, + const CollectionPtr* collection, Direction direction, boost::optional<RecordId> resumeAfterRecordId = boost::none); @@ -148,7 +148,7 @@ private: static std::unique_ptr<PlanStage> _indexScan( const boost::intrusive_ptr<ExpressionContext>& expCtx, WorkingSet* ws, - const CollectionPtr& collection, + const CollectionPtr* collection, const IndexDescriptor* descriptor, const BSONObj& startKey, const BSONObj& endKey, |