SERVER-13635 extents are mmapv1 specific, move into mmapv1

22 files changed, 31 insertions, 34 deletions

diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index db5584ea011..bb65690aedf 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -28,8 +28,8 @@ env.SConscript(['base/SConscript',
                 'db/query/SConscript',
                 'db/repl/SConscript',
                 'db/sorter/SConscript',
-                'db/storage/SConscript',
                 'db/storage/heap1/SConscript',
+                'db/storage/mmap_v1/SConscript',
                 'db/storage/rocks/SConscript',
                 'db/structure/SConscript',
                 'db/structure/btree/SConscript',
diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/mmap_v1/SConscript
index 816e53b2382..5f7ac5eabd2 100644
--- a/src/mongo/db/storage/SConscript
+++ b/src/mongo/db/storage/mmap_v1/SConscript
@@ -1,4 +1,3 @@
-
 Import("env")
 
 env.Library(
@@ -12,4 +11,3 @@ env.Library(
         '$BUILD_DIR/mongo/foundation',
         ]
     )
-
diff --git a/src/mongo/db/storage/extent.cpp b/src/mongo/db/storage/mmap_v1/extent.cpp
index df8f409f855..43998a36ed2 100644
--- a/src/mongo/db/storage/extent.cpp
+++ b/src/mongo/db/storage/mmap_v1/extent.cpp
@@ -28,9 +28,9 @@
 *    it in the license file.
 */
 
-#include "mongo/db/storage/extent.h"
+#include "mongo/db/storage/mmap_v1/extent.h"
 
-#include "mongo/db/storage/extent_manager.h"
+#include "mongo/db/storage/mmap_v1/extent_manager.h"
 #include "mongo/util/mongoutils/str.h"
 
 namespace mongo {
diff --git a/src/mongo/db/storage/extent.h b/src/mongo/db/storage/mmap_v1/extent.h
index 8a27e271c04..8a27e271c04 100644
--- a/src/mongo/db/storage/extent.h
+++ b/src/mongo/db/storage/mmap_v1/extent.h
diff --git a/src/mongo/db/storage/extent_manager.cpp b/src/mongo/db/storage/mmap_v1/extent_manager.cpp
index a9685f7859f..8efc2cbc50f 100644
--- a/src/mongo/db/storage/extent_manager.cpp
+++ b/src/mongo/db/storage/mmap_v1/extent_manager.cpp
@@ -28,9 +28,9 @@
 *    it in the license file.
 */
 
-#include "mongo/db/storage/extent_manager.h"
+#include "mongo/db/storage/mmap_v1/extent_manager.h"
 
-#include "mongo/db/storage/extent.h"
+#include "mongo/db/storage/mmap_v1/extent.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/storage/extent_manager.h b/src/mongo/db/storage/mmap_v1/extent_manager.h
index 21f8a3813b4..21f8a3813b4 100644
--- a/src/mongo/db/storage/extent_manager.h
+++ b/src/mongo/db/storage/mmap_v1/extent_manager.h
diff --git a/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.cpp b/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.cpp
index ae886d8202e..761da12270b 100644
--- a/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.cpp
+++ b/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.cpp
@@ -38,8 +38,8 @@
 #include "mongo/db/storage/mmap_v1/dur.h"
 #include "mongo/db/storage/mmap_v1/data_file.h"
 #include "mongo/db/storage/mmap_v1/record.h"
-#include "mongo/db/storage/extent.h"
-#include "mongo/db/storage/extent_manager.h"
+#include "mongo/db/storage/mmap_v1/extent.h"
+#include "mongo/db/storage/mmap_v1/extent_manager.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/util/log.h"
 
diff --git a/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h b/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h
index 728d1540831..eeb54db1880 100644
--- a/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h
+++ b/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h
@@ -38,7 +38,7 @@
 #include "mongo/base/status.h"
 #include "mongo/base/string_data.h"
 #include "mongo/db/diskloc.h"
-#include "mongo/db/storage/extent_manager.h"
+#include "mongo/db/storage/mmap_v1/extent_manager.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/structure/SConscript b/src/mongo/db/structure/SConscript
index 63c5d1a9fcf..360876db22a 100644
--- a/src/mongo/db/structure/SConscript
+++ b/src/mongo/db/structure/SConscript
@@ -10,7 +10,6 @@ env.Library(
     LIBDEPS= [
         '$BUILD_DIR/mongo/bson',
         '$BUILD_DIR/mongo/db/commands/server_status_core',
-        '$BUILD_DIR/mongo/db/storage/extent',
         '$BUILD_DIR/mongo/foundation',
         '$BUILD_DIR/mongo/mongocommon',
         ]
@@ -28,6 +27,7 @@ env.Library(
         ],
     LIBDEPS= [
         'record_store',
+        '$BUILD_DIR/mongo/db/storage/mmap_v1/extent',
         ]
     )
 
diff --git a/src/mongo/db/structure/record_store.h b/src/mongo/db/structure/record_store.h
index e8f212f7f3f..46a0c05cd7c 100644
--- a/src/mongo/db/structure/record_store.h
+++ b/src/mongo/db/structure/record_store.h
@@ -43,7 +43,6 @@ namespace mongo {
     struct CompactOptions;
     struct CompactStats;
     class DocWriter;
-    class ExtentManager;
     class MAdvise;
     class NamespaceDetails;
     class OperationContext;
diff --git a/src/mongo/db/structure/record_store_v1_base.cpp b/src/mongo/db/structure/record_store_v1_base.cpp
index ec6c53931a7..d690a4e940f 100644
--- a/src/mongo/db/structure/record_store_v1_base.cpp
+++ b/src/mongo/db/structure/record_store_v1_base.cpp
@@ -32,8 +32,8 @@
 
 #include "mongo/db/catalog/collection.h"
 #include "mongo/db/operation_context.h"
-#include "mongo/db/storage/extent.h"
-#include "mongo/db/storage/extent_manager.h"
+#include "mongo/db/storage/mmap_v1/extent.h"
+#include "mongo/db/storage/mmap_v1/extent_manager.h"
 #include "mongo/db/storage/mmap_v1/record.h"
 #include "mongo/db/structure/record_store_v1_repair_iterator.h"
 #include "mongo/util/progress_meter.h"
diff --git a/src/mongo/db/structure/record_store_v1_capped.cpp b/src/mongo/db/structure/record_store_v1_capped.cpp
index 681e1d684da..34413628f61 100644
--- a/src/mongo/db/structure/record_store_v1_capped.cpp
+++ b/src/mongo/db/structure/record_store_v1_capped.cpp
@@ -30,9 +30,9 @@
 
 #include "mongo/db/structure/record_store_v1_capped.h"
 
-#include "mongo/db/storage/extent.h"
-#include "mongo/db/storage/extent_manager.h"
 #include "mongo/db/operation_context_impl.h"
+#include "mongo/db/storage/mmap_v1/extent.h"
+#include "mongo/db/storage/mmap_v1/extent_manager.h"
 #include "mongo/db/storage/mmap_v1/record.h"
 #include "mongo/db/structure/record_store_v1_capped_iterator.h"
 #include "mongo/util/mmap.h"
diff --git a/src/mongo/db/structure/record_store_v1_capped.h b/src/mongo/db/structure/record_store_v1_capped.h
index 4e4ca5586aa..ad77acf921c 100644
--- a/src/mongo/db/structure/record_store_v1_capped.h
+++ b/src/mongo/db/structure/record_store_v1_capped.h
@@ -32,7 +32,7 @@
 
 #include "mongo/base/owned_pointer_vector.h"
 #include "mongo/db/diskloc.h"
-#include "mongo/db/storage/extent_manager.h"
+#include "mongo/db/storage/mmap_v1/extent_manager.h"
 #include "mongo/db/structure/capped_callback.h"
 #include "mongo/db/structure/record_store_v1_base.h"
 
diff --git a/src/mongo/db/structure/record_store_v1_capped_iterator.cpp b/src/mongo/db/structure/record_store_v1_capped_iterator.cpp
index 86cadcff8b7..12e6f945f20 100644
--- a/src/mongo/db/structure/record_store_v1_capped_iterator.cpp
+++ b/src/mongo/db/structure/record_store_v1_capped_iterator.cpp
@@ -29,8 +29,8 @@
 #include "mongo/db/structure/record_store_v1_capped_iterator.h"
 
 #include "mongo/db/catalog/collection.h"
-#include "mongo/db/storage/extent.h"
-#include "mongo/db/storage/extent_manager.h"
+#include "mongo/db/storage/mmap_v1/extent.h"
+#include "mongo/db/storage/mmap_v1/extent_manager.h"
 #include "mongo/db/structure/record_store_v1_capped.h"
 
 namespace mongo {
diff --git a/src/mongo/db/structure/record_store_v1_repair_iterator.cpp b/src/mongo/db/structure/record_store_v1_repair_iterator.cpp
index 94884adc10d..373f8760bf7 100644
--- a/src/mongo/db/structure/record_store_v1_repair_iterator.cpp
+++ b/src/mongo/db/structure/record_store_v1_repair_iterator.cpp
@@ -29,8 +29,8 @@
 #include "mongo/db/structure/record_store_v1_repair_iterator.h"
 
 #include "mongo/db/catalog/collection.h"
-#include "mongo/db/storage/extent.h"
-#include "mongo/db/storage/extent_manager.h"
+#include "mongo/db/storage/mmap_v1/extent.h"
+#include "mongo/db/storage/mmap_v1/extent_manager.h"
 #include "mongo/db/structure/record_store_v1_simple.h"
 
 namespace mongo {
diff --git a/src/mongo/db/structure/record_store_v1_simple.cpp b/src/mongo/db/structure/record_store_v1_simple.cpp
index 9218a5cd42b..bd03324ede6 100644
--- a/src/mongo/db/structure/record_store_v1_simple.cpp
+++ b/src/mongo/db/structure/record_store_v1_simple.cpp
@@ -36,8 +36,8 @@
 #include "mongo/db/catalog/collection.h"
 #include "mongo/db/curop.h"
 #include "mongo/db/commands/server_status_metric.h"
-#include "mongo/db/storage/extent.h"
-#include "mongo/db/storage/extent_manager.h"
+#include "mongo/db/storage/mmap_v1/extent.h"
+#include "mongo/db/storage/mmap_v1/extent_manager.h"
 #include "mongo/db/storage/mmap_v1/record.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/structure/record_store_v1_simple_iterator.h"
diff --git a/src/mongo/db/structure/record_store_v1_simple_iterator.cpp b/src/mongo/db/structure/record_store_v1_simple_iterator.cpp
index e118f7d9fa6..19163be6aeb 100644
--- a/src/mongo/db/structure/record_store_v1_simple_iterator.cpp
+++ b/src/mongo/db/structure/record_store_v1_simple_iterator.cpp
@@ -29,8 +29,8 @@
 #include "mongo/db/structure/record_store_v1_simple_iterator.h"
 
 #include "mongo/db/catalog/collection.h"
-#include "mongo/db/storage/extent.h"
-#include "mongo/db/storage/extent_manager.h"
+#include "mongo/db/storage/mmap_v1/extent.h"
+#include "mongo/db/storage/mmap_v1/extent_manager.h"
 #include "mongo/db/structure/record_store_v1_simple.h"
 
 namespace mongo {
diff --git a/src/mongo/db/structure/record_store_v1_test_help.cpp b/src/mongo/db/structure/record_store_v1_test_help.cpp
index d166a405387..c3f3aa37656 100644
--- a/src/mongo/db/structure/record_store_v1_test_help.cpp
+++ b/src/mongo/db/structure/record_store_v1_test_help.cpp
@@ -35,7 +35,7 @@
 #include <set>
 #include <vector>
 
-#include "mongo/db/storage/extent.h"
+#include "mongo/db/storage/mmap_v1/extent.h"
 #include "mongo/db/storage/mmap_v1/record.h"
 #include "mongo/unittest/unittest.h"
 
diff --git a/src/mongo/db/structure/record_store_v1_test_help.h b/src/mongo/db/structure/record_store_v1_test_help.h
index 1631713b8f8..c61b6c54114 100644
--- a/src/mongo/db/structure/record_store_v1_test_help.h
+++ b/src/mongo/db/structure/record_store_v1_test_help.h
@@ -32,7 +32,7 @@
 
 #include <vector>
 
-#include "mongo/db/storage/extent_manager.h"
+#include "mongo/db/storage/mmap_v1/extent_manager.h"
 #include "mongo/db/structure/record_store_v1_base.h"
 
 namespace mongo {
diff --git a/src/mongo/dbtests/namespacetests.cpp b/src/mongo/dbtests/namespacetests.cpp
index 83dae759de6..4309b9c2356 100644
--- a/src/mongo/dbtests/namespacetests.cpp
+++ b/src/mongo/dbtests/namespacetests.cpp
@@ -38,9 +38,9 @@
 #include "mongo/db/index_names.h"
 #include "mongo/db/json.h"
 #include "mongo/db/query/internal_plans.h"
-#include "mongo/db/storage/extent.h"
-#include "mongo/db/storage/extent_manager.h"
 #include "mongo/db/operation_context_impl.h"
+#include "mongo/db/storage/mmap_v1/extent.h"
+#include "mongo/db/storage/mmap_v1/extent_manager.h"
 #include "mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h"
 #include "mongo/db/structure/record_store_v1_capped.h"
 #include "mongo/db/structure/record_store_v1_simple.h"
diff --git a/src/mongo/dbtests/pdfiletests.cpp b/src/mongo/dbtests/pdfiletests.cpp
index 55a6ee59b29..10d4e01d1fd 100644
--- a/src/mongo/dbtests/pdfiletests.cpp
+++ b/src/mongo/dbtests/pdfiletests.cpp
@@ -36,10 +36,10 @@
 #include "mongo/db/ops/insert.h"
 #include "mongo/db/catalog/collection.h"
 #include "mongo/db/storage/mmap_v1/data_file.h"
-#include "mongo/db/storage/extent.h"
-#include "mongo/db/storage/extent_manager.h"
-#include "mongo/db/operation_context_impl.h"
+#include "mongo/db/storage/mmap_v1/extent.h"
+#include "mongo/db/storage/mmap_v1/extent_manager.h"
 #include "mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h"
+#include "mongo/db/operation_context_impl.h"
 #include "mongo/dbtests/dbtests.h"
 
 namespace PdfileTests {
diff --git a/src/mongo/dbtests/query_stage_collscan.cpp b/src/mongo/dbtests/query_stage_collscan.cpp
index 6d64cd26bf0..20fb3ad5b62 100644
--- a/src/mongo/dbtests/query_stage_collscan.cpp
+++ b/src/mongo/dbtests/query_stage_collscan.cpp
@@ -39,9 +39,9 @@
 #include "mongo/db/json.h"
 #include "mongo/db/matcher/expression_parser.h"
 #include "mongo/db/query/plan_executor.h"
-#include "mongo/db/storage/extent.h"
-#include "mongo/db/storage/extent_manager.h"
 #include "mongo/db/operation_context_impl.h"
+#include "mongo/db/storage/mmap_v1/extent.h"
+#include "mongo/db/storage/mmap_v1/extent_manager.h"
 #include "mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h"
 #include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/structure/record_store.h"