1 files changed, 49 insertions, 49 deletions

diff --git a/src/mongo/dbtests/indexcatalogtests.cpp b/src/mongo/dbtests/indexcatalogtests.cpp
index 068ede905a1..fd1f10f8a55 100644
--- a/src/mongo/dbtests/indexcatalogtests.cpp
+++ b/src/mongo/dbtests/indexcatalogtests.cpp
@@ -38,44 +38,44 @@ static const char* const _ns = "unittests.indexcatalog";
 class IndexIteratorTests {
 public:
     IndexIteratorTests() {
-        const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
-        OperationContext& txn = *txnPtr;
-        ScopedTransaction transaction(&txn, MODE_IX);
-        Lock::DBLock lk(txn.lockState(), nsToDatabaseSubstring(_ns), MODE_X);
-        OldClientContext ctx(&txn, _ns);
-        WriteUnitOfWork wuow(&txn);
+        const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+        OperationContext& opCtx = *opCtxPtr;
+        ScopedTransaction transaction(&opCtx, MODE_IX);
+        Lock::DBLock lk(opCtx.lockState(), nsToDatabaseSubstring(_ns), MODE_X);
+        OldClientContext ctx(&opCtx, _ns);
+        WriteUnitOfWork wuow(&opCtx);
 
         _db = ctx.db();
-        _coll = _db->createCollection(&txn, _ns);
+        _coll = _db->createCollection(&opCtx, _ns);
         _catalog = _coll->getIndexCatalog();
         wuow.commit();
     }
 
     ~IndexIteratorTests() {
-        const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
-        OperationContext& txn = *txnPtr;
-        ScopedTransaction transaction(&txn, MODE_IX);
-        Lock::DBLock lk(txn.lockState(), nsToDatabaseSubstring(_ns), MODE_X);
-        OldClientContext ctx(&txn, _ns);
-        WriteUnitOfWork wuow(&txn);
-
-        _db->dropCollection(&txn, _ns);
+        const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+        OperationContext& opCtx = *opCtxPtr;
+        ScopedTransaction transaction(&opCtx, MODE_IX);
+        Lock::DBLock lk(opCtx.lockState(), nsToDatabaseSubstring(_ns), MODE_X);
+        OldClientContext ctx(&opCtx, _ns);
+        WriteUnitOfWork wuow(&opCtx);
+
+        _db->dropCollection(&opCtx, _ns);
         wuow.commit();
     }
 
     void run() {
-        const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
-        OperationContext& txn = *txnPtr;
-        OldClientWriteContext ctx(&txn, _ns);
+        const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+        OperationContext& opCtx = *opCtxPtr;
+        OldClientWriteContext ctx(&opCtx, _ns);
 
-        int numFinishedIndexesStart = _catalog->numIndexesReady(&txn);
+        int numFinishedIndexesStart = _catalog->numIndexesReady(&opCtx);
 
-        dbtests::createIndex(&txn, _ns, BSON("x" << 1));
-        dbtests::createIndex(&txn, _ns, BSON("y" << 1));
+        dbtests::createIndex(&opCtx, _ns, BSON("x" << 1));
+        dbtests::createIndex(&opCtx, _ns, BSON("y" << 1));
 
-        ASSERT_TRUE(_catalog->numIndexesReady(&txn) == numFinishedIndexesStart + 2);
+        ASSERT_TRUE(_catalog->numIndexesReady(&opCtx) == numFinishedIndexesStart + 2);
 
-        IndexCatalog::IndexIterator ii = _catalog->getIndexIterator(&txn, false);
+        IndexCatalog::IndexIterator ii = _catalog->getIndexIterator(&opCtx, false);
         int indexesIterated = 0;
         bool foundIndex = false;
         while (ii.more()) {
@@ -91,7 +91,7 @@ public:
             }
         }
 
-        ASSERT_TRUE(indexesIterated == _catalog->numIndexesReady(&txn));
+        ASSERT_TRUE(indexesIterated == _catalog->numIndexesReady(&opCtx));
         ASSERT_TRUE(foundIndex);
     }
 
