SERVER-15333 BtreeLogic tests should not print bucket contents

This generates too much output and is not really useful for debugging.

1 files changed, 73 insertions, 73 deletions

diff --git a/src/mongo/db/storage/mmap_v1/btree/btree_logic_test.cpp b/src/mongo/db/storage/mmap_v1/btree/btree_logic_test.cpp
index 87a7f03feb2..8f452c4141f 100644
--- a/src/mongo/db/storage/mmap_v1/btree/btree_logic_test.cpp
+++ b/src/mongo/db/storage/mmap_v1/btree/btree_logic_test.cpp
@@ -65,7 +65,7 @@ namespace mongo {
     protected:
         void checkValidNumKeys(int nKeys) {
             OperationContextNoop txn;
-            ASSERT_EQUALS(nKeys, _helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(nKeys, _helper.btree.fullValidate(&txn, NULL, true, false, 0));
         }
 
         void insert(const BSONObj &key, const DiskLoc dl) {
@@ -445,7 +445,7 @@ namespace mongo {
             ASSERT_EQUALS(1, this->_helper.recordStore.numRecords(NULL) - 1);
 
             long long unusedCount = 0;
-            ASSERT_EQUALS(expectedCount, this->_helper.btree.fullValidate(&txn, &unusedCount, true, true, 0));
+            ASSERT_EQUALS(expectedCount, this->_helper.btree.fullValidate(&txn, &unusedCount, true, false, 0));
             ASSERT_EQUALS(0, unusedCount);
         }
 
@@ -501,7 +501,7 @@ namespace mongo {
             ASSERT_EQUALS(3, this->_helper.recordStore.numRecords(NULL) - 1);
 
             long long unusedCount = 0;
-            ASSERT_EQUALS(17, this->_helper.btree.fullValidate(&txn, &unusedCount, true, true, 0));
+            ASSERT_EQUALS(17, this->_helper.btree.fullValidate(&txn, &unusedCount, true, false, 0));
             ASSERT_EQUALS(0, unusedCount);
         }
     };
@@ -514,7 +514,7 @@ namespace mongo {
             ArtificialTreeBuilder<OnDiskFormat> builder(&txn, &this->_helper);
 
             builder.makeTree("{d:{b:{a:null},bb:null,_:{c:null}},_:{f:{e:null},_:{g:null}}}");
-            ASSERT_EQUALS(8, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(8, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 7 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(8, this->_helper.recordStore.numRecords(NULL));
@@ -522,7 +522,7 @@ namespace mongo {
             const BSONObj k = BSON("" << "bb");
             verify(this->unindex(k));
 
-            ASSERT_EQUALS(7, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(7, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 5 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(6, this->_helper.recordStore.numRecords(NULL));
@@ -539,7 +539,7 @@ namespace mongo {
             ArtificialTreeBuilder<OnDiskFormat> builder(&txn, &this->_helper);
 
             builder.makeTree("{d:{b:{a:null},bb:null,cc:{c:null}},_:{f:{e:null},h:{g:null}}}");
-            ASSERT_EQUALS(10, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(10, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 7 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(8, this->_helper.recordStore.numRecords(NULL));
@@ -547,7 +547,7 @@ namespace mongo {
             const BSONObj k = BSON("" << "bb");
             verify(this->unindex(k));
 
-            ASSERT_EQUALS(9, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(9, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 5 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(6, this->_helper.recordStore.numRecords(NULL));
@@ -568,7 +568,7 @@ namespace mongo {
 
             builder.makeTree("{d:{b:{a:null},c:null}}");
 
-            ASSERT_EQUALS(4, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(4, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 3 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(4, this->_helper.recordStore.numRecords(NULL));
@@ -576,7 +576,7 @@ namespace mongo {
             const BSONObj k = BSON("" << "c");
             verify(this->unindex(k));
 
-            ASSERT_EQUALS(3, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(3, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 3 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(4, this->_helper.recordStore.numRecords(NULL));
@@ -594,7 +594,7 @@ namespace mongo {
 
             builder.makeTree("{d:{b:{a:null},bb:null,cc:{c:null}},i:{f:{e:null},h:{g:null}}}");
 
-            ASSERT_EQUALS(11, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(11, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 7 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(8, this->_helper.recordStore.numRecords(NULL));
@@ -602,7 +602,7 @@ namespace mongo {
             const BSONObj k = BSON("" << "bb");
             verify(this->unindex(k));
 
-            ASSERT_EQUALS(10, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(10, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // Child does not currently replace parent in this case. Also, the tree 
             // has 6 buckets + 1 for the this->_helper.dummyDiskLoc.
@@ -621,7 +621,7 @@ namespace mongo {
 
             builder.makeTree("{d:{b:{a:null},cc:{c:null}},i:{f:{e:null},ff:null,h:{g:null}}}");
 
-            ASSERT_EQUALS(11, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(11, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 7 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(8, this->_helper.recordStore.numRecords(NULL));
@@ -629,7 +629,7 @@ namespace mongo {
             const BSONObj k = BSON("" << "ff");
             verify(this->unindex(k));
 
-            ASSERT_EQUALS(10, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(10, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // Child does not currently replace parent in this case. Also, the tree 
             // has 6 buckets + 1 for the this->_helper.dummyDiskLoc.
@@ -650,7 +650,7 @@ namespace mongo {
                              "dd:null,"
                              "_:{f:{e:null},h:{g:null}}}");
 
-            ASSERT_EQUALS(11, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(11, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 7 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(8, this->_helper.recordStore.numRecords(NULL));
@@ -658,7 +658,7 @@ namespace mongo {
             const BSONObj k = BSON("" << "bb");
             verify(this->unindex(k));
 
-            ASSERT_EQUALS(10, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(10, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 7 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(8, this->_helper.recordStore.numRecords(NULL));
@@ -678,7 +678,7 @@ namespace mongo {
 
             builder.makeTree("{c:{b:{a:null}},d:null,_:{f:{e:null},g:null}}");
 
-            ASSERT_EQUALS(7, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(7, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 5 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(6, this->_helper.recordStore.numRecords(NULL));
@@ -686,7 +686,7 @@ namespace mongo {
             const BSONObj k = BSON("" << "g");
             verify(this->unindex(k));
 
-            ASSERT_EQUALS(6, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(6, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 5 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(6, this->_helper.recordStore.numRecords(NULL));
@@ -704,7 +704,7 @@ namespace mongo {
 
             builder.makeTree("{c:{b:{a:null}},f:{e:{d:null},ee:null},_:{h:{g:null}}}");
 
-            ASSERT_EQUALS(9, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(9, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 7 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(8, this->_helper.recordStore.numRecords(NULL));
@@ -712,7 +712,7 @@ namespace mongo {
             const BSONObj k = BSON("" << "ee");
             verify(this->unindex(k));
 
-            ASSERT_EQUALS(8, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(8, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 6 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(7, this->_helper.recordStore.numRecords(NULL));
@@ -730,7 +730,7 @@ namespace mongo {
 
             builder.makeTree("{c:{b:{a:null}},f:{e:{d:null},ee:null},ff:null,_:{h:{g:null}}}");
 
-            ASSERT_EQUALS(10, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(10, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 7 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(8, this->_helper.recordStore.numRecords(NULL));
@@ -738,7 +738,7 @@ namespace mongo {
             const BSONObj k = BSON("" << "ee");
             verify(this->unindex(k));
             
-            ASSERT_EQUALS(9, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(9, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 6 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(7, this->_helper.recordStore.numRecords(NULL));
@@ -756,7 +756,7 @@ namespace mongo {
 
             builder.makeTree("{c:{b:{a:null}},cc:null,f:{e:{d:null},ee:null},_:{h:{g:null}}}");
 
-            ASSERT_EQUALS(10, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(10, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 7 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(8, this->_helper.recordStore.numRecords(NULL));
@@ -764,7 +764,7 @@ namespace mongo {
             const BSONObj k = BSON("" << "ee");
             verify(this->unindex(k));
 
-            ASSERT_EQUALS(9, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(9, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 6 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(7, this->_helper.recordStore.numRecords(NULL));
@@ -782,7 +782,7 @@ namespace mongo {
 
             builder.makeTree("{h:{e:{b:{a:null},c:null,d:null},g:{f:null}},j:{i:null}}");
 
-            ASSERT_EQUALS(10, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(10, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 6 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(7, this->_helper.recordStore.numRecords(NULL));
@@ -790,7 +790,7 @@ namespace mongo {
             const BSONObj k = BSON("" << "c");
             verify(this->unindex(k));
 
-            ASSERT_EQUALS(9, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(9, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 4 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(5, this->_helper.recordStore.numRecords(NULL));
@@ -809,7 +809,7 @@ namespace mongo {
 
             builder.makeTree("{h:{e:{b:{a:null},c:null,d:null},g:{f:null}},_:{i:null}}");
 
-            ASSERT_EQUALS(9, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(9, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 6 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(7, this->_helper.recordStore.numRecords(NULL));
@@ -817,7 +817,7 @@ namespace mongo {
             const BSONObj k = BSON("" << "c");
             verify(this->unindex(k));
 
-            ASSERT_EQUALS(8, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(8, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 3 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(4, this->_helper.recordStore.numRecords(NULL));
@@ -835,7 +835,7 @@ namespace mongo {
 
             builder.makeTree("{h:{e:{b:{a:null},c:null,d:null},_:{f:null}},_:{i:null}}");
 
-            ASSERT_EQUALS(8, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(8, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 6 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(7, this->_helper.recordStore.numRecords(NULL));
@@ -843,7 +843,7 @@ namespace mongo {
             const BSONObj k = BSON("" << "c");
             verify(this->unindex(k));
 
-            ASSERT_EQUALS(7, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(7, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 4 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(5, this->_helper.recordStore.numRecords(NULL));
@@ -901,7 +901,7 @@ namespace mongo {
             const char *keys = delKeys();
             for (const char *i = keys; *i; ++i) {
                 long long unused = 0;
-                ASSERT_EQUALS(_count, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+                ASSERT_EQUALS(_count, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
                 ASSERT_EQUALS(0, unused);
 
                 // The tree has 3 buckets + 1 for the this->_helper.dummyDiskLoc
@@ -914,7 +914,7 @@ namespace mongo {
             }
 
             long long unused = 0;
-            ASSERT_EQUALS(_count, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+            ASSERT_EQUALS(_count, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
             ASSERT_EQUALS(0, unused);
 
             validate();
@@ -1145,7 +1145,7 @@ namespace mongo {
                                 "b:{$20:null,$30:null,$40:null,$50:null,a:null},"
                                 "_:{c:null}}");
 
-            ASSERT_EQUALS(14, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(14, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 4 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(5, this->_helper.recordStore.numRecords(NULL));
@@ -1153,7 +1153,7 @@ namespace mongo {
             const BSONObj k = BSON("" << bigNumString(0x40, 800));
             ASSERT(this->unindex(k));
 
-            ASSERT_EQUALS(13, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(13, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 4 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(5, this->_helper.recordStore.numRecords(NULL));
@@ -1175,7 +1175,7 @@ namespace mongo {
                                 "b:{$20:null,$30:null,$40:null,$50:null,$60:null,$70:null},"
                                 "_:{c:null}}");
 
-            ASSERT_EQUALS(13, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(13, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 4 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(5, this->_helper.recordStore.numRecords(NULL));
@@ -1183,7 +1183,7 @@ namespace mongo {
             const BSONObj k = BSON("" << bigNumString(0x3, 800));
             ASSERT(this->unindex(k));
 
-            ASSERT_EQUALS(12, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(12, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 4 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(5, this->_helper.recordStore.numRecords(NULL));
@@ -1206,7 +1206,7 @@ namespace mongo {
                                 "b:{$30:null,$40:{$35:null},$50:{$45:null}},"
                                 "_:{c:null}}");
 
-            ASSERT_EQUALS(23, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(23, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 14 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(15, this->_helper.recordStore.numRecords(NULL));
@@ -1214,7 +1214,7 @@ namespace mongo {
             const BSONObj k = BSON("" << bigNumString(0x30, 800));
             ASSERT(this->unindex(k));
 
-            ASSERT_EQUALS(22, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(22, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 14 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(15, this->_helper.recordStore.numRecords(NULL));
@@ -1240,7 +1240,7 @@ namespace mongo {
                                         "$90:{$85:null},$100:{$95:null}},"
                                 "_:{c:null}}");
 
-            ASSERT_EQUALS(25, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(25, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 15 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(16, this->_helper.recordStore.numRecords(NULL));
@@ -1248,7 +1248,7 @@ namespace mongo {
             const BSONObj k = BSON("" << bigNumString(0x5, 800));
             ASSERT(this->unindex(k));
 
-            ASSERT_EQUALS(24, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(24, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 15 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(16, this->_helper.recordStore.numRecords(NULL));
@@ -1271,7 +1271,7 @@ namespace mongo {
             builder.makeTree("{$10:{$1:null,$2:null,$3:null,$4:null,$5:null,$6:null},"
                                 "_:{$20:null,$30:null,$40:null,$50:null,a:null}}");
 
-            ASSERT_EQUALS(12, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(12, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 3 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(4, this->_helper.recordStore.numRecords(NULL));
@@ -1279,7 +1279,7 @@ namespace mongo {
             const BSONObj k = BSON("" << bigNumString(0x40, 800));
             ASSERT(this->unindex(k));
 
-            ASSERT_EQUALS(11, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(11, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 3 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(4, this->_helper.recordStore.numRecords(NULL));
@@ -1351,7 +1351,7 @@ namespace mongo {
             builder.makeTree("{$10:{$1:null,$2:null,$3:null,$4:null,$5:null,$6:null},"
                                 "_:{$20:null,$30:null,$40:null,$50:null,a:null}}");
 
-            ASSERT_EQUALS(12, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(12, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 3 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(4, this->_helper.recordStore.numRecords(NULL));
@@ -1362,7 +1362,7 @@ namespace mongo {
             const BSONObj k = BSON("" << bigNumString(0x40, 800));
             ASSERT(this->unindex(k));
 
-            ASSERT_EQUALS(11, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(11, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 3 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(4, this->_helper.recordStore.numRecords(NULL));
@@ -1385,7 +1385,7 @@ namespace mongo {
                    "$200:null,$300:null,$400:null,$500:null,$600:null,"
                    "$700:null,$800:null,$900:null,_:{c:null}}");
 
-            ASSERT_EQUALS(22, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(22, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 4 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(5, this->_helper.recordStore.numRecords(NULL));
@@ -1393,7 +1393,7 @@ namespace mongo {
             const BSONObj k = BSON("" << bigNumString(0x3, 800));
             ASSERT(this->unindex(k));
 
-            ASSERT_EQUALS(21, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(21, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 6 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(7, this->_helper.recordStore.numRecords(NULL));
@@ -1574,7 +1574,7 @@ namespace mongo {
                               "$20:{$11:null,$12:null,$13:null,$14:null},"
                                 "_:{$30:null}}");
 
-            ASSERT_EQUALS(13, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(13, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 4 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(5, this->_helper.recordStore.numRecords(NULL));
@@ -1582,7 +1582,7 @@ namespace mongo {
             const BSONObj k = BSON("" << bigNumString(0x12, 800));
             ASSERT(this->unindex(k));
 
-            ASSERT_EQUALS(12, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(12, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 4 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(5, this->_helper.recordStore.numRecords(NULL));
@@ -1604,7 +1604,7 @@ namespace mongo {
                               "$20:{$11:null,$12:null,$13:null,$14:null},"
                                 "_:{$31:null,$32:null,$33:null,$34:null,$35:null,$36:null}}");
 
-            ASSERT_EQUALS(13, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(13, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 4 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(5, this->_helper.recordStore.numRecords(NULL));
@@ -1612,7 +1612,7 @@ namespace mongo {
             const BSONObj k = BSON("" << bigNumString(0x12, 800));
             ASSERT(this->unindex(k));
 
-            ASSERT_EQUALS(12, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(12, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 4 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(5, this->_helper.recordStore.numRecords(NULL));
@@ -1634,7 +1634,7 @@ namespace mongo {
                                 "_:{$20:null,$30:null,$40:null,$50:null,"
                                     "$60:null,$70:null,$80:null,$90:null}}");
 
-            ASSERT_EQUALS(15, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(15, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 5 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(6, this->_helper.recordStore.numRecords(NULL));
@@ -1642,7 +1642,7 @@ namespace mongo {
             const BSONObj k = BSON("" << bigNumString(0x7, 800));
             ASSERT(this->unindex(k));
 
-            ASSERT_EQUALS(14, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(14, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 4 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(5, this->_helper.recordStore.numRecords(NULL));
@@ -1662,7 +1662,7 @@ namespace mongo {
 
             builder.makeTree("{b:{a:null}}");
 
-            ASSERT_EQUALS(2, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(2, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 2 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(3, this->_helper.recordStore.numRecords(NULL));
@@ -1670,7 +1670,7 @@ namespace mongo {
             const BSONObj k = BSON("" << "a");
             ASSERT(this->unindex(k));
 
-            ASSERT_EQUALS(1, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(1, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 1 bucket + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(2, this->_helper.recordStore.numRecords(NULL));
@@ -1688,7 +1688,7 @@ namespace mongo {
 
             builder.makeTree("{a:null,c:{b:null},d:null}");
 
-            ASSERT_EQUALS(4, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(4, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 2 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(3, this->_helper.recordStore.numRecords(NULL));
@@ -1696,7 +1696,7 @@ namespace mongo {
             const BSONObj k = BSON("" << "b");
             ASSERT(this->unindex(k));
 
-            ASSERT_EQUALS(3, this->_helper.btree.fullValidate(&txn, NULL, true, true, 0));
+            ASSERT_EQUALS(3, this->_helper.btree.fullValidate(&txn, NULL, true, false, 0));
 
             // The tree has 1 bucket + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(2, this->_helper.recordStore.numRecords(NULL));
@@ -1715,7 +1715,7 @@ namespace mongo {
             builder.makeTree("{a:null,c:{b:null},d:null}");
 
             long long unused = 0;
-            ASSERT_EQUALS(4, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+            ASSERT_EQUALS(4, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
 
             // The tree has 2 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(3, this->_helper.recordStore.numRecords(NULL));
@@ -1724,7 +1724,7 @@ namespace mongo {
             const BSONObj k = BSON("" << "c");
             ASSERT(this->unindex(k));
 
-            ASSERT_EQUALS(3, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+            ASSERT_EQUALS(3, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
 
             // The tree has 1 bucket + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(2, this->_helper.recordStore.numRecords(NULL));
@@ -1748,7 +1748,7 @@ namespace mongo {
             this->markKeyUnused(prevChildBucket, 0);
 
             long long unused = 0;
-            ASSERT_EQUALS(3, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+            ASSERT_EQUALS(3, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
 
             // The tree has 2 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(3, this->_helper.recordStore.numRecords(NULL));
@@ -1758,7 +1758,7 @@ namespace mongo {
             ASSERT(this->unindex(k));
 
             unused = 0;
-            ASSERT_EQUALS(2, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+            ASSERT_EQUALS(2, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
 
             // The tree has 1 bucket + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(2, this->_helper.recordStore.numRecords(NULL));
@@ -1779,7 +1779,7 @@ namespace mongo {
             builder.makeTree("{a:null,_:{b:null}}");
 
             long long unused = 0;
-            ASSERT_EQUALS(2, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+            ASSERT_EQUALS(2, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
 
             // The tree has 2 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(3, this->_helper.recordStore.numRecords(NULL));
@@ -1789,7 +1789,7 @@ namespace mongo {
             ASSERT(this->unindex(k));
 
             unused = 0;
-            ASSERT_EQUALS(1, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+            ASSERT_EQUALS(1, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
 
             // The tree has 1 bucket + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(2, this->_helper.recordStore.numRecords(NULL));
@@ -1809,7 +1809,7 @@ namespace mongo {
             builder.makeTree("{a:null,y:{d:{c:{b:null}},_:{e:null}},z:null}");
 
             long long unused = 0;
-            ASSERT_EQUALS(7, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+            ASSERT_EQUALS(7, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
 
             // The tree has 5 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(6, this->_helper.recordStore.numRecords(NULL));
@@ -1819,7 +1819,7 @@ namespace mongo {
             ASSERT(this->unindex(k));
 
             unused = 0;
-            ASSERT_EQUALS(6, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+            ASSERT_EQUALS(6, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
 
             // The tree has 3 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(4, this->_helper.recordStore.numRecords(NULL));
@@ -1839,7 +1839,7 @@ namespace mongo {
             builder.makeTree("{a:null,_:{e:{c:null},_:{f:null}}}");
 
             long long unused = 0;
-            ASSERT_EQUALS(4, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+            ASSERT_EQUALS(4, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
 
             // The tree has 4 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(5, this->_helper.recordStore.numRecords(NULL));
@@ -1849,7 +1849,7 @@ namespace mongo {
             ASSERT(this->unindex(k));
 
             unused = 0;
-            ASSERT_EQUALS(3, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+            ASSERT_EQUALS(3, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
 
             // The tree has 2 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(3, this->_helper.recordStore.numRecords(NULL));
@@ -1869,7 +1869,7 @@ namespace mongo {
             builder.makeTree("{a:null,d:{c:{b:null}},e:null}");
 
             long long unused = 0;
-            ASSERT_EQUALS(5, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+            ASSERT_EQUALS(5, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
 
             // The tree has 3 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(4, this->_helper.recordStore.numRecords(NULL));
@@ -1878,7 +1878,7 @@ namespace mongo {
             const BSONObj k = BSON("" << "d");
             ASSERT(this->unindex(k));
 
-            ASSERT_EQUALS(4, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+            ASSERT_EQUALS(4, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
 
             // The tree has 3 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(4, this->_helper.recordStore.numRecords(NULL));
@@ -1901,7 +1901,7 @@ namespace mongo {
             builder.makeTree("{a:null,_:{c:null,_:{d:null}}}");
 
             long long unused = 0;
-            ASSERT_EQUALS(3, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+            ASSERT_EQUALS(3, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
 
             // The tree has 3 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(4, this->_helper.recordStore.numRecords(NULL));
@@ -1910,7 +1910,7 @@ namespace mongo {
             const BSONObj k = BSON("" << "a");
             ASSERT(this->unindex(k));
 
-            ASSERT_EQUALS(2, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+            ASSERT_EQUALS(2, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
 
             // The tree has 3 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(4, this->_helper.recordStore.numRecords(NULL));
@@ -1934,7 +1934,7 @@ namespace mongo {
                               "$40:null,$50:null,$60:null,$70:null,$80:null,$90:null,$100:null}");
 
             long long unused = 0;
-            ASSERT_EQUALS(13, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+            ASSERT_EQUALS(13, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
 
             // The tree has 4 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(5, this->_helper.recordStore.numRecords(NULL));
@@ -1943,7 +1943,7 @@ namespace mongo {
             const BSONObj k = BSON("" << bigNumString(0x30, 0x10));
             ASSERT(this->unindex(k));
 
-            ASSERT_EQUALS(12, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+            ASSERT_EQUALS(12, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
 
             // The tree has 4 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(5, this->_helper.recordStore.numRecords(NULL));
@@ -1966,7 +1966,7 @@ namespace mongo {
                               "$80:null,$90:null,$100$10:{$95:{$93:null},_:{$97:null}}}");
 
             long long unused = 0;
-            ASSERT_EQUALS(13, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+            ASSERT_EQUALS(13, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
 
             // The tree has 4 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(5, this->_helper.recordStore.numRecords(NULL));
@@ -1975,7 +1975,7 @@ namespace mongo {
             const BSONObj k = BSON("" << bigNumString(0x100, 0x10));
             ASSERT(this->unindex(k));
 
-            ASSERT_EQUALS(12, this->_helper.btree.fullValidate(&txn, &unused, true, true, 0));
+            ASSERT_EQUALS(12, this->_helper.btree.fullValidate(&txn, &unused, true, false, 0));
 
             // The tree has 4 buckets + 1 for the this->_helper.dummyDiskLoc
             ASSERT_EQUALS(5, this->_helper.recordStore.numRecords(NULL));