SERVER-41071 Replace NULL and 0 with nullptr

1 files changed, 22 insertions, 22 deletions

diff --git a/src/mongo/dbtests/plan_executor_invalidation_test.cpp b/src/mongo/dbtests/plan_executor_invalidation_test.cpp
index 2cc4eccd7fa..48e9a7adfb1 100644
--- a/src/mongo/dbtests/plan_executor_invalidation_test.cpp
+++ b/src/mongo/dbtests/plan_executor_invalidation_test.cpp
@@ -76,7 +76,7 @@ public:
         params.direction = CollectionScanParams::FORWARD;
         params.tailable = false;
         unique_ptr<CollectionScan> scan(
-            new CollectionScan(&_opCtx, collection(), params, ws.get(), NULL));
+            new CollectionScan(&_opCtx, collection(), params, ws.get(), nullptr));
 
         // Create a plan executor to hold it
         auto qr = std::make_unique<QueryRequest>(nss);
@@ -138,7 +138,7 @@ TEST_F(PlanExecutorInvalidationTest, ExecutorToleratesDeletedDocumentsDuringYiel
 
     // Read some of it.
     for (int i = 0; i < 10; ++i) {
-        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, NULL));
+        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, nullptr));
         ASSERT_EQUALS(i, obj["foo"].numberInt());
     }
 
@@ -153,11 +153,11 @@ TEST_F(PlanExecutorInvalidationTest, ExecutorToleratesDeletedDocumentsDuringYiel
     // Make sure that the PlanExecutor moved forward over the deleted data.  We don't see foo==10 or
     // foo==11.
     for (int i = 12; i < N(); ++i) {
-        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, NULL));
+        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, nullptr));
         ASSERT_EQUALS(i, obj["foo"].numberInt());
     }
 
-    ASSERT_EQUALS(PlanExecutor::IS_EOF, exec->getNext(&obj, NULL));
+    ASSERT_EQUALS(PlanExecutor::IS_EOF, exec->getNext(&obj, nullptr));
 }
 
 TEST_F(PlanExecutorInvalidationTest, PlanExecutorThrowsOnRestoreWhenCollectionIsDropped) {
@@ -166,7 +166,7 @@ TEST_F(PlanExecutorInvalidationTest, PlanExecutorThrowsOnRestoreWhenCollectionIs
 
     // Read some of it.
     for (int i = 0; i < 10; ++i) {
-        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, NULL));
+        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, nullptr));
         ASSERT_EQUALS(i, obj["foo"].numberInt());
     }
 
@@ -177,7 +177,7 @@ TEST_F(PlanExecutorInvalidationTest, PlanExecutorThrowsOnRestoreWhenCollectionIs
 
     exec->restoreState();
 
-    ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, NULL));
+    ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, nullptr));
     ASSERT_EQUALS(10, obj["foo"].numberInt());
 
     exec->saveState();
@@ -195,7 +195,7 @@ TEST_F(PlanExecutorInvalidationTest, CollScanExecutorDoesNotDieWhenAllIndicesDro
 
     // Read some of it.
     for (int i = 0; i < 10; ++i) {
-        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, NULL));
+        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, nullptr));
         ASSERT_EQUALS(i, obj["foo"].numberInt());
     }
 
@@ -205,7 +205,7 @@ TEST_F(PlanExecutorInvalidationTest, CollScanExecutorDoesNotDieWhenAllIndicesDro
 
     // Read the rest of the collection.
     for (int i = 10; i < N(); ++i) {
-        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, NULL));
+        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, nullptr));
         ASSERT_EQUALS(i, obj["foo"].numberInt());
     }
 }
@@ -218,7 +218,7 @@ TEST_F(PlanExecutorInvalidationTest, CollScanExecutorDoesNotDieWhenOneIndexDropp
 
     // Read some of it.
     for (int i = 0; i < 10; ++i) {
-        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, NULL));
+        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, nullptr));
         ASSERT_EQUALS(i, obj["foo"].numberInt());
     }
 
@@ -228,7 +228,7 @@ TEST_F(PlanExecutorInvalidationTest, CollScanExecutorDoesNotDieWhenOneIndexDropp
 
     // Read the rest of the collection.
     for (int i = 10; i < N(); ++i) {
-        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, NULL));
+        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, nullptr));
         ASSERT_EQUALS(i, obj["foo"].numberInt());
     }
 }
@@ -245,7 +245,7 @@ TEST_F(PlanExecutorInvalidationTest, IxscanExecutorDiesWhenAllIndexesDropped) {
     // Start scanning the index.
     BSONObj obj;
     for (int i = 0; i < 10; ++i) {
-        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, NULL));
+        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, nullptr));
         ASSERT_EQUALS(i, obj.firstElement().numberInt());
     }
 
