summaryrefslogtreecommitdiff
path: root/src/mongo/dbtests/rollbacktests.cpp
diff options
context:
space:
mode:
authorLouis Williams <louis.williams@mongodb.com>2018-11-12 12:04:25 -0500
committerLouis Williams <louis.williams@mongodb.com>2018-12-19 19:22:55 -0500
commit145078f2e5076fb4a032d36d30b7c71b33706802 (patch)
treed1909714d54286ae78ed17d404413d630b1633b1 /src/mongo/dbtests/rollbacktests.cpp
parent51ab5eb0c500d0013ac6265de40ab7dbc3d52131 (diff)
downloadmongo-145078f2e5076fb4a032d36d30b7c71b33706802.tar.gz
SERVER-38091 IndexCatalog iterators and accessors should return const entries
Diffstat (limited to 'src/mongo/dbtests/rollbacktests.cpp')
-rw-r--r--src/mongo/dbtests/rollbacktests.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/dbtests/rollbacktests.cpp b/src/mongo/dbtests/rollbacktests.cpp
index 7580dc2afbc..3f7faa319f9 100644
--- a/src/mongo/dbtests/rollbacktests.cpp
+++ b/src/mongo/dbtests/rollbacktests.cpp
@@ -133,10 +133,10 @@ size_t getNumIndexEntries(OperationContext* opCtx,
Collection* coll =
DatabaseHolder::getDatabaseHolder().get(opCtx, nss.db())->getCollection(opCtx, nss);
IndexCatalog* catalog = coll->getIndexCatalog();
- IndexDescriptor* desc = catalog->findIndexByName(opCtx, idxName, false);
+ auto desc = catalog->findIndexByName(opCtx, idxName, false);
if (desc) {
- auto cursor = catalog->getIndex(desc)->newCursor(opCtx);
+ auto cursor = catalog->getEntry(desc)->accessMethod()->newCursor(opCtx);
for (auto kv = cursor->seek(kMinBSONKey, true); kv; kv = cursor->next()) {
numEntries++;
@@ -149,7 +149,7 @@ size_t getNumIndexEntries(OperationContext* opCtx,
void dropIndex(OperationContext* opCtx, const NamespaceString& nss, const string& idxName) {
Collection* coll =
DatabaseHolder::getDatabaseHolder().get(opCtx, nss.db())->getCollection(opCtx, nss);
- IndexDescriptor* desc = coll->getIndexCatalog()->findIndexByName(opCtx, idxName);
+ auto desc = coll->getIndexCatalog()->findIndexByName(opCtx, idxName);
ASSERT(desc);
ASSERT_OK(coll->getIndexCatalog()->dropIndex(opCtx, desc));
}
@@ -697,7 +697,7 @@ public:
uow.commit();
}
- IndexDescriptor* indexDesc = catalog->findIndexByName(&opCtx, idxName);
+ auto indexDesc = catalog->findIndexByName(&opCtx, idxName);
invariant(indexDesc);
const IndexCatalogEntry* ice = catalog->getEntry(indexDesc);
invariant(ice);