diff options
| author | Geert Bosch <geert@mongodb.com> | 2019-04-17 16:18:22 -0400 |
|---|---|---|
| committer | Geert Bosch <geert@mongodb.com> | 2019-04-26 16:18:38 -0400 |
| commit | 8cbbba49935f632e876037f9f2d9eecc779eb96a (patch) | |
| tree | f1b4416f63dd87ed97223751c2c0d4eff4063628 /src/mongo/db/commands/mr.cpp | |
| parent | 93dd23880759430872510ef0b539e746192e44e2 (diff) | |
| download | mongo-8cbbba49935f632e876037f9f2d9eecc779eb96a.tar.gz | |
SERVER-40724 Change namespace arguments to use NamespaceString
Diffstat (limited to 'src/mongo/db/commands/mr.cpp')
| -rw-r--r-- | src/mongo/db/commands/mr.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mongo/db/commands/mr.cpp b/src/mongo/db/commands/mr.cpp index 1327d5fe560..083a682cbab 100644 --- a/src/mongo/db/commands/mr.cpp +++ b/src/mongo/db/commands/mr.cpp @@ -188,7 +188,7 @@ void dropTempCollections(OperationContext* cleanupOpCtx, IndexBuildsCoordinator::get(cleanupOpCtx) ->assertNoIndexBuildInProgForCollection(collection->uuid().get()); WriteUnitOfWork wunit(cleanupOpCtx); - uassertStatusOK(db->dropCollection(cleanupOpCtx, tempNamespace.ns())); + uassertStatusOK(db->dropCollection(cleanupOpCtx, tempNamespace)); wunit.commit(); } } @@ -207,7 +207,7 @@ void dropTempCollections(OperationContext* cleanupOpCtx, IndexBuildsCoordinator::get(cleanupOpCtx) ->assertNoIndexBuildInProgForCollection(collection->uuid().get()); WriteUnitOfWork wunit(cleanupOpCtx); - uassertStatusOK(db->dropCollection(cleanupOpCtx, incLong.ns())); + uassertStatusOK(db->dropCollection(cleanupOpCtx, incLong)); wunit.commit(); } } @@ -517,7 +517,7 @@ void State::prepTempCollection() { WriteUnitOfWork wuow(_opCtx); auto incColl = db->createCollection( - _opCtx, _config.incLong.ns(), options, false /* force no _id index */); + _opCtx, _config.incLong, options, false /* force no _id index */); auto rawIndexSpec = BSON("key" << BSON("0" << 1) << "ns" << _config.incLong.ns() << "name" @@ -597,7 +597,7 @@ void State::prepTempCollection() { WriteUnitOfWork wuow(_opCtx); auto const tempColl = - db->createCollection(_opCtx, _config.tempNamespace.ns(), options, buildIdIndex); + db->createCollection(_opCtx, _config.tempNamespace, options, buildIdIndex); for (const auto& indexToInsert : indexesToInsert) { try { @@ -811,7 +811,7 @@ void State::insert(const NamespaceString& nss, const BSONObj& o) { uassert( ErrorCodes::PrimarySteppedDown, str::stream() << "no longer primary while inserting mapReduce result into collection: " - << nss.ns() + << nss << ": " << redact(o), repl::ReplicationCoordinator::get(_opCtx)->canAcceptWritesFor(_opCtx, nss)); @@ -1443,7 +1443,7 @@ public: State state(opCtx, config); if (!state.sourceExists()) { uasserted(ErrorCodes::NamespaceNotFound, - str::stream() << "namespace does not exist: " << config.nss.ns()); + str::stream() << "namespace does not exist: " << config.nss); } state.init(); |