@@ -266,7 +266,7 @@ TEST_F(PlanExecutorInvalidationTest, IxscanExecutorDiesWhenIndexBeingScannedIsDr
     // Start scanning the index.
     BSONObj obj;
     for (int i = 0; i < 10; ++i) {
-        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, NULL));
+        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, nullptr));
         ASSERT_EQUALS(i, obj.firstElement().numberInt());
     }
 
@@ -289,7 +289,7 @@ TEST_F(PlanExecutorInvalidationTest, IxscanExecutorSurvivesWhenUnrelatedIndexIsD
     // Start scanning the index.
     BSONObj obj;
     for (int i = 0; i < 10; ++i) {
-        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, NULL));
+        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, nullptr));
         ASSERT_EQUALS(i, obj.firstElement().numberInt());
     }
 
@@ -301,7 +301,7 @@ TEST_F(PlanExecutorInvalidationTest, IxscanExecutorSurvivesWhenUnrelatedIndexIsD
 
     // Scan the rest of the index.
     for (int i = 10; i < N(); ++i) {
-        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, NULL));
+        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, nullptr));
         ASSERT_EQUALS(i, obj.firstElement().numberInt());
     }
 }
@@ -312,7 +312,7 @@ TEST_F(PlanExecutorInvalidationTest, ExecutorThrowsOnRestoreWhenDatabaseIsDroppe
 
     // Read some of it.
     for (int i = 0; i < 10; ++i) {
-        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, NULL));
+        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, nullptr));
         ASSERT_EQUALS(i, obj["foo"].numberInt());
     }
 
@@ -325,7 +325,7 @@ TEST_F(PlanExecutorInvalidationTest, ExecutorThrowsOnRestoreWhenDatabaseIsDroppe
     _ctx.reset(new dbtests::WriteContextForTests(&_opCtx, nss.ns()));
     exec->restoreState();
 
-    ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, NULL));
+    ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, nullptr));
     ASSERT_EQUALS(10, obj["foo"].numberInt());
 
     exec->saveState();
@@ -344,7 +344,7 @@ TEST_F(PlanExecutorInvalidationTest, CollScanDiesOnCollectionRenameWithinDatabas
     // Partially scan the collection.
     BSONObj obj;
     for (int i = 0; i < 10; ++i) {
-        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, NULL));
+        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, nullptr));
         ASSERT_EQUALS(i, obj["foo"].numberInt());
     }
 
@@ -371,7 +371,7 @@ TEST_F(PlanExecutorInvalidationTest, IxscanDiesOnCollectionRenameWithinDatabase)
     // Partially scan the index.
     BSONObj obj;
     for (int i = 0; i < 10; ++i) {
-        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, NULL));
+        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, nullptr));
         ASSERT_EQUALS(i, obj.firstElement().numberInt());
     }
 
@@ -400,7 +400,7 @@ TEST_F(PlanExecutorInvalidationTest, CollScanDiesOnRestartCatalog) {
     // Partially scan the collection.
     BSONObj obj;
     for (int i = 0; i < 10; ++i) {
-        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, NULL));
+        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, nullptr));
         ASSERT_EQUALS(i, obj["foo"].numberInt());
     }
 
@@ -421,7 +421,7 @@ TEST_F(PlanExecutorInvalidationTest, IxscanDiesWhenTruncateCollectionDropsAllInd
     // Partially scan the index.
     BSONObj obj;
     for (int i = 0; i < 10; ++i) {
-        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, NULL));
+        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, nullptr));
         ASSERT_EQUALS(i, obj.firstElement().numberInt());
     }
 
@@ -438,7 +438,7 @@ TEST_F(PlanExecutorInvalidationTest, CollScanExecutorSurvivesCollectionTruncate)
     // Partially scan the collection.
     BSONObj obj;
     for (int i = 0; i < 10; ++i) {
-        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, NULL));
+        ASSERT_EQUALS(PlanExecutor::ADVANCED, exec->getNext(&obj, nullptr));
         ASSERT_EQUALS(i, obj["foo"].numberInt());
     }
 
@@ -449,7 +449,7 @@ TEST_F(PlanExecutorInvalidationTest, CollScanExecutorSurvivesCollectionTruncate)
     exec->restoreState();
 
     // Since all documents in the collection have been deleted, the PlanExecutor should issue EOF.
-    ASSERT_EQUALS(PlanExecutor::IS_EOF, exec->getNext(&obj, NULL));
+    ASSERT_EQUALS(PlanExecutor::IS_EOF, exec->getNext(&obj, nullptr));
 }
 
 }  // namespace mongo