diff options
| author | Geert Bosch <geert@mongodb.com> | 2017-03-11 06:17:41 -0800 |
|---|---|---|
| committer | Geert Bosch <geert@mongodb.com> | 2017-04-02 09:32:57 -0400 |
| commit | 576e157c2753b9bc61c36002e323421c09bc62dc (patch) | |
| tree | bc123ef55e9a325bdbfd1cae38288284278466cf /src/mongo/db/exec | |
| parent | 53022d457a0610b40fea600d9d546f410be3d7ed (diff) | |
| download | mongo-576e157c2753b9bc61c36002e323421c09bc62dc.tar.gz | |
SERVER-28534 Pass collection names around as NamespaceStrings more often
Before this patch 'ns' values were often passed around as std::string or
char* containing either a dbname (no '.'), a dbname with '.$cmd', or a fully qualified
collection name. Instead pass either plain 'dbName' value (as string) or a fully
qualified name using the actual NamespaceString type.
Diffstat (limited to 'src/mongo/db/exec')
| -rw-r--r-- | src/mongo/db/exec/update.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/exec/update.cpp b/src/mongo/db/exec/update.cpp index 9a9b6c36a07..3dca5184810 100644 --- a/src/mongo/db/exec/update.cpp +++ b/src/mongo/db/exec/update.cpp @@ -666,7 +666,7 @@ BSONObj UpdateStage::transformAndUpdate(const Snapshotted<BSONObj>& oldObj, Reco const RecordData oldRec(oldObj.value().objdata(), oldObj.value().objsize()); BSONObj idQuery = driver->makeOplogEntryQuery(newObj, request->isMulti()); OplogUpdateEntryArgs args; - args.ns = _collection->ns().ns(); + args.nss = _collection->ns(); args.update = logObj; args.criteria = idQuery; args.fromMigrate = request->isFromMigration(); @@ -695,7 +695,7 @@ BSONObj UpdateStage::transformAndUpdate(const Snapshotted<BSONObj>& oldObj, Reco invariant(_collection); BSONObj idQuery = driver->makeOplogEntryQuery(newObj, request->isMulti()); OplogUpdateEntryArgs args; - args.ns = _collection->ns().ns(); + args.nss = _collection->ns(); args.update = logObj; args.criteria = idQuery; args.fromMigrate = request->isFromMigration(); |