summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEliot Horowitz <eliot@10gen.com>2014-06-06 17:35:34 -0400
committerEliot Horowitz <eliot@10gen.com>2014-06-09 16:19:30 -0400
commiteb880114a9a54176c70774f993aa1ecfeda714da (patch)
treeafa4ccc061555b0eee085ed3d9239c374e9ec0dd
parent45e33c698933239d7f83a5f7fd0b21e140ac37ec (diff)
downloadmongo-eb880114a9a54176c70774f993aa1ecfeda714da.tar.gz
SERVER-13635: move some extentManager methods
-rw-r--r--src/mongo/db/catalog/database.cpp13
-rw-r--r--src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp10
2 files changed, 10 insertions, 13 deletions
diff --git a/src/mongo/db/catalog/database.cpp b/src/mongo/db/catalog/database.cpp
index 19105e94196..e1bcfaec0c3 100644
--- a/src/mongo/db/catalog/database.cpp
+++ b/src/mongo/db/catalog/database.cpp
@@ -310,19 +310,6 @@ namespace mongo {
dataFileVersion.append( "minor", minor );
}
dataFileVersion.done();
-
- if ( !empty ){
- int freeListSize = 0;
- int64_t freeListSpace = 0;
- getExtentManager()->freeListStats( &freeListSize, &freeListSpace );
-
- BSONObjBuilder extentFreeList( output->subobjStart( "extentFreeList" ) );
- extentFreeList.append( "num", freeListSize );
- extentFreeList.appendNumber( "totalSize",
- static_cast<long long>( freeListSpace / scale ) );
- extentFreeList.done();
- }
-
}
Status Database::dropCollection( OperationContext* txn, const StringData& fullns ) {
diff --git a/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp b/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp
index c938dc1b03b..6d193be3d1d 100644
--- a/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp
+++ b/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp
@@ -296,6 +296,16 @@ namespace mongo {
output->appendNumber( "fileSize", _extentManager.fileSize() / scale );
output->appendNumber( "nsSizeMB", static_cast<int>( _namespaceIndex.fileLength() /
( 1024 * 1024 ) ) );
+
+ int freeListSize = 0;
+ int64_t freeListSpace = 0;
+ _extentManager.freeListStats( &freeListSize, &freeListSpace );
+
+ BSONObjBuilder extentFreeList( output->subobjStart( "extentFreeList" ) );
+ extentFreeList.append( "num", freeListSize );
+ extentFreeList.appendNumber( "totalSize",
+ static_cast<long long>( freeListSpace / scale ) );
+ extentFreeList.done();
}
}