diff options
author | Henrik Edin <henrik.edin@mongodb.com> | 2020-09-17 17:09:19 -0400 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-09-26 02:12:49 +0000 |
commit | 2b82ab88982566114d1bb7667477b71c883b0799 (patch) | |
tree | c152b35ff047fdc42f69aa6cd6b04fee1d811fe4 /src/mongo/dbtests/querytests.cpp | |
parent | 08e92a678a1ed288f6a95e7950597e082556ae59 (diff) | |
download | mongo-2b82ab88982566114d1bb7667477b71c883b0799.tar.gz |
SERVER-50984 Add CollectionPtr to replace usage of const Collection*
It implements a yieldable interface that is used to re-load the
Collection pointer from the catalog after a yield that released locks.
With lock-free reads and copy-on-write on Collection instances releasing
locks without notifying an AutoGetCollection at a higher level may cause
its pointers to dangle if a MODE_X writer installs a new Collection
instance in the catalog.
CollectionPtr should be passed by const reference so a yield can notify
all the way up.
Diffstat (limited to 'src/mongo/dbtests/querytests.cpp')
-rw-r--r-- | src/mongo/dbtests/querytests.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/dbtests/querytests.cpp b/src/mongo/dbtests/querytests.cpp index 4ba7d36c94c..2bd9ba0a18c 100644 --- a/src/mongo/dbtests/querytests.cpp +++ b/src/mongo/dbtests/querytests.cpp @@ -74,7 +74,7 @@ public: } collection = _database->createCollection(&_opCtx, nss()); wunit.commit(); - _collection = collection; + _collection = std::move(collection); } addIndex(IndexSpec().addKey("a").unique(false)); @@ -129,7 +129,7 @@ protected: wunit.commit(); } abortOnExit.dismiss(); - _collection = collection.get(); + _collection = collection.get().detached(); } void insert(const char* s) { @@ -161,7 +161,7 @@ protected: OldClientContext _context; Database* _database; - const Collection* _collection; + CollectionPtr _collection; }; class FindOneOr : public Base { |