@@ -107,64 +107,64 @@ private:
 class RefreshEntry {
 public:
     RefreshEntry() {
-        const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
-        OperationContext& txn = *txnPtr;
-        ScopedTransaction transaction(&txn, MODE_IX);
-        Lock::DBLock lk(txn.lockState(), nsToDatabaseSubstring(_ns), MODE_X);
-        OldClientContext ctx(&txn, _ns);
-        WriteUnitOfWork wuow(&txn);
+        const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+        OperationContext& opCtx = *opCtxPtr;
+        ScopedTransaction transaction(&opCtx, MODE_IX);
+        Lock::DBLock lk(opCtx.lockState(), nsToDatabaseSubstring(_ns), MODE_X);
+        OldClientContext ctx(&opCtx, _ns);
+        WriteUnitOfWork wuow(&opCtx);
 
         _db = ctx.db();
-        _coll = _db->createCollection(&txn, _ns);
+        _coll = _db->createCollection(&opCtx, _ns);
         _catalog = _coll->getIndexCatalog();
         wuow.commit();
     }
 
     ~RefreshEntry() {
-        const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
-        OperationContext& txn = *txnPtr;
-        ScopedTransaction transaction(&txn, MODE_IX);
-        Lock::DBLock lk(txn.lockState(), nsToDatabaseSubstring(_ns), MODE_X);
-        OldClientContext ctx(&txn, _ns);
-        WriteUnitOfWork wuow(&txn);
-
-        _db->dropCollection(&txn, _ns);
+        const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+        OperationContext& opCtx = *opCtxPtr;
+        ScopedTransaction transaction(&opCtx, MODE_IX);
+        Lock::DBLock lk(opCtx.lockState(), nsToDatabaseSubstring(_ns), MODE_X);
+        OldClientContext ctx(&opCtx, _ns);
+        WriteUnitOfWork wuow(&opCtx);
+
+        _db->dropCollection(&opCtx, _ns);
         wuow.commit();
     }
 
     void run() {
-        const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
-        OperationContext& txn = *txnPtr;
-        OldClientWriteContext ctx(&txn, _ns);
+        const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+        OperationContext& opCtx = *opCtxPtr;
+        OldClientWriteContext ctx(&opCtx, _ns);
         const std::string indexName = "x_1";
 
         ASSERT_OK(dbtests::createIndexFromSpec(
-            &txn,
+            &opCtx,
             _ns,
             BSON("name" << indexName << "ns" << _ns << "key" << BSON("x" << 1) << "v"
                         << static_cast<int>(kIndexVersion)
                         << "expireAfterSeconds"
                         << 5)));
 
-        const IndexDescriptor* desc = _catalog->findIndexByName(&txn, indexName);
+        const IndexDescriptor* desc = _catalog->findIndexByName(&opCtx, indexName);
         ASSERT(desc);
         ASSERT_EQUALS(5, desc->infoObj()["expireAfterSeconds"].numberLong());
 
         // Change value of "expireAfterSeconds" on disk.
         {
-            WriteUnitOfWork wuow(&txn);
-            _coll->getCatalogEntry()->updateTTLSetting(&txn, "x_1", 10);
+            WriteUnitOfWork wuow(&opCtx);
+            _coll->getCatalogEntry()->updateTTLSetting(&opCtx, "x_1", 10);
             wuow.commit();
         }
 
         // Verify that the catalog does not yet know of the change.
-        desc = _catalog->findIndexByName(&txn, indexName);
+        desc = _catalog->findIndexByName(&opCtx, indexName);
         ASSERT_EQUALS(5, desc->infoObj()["expireAfterSeconds"].numberLong());
 
         {
             // Notify the catalog of the change.
-            WriteUnitOfWork wuow(&txn);
-            desc = _catalog->refreshEntry(&txn, desc);
+            WriteUnitOfWork wuow(&opCtx);
+            desc = _catalog->refreshEntry(&opCtx, desc);
             wuow.commit();
         }