diff options
| author | matt dannenberg <matt.dannenberg@10gen.com> | 2015-03-13 06:35:51 -0400 |
|---|---|---|
| committer | matt dannenberg <matt.dannenberg@10gen.com> | 2015-04-09 10:57:16 -0400 |
| commit | 1725d76f448323a2bbaa11ffd37fd7b10cd6a64b (patch) | |
| tree | be35489fd99d5b0040f27d86b731cfcae1e4479a /src/mongo/dbtests/rollbacktests.cpp | |
| parent | acc7a72194990f35ff706bdcab7ec443c39fb0d5 (diff) | |
| download | mongo-1725d76f448323a2bbaa11ffd37fd7b10cd6a64b.tar.gz | |
SERVER-17573 move OpObserver calls into the datalayer as much as possible and eliminate repl bools
Diffstat (limited to 'src/mongo/dbtests/rollbacktests.cpp')
| -rw-r--r-- | src/mongo/dbtests/rollbacktests.cpp | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/src/mongo/dbtests/rollbacktests.cpp b/src/mongo/dbtests/rollbacktests.cpp index 8abfe02ff43..f742fb68b00 100644 --- a/src/mongo/dbtests/rollbacktests.cpp +++ b/src/mongo/dbtests/rollbacktests.cpp @@ -71,7 +71,7 @@ namespace { { WriteUnitOfWork uow( txn ); ASSERT( !collectionExists( &ctx, nss.ns() ) ); - ASSERT_OK( userCreateNS( txn, ctx.db(), nss.ns(), BSONObj(), false, false ) ); + ASSERT_OK( userCreateNS( txn, ctx.db(), nss.ns(), BSONObj(), false ) ); ASSERT( collectionExists( &ctx, nss.ns() ) ); uow.commit(); } @@ -161,7 +161,7 @@ namespace { { WriteUnitOfWork uow( &txn ); ASSERT( !collectionExists( &ctx, ns ) ); - ASSERT_OK( userCreateNS( &txn, ctx.db(), ns, BSONObj(), false, defaultIndexes ) ); + ASSERT_OK( userCreateNS( &txn, ctx.db(), ns, BSONObj(), defaultIndexes ) ); ASSERT( collectionExists( &ctx, ns ) ); if ( !rollback ) { uow.commit(); @@ -191,7 +191,7 @@ namespace { { WriteUnitOfWork uow( &txn ); ASSERT( !collectionExists( &ctx, ns ) ); - ASSERT_OK( userCreateNS( &txn, ctx.db(), ns, BSONObj(), false, defaultIndexes ) ); + ASSERT_OK( userCreateNS( &txn, ctx.db(), ns, BSONObj(), defaultIndexes ) ); uow.commit(); } ASSERT( collectionExists( &ctx, ns ) ); @@ -235,8 +235,7 @@ namespace { WriteUnitOfWork uow( &txn ); ASSERT( !collectionExists( &ctx, source ) ); ASSERT( !collectionExists( &ctx, target ) ); - ASSERT_OK( userCreateNS( &txn, ctx.db(), source.ns(), BSONObj(), false, - defaultIndexes ) ); + ASSERT_OK( userCreateNS( &txn, ctx.db(), source.ns(), BSONObj(), defaultIndexes ) ); uow.commit(); } ASSERT( collectionExists( &ctx, source ) ); @@ -286,10 +285,8 @@ namespace { WriteUnitOfWork uow( &txn ); ASSERT( !collectionExists( &ctx, source ) ); ASSERT( !collectionExists( &ctx, target ) ); - ASSERT_OK( userCreateNS( &txn, ctx.db(), source.ns(), BSONObj(), false, - defaultIndexes ) ); - ASSERT_OK( userCreateNS( &txn, ctx.db(), target.ns(), BSONObj(), false, - defaultIndexes ) ); + ASSERT_OK( userCreateNS( &txn, ctx.db(), source.ns(), BSONObj(), defaultIndexes ) ); + ASSERT_OK( userCreateNS( &txn, ctx.db(), target.ns(), BSONObj(), defaultIndexes ) ); insertRecord( &txn, source, sourceDoc ); insertRecord( &txn, target, targetDoc ); @@ -346,8 +343,7 @@ namespace { { WriteUnitOfWork uow( &txn ); ASSERT( !collectionExists( &ctx, nss ) ); - ASSERT_OK( userCreateNS( &txn, ctx.db(), nss.ns(), BSONObj(), false, - defaultIndexes ) ); + ASSERT_OK( userCreateNS( &txn, ctx.db(), nss.ns(), BSONObj(), defaultIndexes ) ); insertRecord( &txn, nss, oldDoc ); uow.commit(); } @@ -360,8 +356,7 @@ namespace { WriteUnitOfWork uow( &txn ); ASSERT_OK( ctx.db()->dropCollection( &txn, nss.ns() ) ); ASSERT( !collectionExists( &ctx, nss ) ); - ASSERT_OK( userCreateNS( &txn, ctx.db(), nss.ns(), BSONObj(), false, - defaultIndexes ) ); + ASSERT_OK( userCreateNS( &txn, ctx.db(), nss.ns(), BSONObj(), defaultIndexes ) ); ASSERT( collectionExists( &ctx, nss ) ); insertRecord( &txn, nss, newDoc ); assertOnlyRecord( &txn, nss, newDoc ); @@ -397,8 +392,7 @@ namespace { { WriteUnitOfWork uow( &txn ); - ASSERT_OK( userCreateNS( &txn, ctx.db(), nss.ns(), BSONObj(), false, - defaultIndexes ) ); + ASSERT_OK( userCreateNS( &txn, ctx.db(), nss.ns(), BSONObj(), defaultIndexes ) ); ASSERT( collectionExists( &ctx, nss ) ); insertRecord( &txn, nss, doc ); assertOnlyRecord( &txn, nss, doc ); @@ -432,8 +426,7 @@ namespace { { WriteUnitOfWork uow( &txn ); - ASSERT_OK( userCreateNS( &txn, ctx.db(), nss.ns(), BSONObj(), false, - defaultIndexes ) ); + ASSERT_OK( userCreateNS( &txn, ctx.db(), nss.ns(), BSONObj(), defaultIndexes ) ); ASSERT( collectionExists( &ctx, nss ) ); insertRecord( &txn, nss, doc ); assertOnlyRecord( &txn, nss, doc ); @@ -689,7 +682,7 @@ namespace { { WriteUnitOfWork uow( &txn ); ASSERT( !collectionExists( &ctx, nss.ns() ) ); - ASSERT_OK( userCreateNS( &txn, ctx.db(), nss.ns(), BSONObj(), false, false ) ); + ASSERT_OK( userCreateNS( &txn, ctx.db(), nss.ns(), BSONObj(), false ) ); ASSERT( collectionExists( &ctx, nss.ns() ) ); Collection* coll = ctx.db()->getCollection( ns ); IndexCatalog* catalog = coll->getIndexCatalog(); |