diff options
Diffstat (limited to 'src/mongo/db/storage/mmap_v1')
4 files changed, 132 insertions, 93 deletions
diff --git a/src/mongo/db/storage/mmap_v1/btree/btree_logic.cpp b/src/mongo/db/storage/mmap_v1/btree/btree_logic.cpp index 28a822c7814..cb35765e131 100644 --- a/src/mongo/db/storage/mmap_v1/btree/btree_logic.cpp +++ b/src/mongo/db/storage/mmap_v1/btree/btree_logic.cpp @@ -1811,7 +1811,8 @@ void BtreeLogic<BtreeLayout>::split(OperationContext* opCtx, splitkey.recordLoc, true, // dupsallowed bucketLoc, - rLoc); + rLoc) + .transitional_ignore(); } int newpos = keypos; @@ -2336,7 +2337,7 @@ DiskLoc BtreeLogic<BtreeLayout>::_locate(OperationContext* opCtx, int position; BucketType* bucket = getBucket(opCtx, bucketLoc); // XXX: owned to not owned conversion(?) - _find(opCtx, bucket, key, recordLoc, false, &position, foundOut); + _find(opCtx, bucket, key, recordLoc, false, &position, foundOut).transitional_ignore(); // Look in our current bucket. if (*foundOut) { 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 e34a5c5a22e..d4274feaa4b 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 @@ -185,7 +185,7 @@ class SimpleCreate : public BtreeLogicTestBase<OnDiskFormat> { public: void run() { OperationContextNoop opCtx; - this->_helper.btree.initAsEmpty(&opCtx); + this->_helper.btree.initAsEmpty(&opCtx).transitional_ignore(); this->checkValidNumKeys(0); } @@ -196,10 +196,10 @@ class SimpleInsertDelete : public BtreeLogicTestBase<OnDiskFormat> { public: void run() { OperationContextNoop opCtx; - this->_helper.btree.initAsEmpty(&opCtx); + this->_helper.btree.initAsEmpty(&opCtx).transitional_ignore(); BSONObj key = simpleKey('z'); - this->insert(key, this->_helper.dummyDiskLoc); + this->insert(key, this->_helper.dummyDiskLoc).transitional_ignore(); this->checkValidNumKeys(1); this->locate(key, 0, true, this->_helper.headManager.getHead(&opCtx), 1); @@ -216,14 +216,14 @@ class SplitUnevenBucketBase : public BtreeLogicTestBase<OnDiskFormat> { public: void run() { OperationContextNoop opCtx; - this->_helper.btree.initAsEmpty(&opCtx); + this->_helper.btree.initAsEmpty(&opCtx).transitional_ignore(); for (int i = 0; i < 10; ++i) { BSONObj shortKey = simpleKey(shortToken(i), 1); - this->insert(shortKey, this->_helper.dummyDiskLoc); + this->insert(shortKey, this->_helper.dummyDiskLoc).transitional_ignore(); BSONObj longKey = simpleKey(longToken(i), 800); - this->insert(longKey, this->_helper.dummyDiskLoc); + this->insert(longKey, this->_helper.dummyDiskLoc).transitional_ignore(); } this->checkValidNumKeys(20); @@ -280,11 +280,11 @@ class MissingLocate : public BtreeLogicTestBase<OnDiskFormat> { public: void run() { OperationContextNoop opCtx; - this->_helper.btree.initAsEmpty(&opCtx); + this->_helper.btree.initAsEmpty(&opCtx).transitional_ignore(); for (int i = 0; i < 3; ++i) { BSONObj k = simpleKey('b' + 2 * i); - this->insert(k, this->_helper.dummyDiskLoc); + this->insert(k, this->_helper.dummyDiskLoc).transitional_ignore(); } locateExtended(1, 'a', 'b', this->_helper.headManager.getHead(&opCtx)); @@ -318,20 +318,20 @@ class MissingLocateMultiBucket : public BtreeLogicTestBase<OnDiskFormat> { public: void run() { OperationContextNoop opCtx; - this->_helper.btree.initAsEmpty(&opCtx); + this->_helper.btree.initAsEmpty(&opCtx).transitional_ignore(); - this->insert(simpleKey('A', 800), this->_helper.dummyDiskLoc); - this->insert(simpleKey('B', 800), this->_helper.dummyDiskLoc); - this->insert(simpleKey('C', 800), this->_helper.dummyDiskLoc); - this->insert(simpleKey('D', 800), this->_helper.dummyDiskLoc); - this->insert(simpleKey('E', 800), this->_helper.dummyDiskLoc); - this->insert(simpleKey('F', 800), this->_helper.dummyDiskLoc); - this->insert(simpleKey('G', 800), this->_helper.dummyDiskLoc); - this->insert(simpleKey('H', 800), this->_helper.dummyDiskLoc); - this->insert(simpleKey('J', 800), this->_helper.dummyDiskLoc); + this->insert(simpleKey('A', 800), this->_helper.dummyDiskLoc).transitional_ignore(); + this->insert(simpleKey('B', 800), this->_helper.dummyDiskLoc).transitional_ignore(); + this->insert(simpleKey('C', 800), this->_helper.dummyDiskLoc).transitional_ignore(); + this->insert(simpleKey('D', 800), this->_helper.dummyDiskLoc).transitional_ignore(); + this->insert(simpleKey('E', 800), this->_helper.dummyDiskLoc).transitional_ignore(); + this->insert(simpleKey('F', 800), this->_helper.dummyDiskLoc).transitional_ignore(); + this->insert(simpleKey('G', 800), this->_helper.dummyDiskLoc).transitional_ignore(); + this->insert(simpleKey('H', 800), this->_helper.dummyDiskLoc).transitional_ignore(); + this->insert(simpleKey('J', 800), this->_helper.dummyDiskLoc).transitional_ignore(); // This causes split - this->insert(simpleKey('I', 800), this->_helper.dummyDiskLoc); + this->insert(simpleKey('I', 800), this->_helper.dummyDiskLoc).transitional_ignore(); int pos; DiskLoc loc; @@ -370,20 +370,20 @@ class SERVER983 : public BtreeLogicTestBase<OnDiskFormat> { public: void run() { OperationContextNoop opCtx; - this->_helper.btree.initAsEmpty(&opCtx); + this->_helper.btree.initAsEmpty(&opCtx).transitional_ignore(); - this->insert(simpleKey('A', 800), this->_helper.dummyDiskLoc); - this->insert(simpleKey('B', 800), this->_helper.dummyDiskLoc); - this->insert(simpleKey('C', 800), this->_helper.dummyDiskLoc); - this->insert(simpleKey('D', 800), this->_helper.dummyDiskLoc); - this->insert(simpleKey('E', 800), this->_helper.dummyDiskLoc); - this->insert(simpleKey('F', 800), this->_helper.dummyDiskLoc); - this->insert(simpleKey('G', 800), this->_helper.dummyDiskLoc); - this->insert(simpleKey('H', 800), this->_helper.dummyDiskLoc); - this->insert(simpleKey('I', 800), this->_helper.dummyDiskLoc); + this->insert(simpleKey('A', 800), this->_helper.dummyDiskLoc).transitional_ignore(); + this->insert(simpleKey('B', 800), this->_helper.dummyDiskLoc).transitional_ignore(); + this->insert(simpleKey('C', 800), this->_helper.dummyDiskLoc).transitional_ignore(); + this->insert(simpleKey('D', 800), this->_helper.dummyDiskLoc).transitional_ignore(); + this->insert(simpleKey('E', 800), this->_helper.dummyDiskLoc).transitional_ignore(); + this->insert(simpleKey('F', 800), this->_helper.dummyDiskLoc).transitional_ignore(); + this->insert(simpleKey('G', 800), this->_helper.dummyDiskLoc).transitional_ignore(); + this->insert(simpleKey('H', 800), this->_helper.dummyDiskLoc).transitional_ignore(); + this->insert(simpleKey('I', 800), this->_helper.dummyDiskLoc).transitional_ignore(); // This will cause split - this->insert(simpleKey('J', 800), this->_helper.dummyDiskLoc); + this->insert(simpleKey('J', 800), this->_helper.dummyDiskLoc).transitional_ignore(); int pos; DiskLoc loc; @@ -419,17 +419,17 @@ class DontReuseUnused : public BtreeLogicTestBase<OnDiskFormat> { public: void run() { OperationContextNoop opCtx; - this->_helper.btree.initAsEmpty(&opCtx); + this->_helper.btree.initAsEmpty(&opCtx).transitional_ignore(); for (int i = 0; i < 10; ++i) { const BSONObj k = simpleKey('b' + 2 * i, 800); - this->insert(k, this->_helper.dummyDiskLoc); + this->insert(k, this->_helper.dummyDiskLoc).transitional_ignore(); } const BSONObj root = simpleKey('p', 800); this->unindex(root); - this->insert(root, this->_helper.dummyDiskLoc); + this->insert(root, this->_helper.dummyDiskLoc).transitional_ignore(); this->locate(root, 0, true, this->head()->nextChild, 1); } }; @@ -439,11 +439,11 @@ class MergeBucketsTestBase : public BtreeLogicTestBase<OnDiskFormat> { public: void run() { OperationContextNoop opCtx; - this->_helper.btree.initAsEmpty(&opCtx); + this->_helper.btree.initAsEmpty(&opCtx).transitional_ignore(); for (int i = 0; i < 10; ++i) { const BSONObj k = simpleKey('b' + 2 * i, 800); - this->insert(k, this->_helper.dummyDiskLoc); + this->insert(k, this->_helper.dummyDiskLoc).transitional_ignore(); } // numRecords() - 1, because this->_helper.dummyDiskLoc is actually in the record store too @@ -495,11 +495,11 @@ class MergeBucketsDontReplaceHead : public BtreeLogicTestBase<OnDiskFormat> { public: void run() { OperationContextNoop opCtx; - this->_helper.btree.initAsEmpty(&opCtx); + this->_helper.btree.initAsEmpty(&opCtx).transitional_ignore(); for (int i = 0; i < 18; ++i) { const BSONObj k = simpleKey('a' + i, 800); - this->insert(k, this->_helper.dummyDiskLoc); + this->insert(k, this->_helper.dummyDiskLoc).transitional_ignore(); } // numRecords(NULL) - 1, because fixedDiskLoc is actually in the record store too @@ -884,7 +884,7 @@ public: void run() { OperationContextNoop opCtx; - this->_helper.btree.initAsEmpty(&opCtx); + this->_helper.btree.initAsEmpty(&opCtx).transitional_ignore(); ArtificialTreeBuilder<OnDiskFormat> builder(&opCtx, &this->_helper); @@ -2181,14 +2181,14 @@ class LocateEmptyForward : public BtreeLogicTestBase<OnDiskFormat> { public: void run() { OperationContextNoop opCtx; - this->_helper.btree.initAsEmpty(&opCtx); + this->_helper.btree.initAsEmpty(&opCtx).transitional_ignore(); BSONObj key1 = simpleKey('a'); - this->insert(key1, this->_helper.dummyDiskLoc); + this->insert(key1, this->_helper.dummyDiskLoc).transitional_ignore(); BSONObj key2 = simpleKey('b'); - this->insert(key2, this->_helper.dummyDiskLoc); + this->insert(key2, this->_helper.dummyDiskLoc).transitional_ignore(); BSONObj key3 = simpleKey('c'); - this->insert(key3, this->_helper.dummyDiskLoc); + this->insert(key3, this->_helper.dummyDiskLoc).transitional_ignore(); this->checkValidNumKeys(3); this->locate(BSONObj(), 0, false, this->_helper.headManager.getHead(&opCtx), 1); @@ -2200,14 +2200,14 @@ class LocateEmptyReverse : public BtreeLogicTestBase<OnDiskFormat> { public: void run() { OperationContextNoop opCtx; - this->_helper.btree.initAsEmpty(&opCtx); + this->_helper.btree.initAsEmpty(&opCtx).transitional_ignore(); BSONObj key1 = simpleKey('a'); - this->insert(key1, this->_helper.dummyDiskLoc); + this->insert(key1, this->_helper.dummyDiskLoc).transitional_ignore(); BSONObj key2 = simpleKey('b'); - this->insert(key2, this->_helper.dummyDiskLoc); + this->insert(key2, this->_helper.dummyDiskLoc).transitional_ignore(); BSONObj key3 = simpleKey('c'); - this->insert(key3, this->_helper.dummyDiskLoc); + this->insert(key3, this->_helper.dummyDiskLoc).transitional_ignore(); this->checkValidNumKeys(3); this->locate(BSONObj(), -1, false, DiskLoc(), -1); @@ -2219,7 +2219,7 @@ class DuplicateKeys : public BtreeLogicTestBase<OnDiskFormat> { public: void run() { OperationContextNoop opCtx; - this->_helper.btree.initAsEmpty(&opCtx); + this->_helper.btree.initAsEmpty(&opCtx).transitional_ignore(); BSONObj key1 = simpleKey('z'); ASSERT_OK(this->insert(key1, this->_helper.dummyDiskLoc, true)); diff --git a/src/mongo/db/storage/mmap_v1/record_store_v1_capped_test.cpp b/src/mongo/db/storage/mmap_v1/record_store_v1_capped_test.cpp index de02abcf76b..f12f3328e72 100644 --- a/src/mongo/db/storage/mmap_v1/record_store_v1_capped_test.cpp +++ b/src/mongo/db/storage/mmap_v1/record_store_v1_capped_test.cpp @@ -74,7 +74,7 @@ void simpleInsertTest(const char* buf, int size) { ASSERT_NOT_OK(rs.insertRecord(&opCtx, buf, 3, 1000).getStatus()); - rs.insertRecord(&opCtx, buf, size, 10000); + rs.insertRecord(&opCtx, buf, size, 10000).status_with_transitional_ignore(); { BSONObjBuilder b; @@ -119,7 +119,8 @@ TEST(CappedRecordStoreV1, EmptySingleExtent) { initializeV1RS(&opCtx, records, drecs, NULL, &em, md); } - rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false); + rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); { LocAndSize recs[] = {{DiskLoc(0, 1000), 100}, {}}; @@ -150,7 +151,8 @@ TEST(CappedRecordStoreV1, FirstLoopWithSingleExtentExactSize) { initializeV1RS(&opCtx, records, drecs, NULL, &em, md); } - rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false); + rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); { LocAndSize recs[] = {{DiskLoc(0, 1200), 100}, // first old record @@ -188,7 +190,8 @@ TEST(CappedRecordStoreV1, NonFirstLoopWithSingleExtentExactSize) { initializeV1RS(&opCtx, records, drecs, NULL, &em, md); } - rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false); + rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); { LocAndSize recs[] = {{DiskLoc(0, 1200), 100}, // first old record @@ -229,7 +232,8 @@ TEST(CappedRecordStoreV1, WillLoopWithout24SpareBytes) { initializeV1RS(&opCtx, records, drecs, NULL, &em, md); } - rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false); + rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); { LocAndSize recs[] = {{DiskLoc(0, 1200), 100}, // first old record @@ -266,7 +270,8 @@ TEST(CappedRecordStoreV1, WontLoopWith24SpareBytes) { initializeV1RS(&opCtx, records, drecs, NULL, &em, md); } - rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false); + rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); { LocAndSize recs[] = {{DiskLoc(0, 1000), 100}, @@ -301,7 +306,8 @@ TEST(CappedRecordStoreV1, MoveToSecondExtentUnLooped) { initializeV1RS(&opCtx, records, drecs, NULL, &em, md); } - rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false); + rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); { LocAndSize recs[] = {{DiskLoc(0, 1000), 500}, @@ -339,7 +345,8 @@ TEST(CappedRecordStoreV1, MoveToSecondExtentLooped) { initializeV1RS(&opCtx, records, drecs, NULL, &em, md); } - rs.insertRecord(&opCtx, zeros, 200 - MmapV1RecordHeader::HeaderSize, false); + rs.insertRecord(&opCtx, zeros, 200 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); { LocAndSize recs[] = {{DiskLoc(0, 1000), 500}, @@ -424,13 +431,16 @@ TEST(CappedRecordStoreV1Scrambler, Minimal) { initializeV1RS(&opCtx, records, drecs, NULL, &em, md); } - rs.insertRecord(&opCtx, zeros, 500 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 300 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord( - &opCtx, zeros, 400 - MmapV1RecordHeader::HeaderSize, false); // won't fit at end so wraps - rs.insertRecord(&opCtx, zeros, 120 - MmapV1RecordHeader::HeaderSize, false); // fits at end - rs.insertRecord( - &opCtx, zeros, 60 - MmapV1RecordHeader::HeaderSize, false); // fits in earlier hole + rs.insertRecord(&opCtx, zeros, 500 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 300 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 400 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); // won't fit at end so wraps + rs.insertRecord(&opCtx, zeros, 120 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); // fits at end + rs.insertRecord(&opCtx, zeros, 60 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); // fits in earlier hole { LocAndSize recs[] = {{DiskLoc(0, 1500), 300}, // 2nd insert @@ -467,34 +477,62 @@ TEST(CappedRecordStoreV1Scrambler, FourDeletedRecordsInSingleExtent) { // This list of sizes was empirically generated to achieve this outcome. Don't think too // much about them. - rs.insertRecord(&opCtx, zeros, 500 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 300 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 304 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 76 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 96 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 76 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 200 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 200 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 56 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 96 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 104 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 96 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 60 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 60 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 146 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 146 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 40 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 40 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 36 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 96 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 200 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 60 - MmapV1RecordHeader::HeaderSize, false); - rs.insertRecord(&opCtx, zeros, 64 - MmapV1RecordHeader::HeaderSize, false); + rs.insertRecord(&opCtx, zeros, 500 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 300 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 304 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 76 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 96 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 76 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 200 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 200 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 56 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 96 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 104 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 96 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 60 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 60 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 146 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 146 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 40 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 40 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 36 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 100 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 96 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 200 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 60 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); + rs.insertRecord(&opCtx, zeros, 64 - MmapV1RecordHeader::HeaderSize, false) + .status_with_transitional_ignore(); { LocAndSize recs[] = {{DiskLoc(0, 1148), 148}, diff --git a/src/mongo/db/storage/mmap_v1/record_store_v1_simple_test.cpp b/src/mongo/db/storage/mmap_v1/record_store_v1_simple_test.cpp index e49ac7c1301..47c85e38974 100644 --- a/src/mongo/db/storage/mmap_v1/record_store_v1_simple_test.cpp +++ b/src/mongo/db/storage/mmap_v1/record_store_v1_simple_test.cpp @@ -444,7 +444,7 @@ TEST(SimpleRecordStoreV1, Truncate) { ASSERT_EQUALS(em.getExtent(DiskLoc(0, 0))->length, em.minSize()); } - rs.truncate(&opCtx); + rs.truncate(&opCtx).transitional_ignore(); { LocAndSize recs[] = {{}}; |