diff options
Diffstat (limited to 'src/mongo/db/storage/record_store_test_manyiter.cpp')
| -rw-r--r-- | src/mongo/db/storage/record_store_test_manyiter.cpp | 36 |
1 files changed, 7 insertions, 29 deletions
diff --git a/src/mongo/db/storage/record_store_test_manyiter.cpp b/src/mongo/db/storage/record_store_test_manyiter.cpp index ba31c2109e7..57723e23723 100644 --- a/src/mongo/db/storage/record_store_test_manyiter.cpp +++ b/src/mongo/db/storage/record_store_test_manyiter.cpp @@ -58,19 +58,9 @@ namespace mongo { { scoped_ptr<OperationContext> opCtx( harnessHelper->newOperationContext() ); - vector<RecordIterator*> v = rs->getManyIterators( opCtx.get() ); - - for (vector<RecordIterator*>::iterator vIter = v.begin(); - vIter != v.end(); vIter++) { - - RecordIterator *rIter = *vIter; - ASSERT( rIter->isEOF() ); - ASSERT_EQUALS( RecordId(), rIter->curr() ); - ASSERT_EQUALS( RecordId(), rIter->getNext() ); - ASSERT( rIter->isEOF() ); - ASSERT_EQUALS( RecordId(), rIter->curr() ); - - delete rIter; + for (auto&& cursor : rs->getManyCursors(opCtx.get())) { + ASSERT(!cursor->next()); + ASSERT(!cursor->next()); } } } @@ -113,24 +103,12 @@ namespace mongo { set<RecordId> remain( locs, locs + nToInsert ); { scoped_ptr<OperationContext> opCtx( harnessHelper->newOperationContext() ); - vector<RecordIterator*> v = rs->getManyIterators( opCtx.get() ); - - for (vector<RecordIterator*>::iterator vIter = v.begin(); - vIter != v.end(); vIter++) { - - RecordIterator *rIter = *vIter; - while ( !rIter->isEOF() ) { - RecordId loc = rIter->curr(); - ASSERT( 1 == remain.erase( loc ) ); - ASSERT_EQUALS( loc, rIter->getNext() ); + for (auto&& cursor : rs->getManyCursors(opCtx.get())) { + while (auto record = cursor->next()) { + ASSERT_EQ(remain.erase(record->id), size_t(1)); } - ASSERT_EQUALS( RecordId(), rIter->curr() ); - ASSERT_EQUALS( RecordId(), rIter->getNext() ); - ASSERT( rIter->isEOF() ); - ASSERT_EQUALS( RecordId(), rIter->curr() ); - - delete rIter; + ASSERT(!cursor->next()); } ASSERT( remain.empty() ); } |