diff options
3 files changed, 3 insertions, 13 deletions
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp index fc53e910aec..4970869e1e5 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp @@ -90,8 +90,6 @@ namespace { const std::string kWiredTigerEngineName = "wiredTiger"; - const long long WiredTigerRecordStore::kCollectionScanOnCreationThreshold = 10000; - class WiredTigerRecordStore::Cursor final : public RecordCursor { public: Cursor(OperationContext* txn, @@ -418,8 +416,8 @@ namespace { _sizeStorer->onCreate( this, numRecords, dataSize ); } - if (_sizeStorer == NULL || _numRecords.load() < kCollectionScanOnCreationThreshold) { - LOG(1) << "doing scan of collection " << ns << " to get info"; + else { + LOG(1) << "Doing scan of collection " << ns << " to get size and count info"; _numRecords.store(0); _dataSize.store(0); @@ -433,7 +431,6 @@ namespace { _sizeStorer->storeToCache( _uri, _numRecords.load(), _dataSize.load() ); } } - } else { _dataSize.store(0); diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.h b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.h index 99b3be91983..00fd04d42b9 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.h +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.h @@ -60,13 +60,6 @@ namespace mongo { public: /** - * During record store creation, if size storer reports a record count under - * 'kCollectionScanOnCreationThreshold', perform a collection scan to update size storer - * as well as internal record and data size counters. - */ - static const long long kCollectionScanOnCreationThreshold; - - /** * Parses collections options for wired tiger configuration string for table creation. * The document 'options' is typically obtained from the 'wiredTiger' field of * CollectionOptions::storageEngine. diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_test.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_test.cpp index c03613f9b9b..52a3f0cfefc 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_test.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_test.cpp @@ -398,7 +398,7 @@ namespace { wtrs->setSizeStorer(sizeStorer.get()); uri = wtrs->getURI(); - expectedNumRecords = WiredTigerRecordStore::kCollectionScanOnCreationThreshold; + expectedNumRecords = 10000; expectedDataSize = expectedNumRecords * 2; { unique_ptr<OperationContext> opCtx(harnessHelper->newOperationContext()); |