diff options
author | Mathias Stearn <mathias@10gen.com> | 2014-11-26 13:58:14 -0500 |
---|---|---|
committer | Mathias Stearn <mathias@10gen.com> | 2014-11-26 15:14:41 -0500 |
commit | cb5cab88761d9aca75e064665cce89f579c69e36 (patch) | |
tree | 3b9225aea63f7ccd6576c532e179db0fd96a52e0 /src/mongo/db | |
parent | 04cfca149d3fcfac9c74cf13287be70942ca1ada (diff) | |
download | mongo-cb5cab88761d9aca75e064665cce89f579c69e36.tar.gz |
SERVER-13679 Add record_id.h and move diskloc.h under mmap_v1
Diffstat (limited to 'src/mongo/db')
84 files changed, 128 insertions, 94 deletions
diff --git a/src/mongo/db/catalog/collection.h b/src/mongo/db/catalog/collection.h index f1e6d770fbb..c0b73b40a40 100644 --- a/src/mongo/db/catalog/collection.h +++ b/src/mongo/db/catalog/collection.h @@ -37,9 +37,9 @@ #include "mongo/db/catalog/collection_cursor_cache.h" #include "mongo/db/catalog/collection_info_cache.h" #include "mongo/db/catalog/index_catalog.h" -#include "mongo/db/diskloc.h" #include "mongo/db/exec/collection_scan_common.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/record_id.h" #include "mongo/db/storage/capped_callback.h" #include "mongo/db/storage/record_store.h" #include "mongo/platform/cstdint.h" diff --git a/src/mongo/db/catalog/collection_catalog_entry.h b/src/mongo/db/catalog/collection_catalog_entry.h index d537df5d223..db4db802f95 100644 --- a/src/mongo/db/catalog/collection_catalog_entry.h +++ b/src/mongo/db/catalog/collection_catalog_entry.h @@ -32,8 +32,8 @@ #include "mongo/base/string_data.h" #include "mongo/db/catalog/collection_options.h" -#include "mongo/db/diskloc.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/catalog/collection_cursor_cache.h b/src/mongo/db/catalog/collection_cursor_cache.h index e9822b46c01..3af0975284b 100644 --- a/src/mongo/db/catalog/collection_cursor_cache.h +++ b/src/mongo/db/catalog/collection_cursor_cache.h @@ -31,9 +31,9 @@ #pragma once #include "mongo/db/clientcursor.h" -#include "mongo/db/diskloc.h" #include "mongo/db/invalidation_type.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/record_id.h" #include "mongo/platform/unordered_set.h" #include "mongo/util/concurrency/mutex.h" diff --git a/src/mongo/db/catalog/head_manager.h b/src/mongo/db/catalog/head_manager.h index 9b9ceeb84c3..de1b81d11b8 100644 --- a/src/mongo/db/catalog/head_manager.h +++ b/src/mongo/db/catalog/head_manager.h @@ -28,7 +28,7 @@ #pragma once -#include "mongo/db/diskloc.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/catalog/index_catalog.h b/src/mongo/db/catalog/index_catalog.h index 3e0ef79306a..d79806ca9c5 100644 --- a/src/mongo/db/catalog/index_catalog.h +++ b/src/mongo/db/catalog/index_catalog.h @@ -33,9 +33,9 @@ #include <vector> #include "mongo/db/catalog/index_catalog_entry.h" -#include "mongo/db/diskloc.h" #include "mongo/db/jsobj.h" #include "mongo/db/operation_context.h" +#include "mongo/db/record_id.h" #include "mongo/platform/unordered_map.h" namespace mongo { diff --git a/src/mongo/db/catalog/index_catalog_entry.h b/src/mongo/db/catalog/index_catalog_entry.h index 192c9ef03b1..a71531ac1de 100644 --- a/src/mongo/db/catalog/index_catalog_entry.h +++ b/src/mongo/db/catalog/index_catalog_entry.h @@ -34,7 +34,7 @@ #include "mongo/base/owned_pointer_vector.h" #include "mongo/bson/ordering.h" -#include "mongo/db/diskloc.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/catalog/index_create.h b/src/mongo/db/catalog/index_create.h index 3596b319080..a0830e6147d 100644 --- a/src/mongo/db/catalog/index_create.h +++ b/src/mongo/db/catalog/index_create.h @@ -36,8 +36,8 @@ #include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" -#include "mongo/db/diskloc.h" #include "mongo/db/index/index_access_method.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/clientcursor.h b/src/mongo/db/clientcursor.h index f906c915913..10309886402 100644 --- a/src/mongo/db/clientcursor.h +++ b/src/mongo/db/clientcursor.h @@ -30,10 +30,10 @@ #include <boost/thread/recursive_mutex.hpp> -#include "mongo/db/diskloc.h" #include "mongo/db/jsobj.h" #include "mongo/db/keypattern.h" #include "mongo/db/query/plan_executor.h" +#include "mongo/db/record_id.h" #include "mongo/s/collection_metadata.h" #include "mongo/util/background.h" #include "mongo/util/net/message.h" diff --git a/src/mongo/db/dbhelpers.h b/src/mongo/db/dbhelpers.h index d657a970331..06a9b2348de 100644 --- a/src/mongo/db/dbhelpers.h +++ b/src/mongo/db/dbhelpers.h @@ -30,7 +30,7 @@ #include "mongo/db/client.h" #include "mongo/db/db.h" -#include "mongo/db/diskloc.h" +#include "mongo/db/record_id.h" #include "mongo/db/keypattern.h" #include "mongo/s/range_arithmetic.h" diff --git a/src/mongo/db/exec/and_hash.h b/src/mongo/db/exec/and_hash.h index 1a16c4bd846..c4cd77645fb 100644 --- a/src/mongo/db/exec/and_hash.h +++ b/src/mongo/db/exec/and_hash.h @@ -31,10 +31,10 @@ #include <boost/scoped_ptr.hpp> #include <vector> -#include "mongo/db/diskloc.h" #include "mongo/db/jsobj.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/matcher/expression.h" +#include "mongo/db/record_id.h" #include "mongo/platform/unordered_set.h" namespace mongo { diff --git a/src/mongo/db/exec/and_sorted.h b/src/mongo/db/exec/and_sorted.h index 106095b6325..285cd9614ac 100644 --- a/src/mongo/db/exec/and_sorted.h +++ b/src/mongo/db/exec/and_sorted.h @@ -31,10 +31,10 @@ #include <queue> #include <vector> -#include "mongo/db/diskloc.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/jsobj.h" #include "mongo/db/matcher/expression.h" +#include "mongo/db/record_id.h" #include "mongo/platform/unordered_set.h" namespace mongo { diff --git a/src/mongo/db/exec/cached_plan.h b/src/mongo/db/exec/cached_plan.h index 0cc2fabdc47..2de911411f7 100644 --- a/src/mongo/db/exec/cached_plan.h +++ b/src/mongo/db/exec/cached_plan.h @@ -28,12 +28,12 @@ #pragma once -#include "mongo/db/diskloc.h" #include "mongo/db/jsobj.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/exec/working_set.h" #include "mongo/db/query/canonical_query.h" #include "mongo/db/query/query_solution.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/exec/collection_scan.h b/src/mongo/db/exec/collection_scan.h index 46b02f415c0..fc3d05e0fee 100644 --- a/src/mongo/db/exec/collection_scan.h +++ b/src/mongo/db/exec/collection_scan.h @@ -28,10 +28,10 @@ #pragma once -#include "mongo/db/diskloc.h" #include "mongo/db/exec/collection_scan_common.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/matcher/expression.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/exec/collection_scan_common.h b/src/mongo/db/exec/collection_scan_common.h index be0636f3341..799f5bdd1bf 100644 --- a/src/mongo/db/exec/collection_scan_common.h +++ b/src/mongo/db/exec/collection_scan_common.h @@ -28,7 +28,7 @@ #pragma once -#include "mongo/db/diskloc.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/exec/count_scan.h b/src/mongo/db/exec/count_scan.h index b5399199116..26013004cc0 100644 --- a/src/mongo/db/exec/count_scan.h +++ b/src/mongo/db/exec/count_scan.h @@ -31,12 +31,12 @@ #include <boost/scoped_ptr.hpp> #include "mongo/db/exec/plan_stage.h" -#include "mongo/db/diskloc.h" #include "mongo/db/index/btree_index_cursor.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/jsobj.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/operation_context.h" +#include "mongo/db/record_id.h" #include "mongo/platform/unordered_set.h" namespace mongo { diff --git a/src/mongo/db/exec/distinct_scan.h b/src/mongo/db/exec/distinct_scan.h index 83a85811782..e74a6ecb9d3 100644 --- a/src/mongo/db/exec/distinct_scan.h +++ b/src/mongo/db/exec/distinct_scan.h @@ -31,12 +31,12 @@ #include <boost/scoped_ptr.hpp> #include "mongo/db/exec/plan_stage.h" -#include "mongo/db/diskloc.h" #include "mongo/db/index/btree_index_cursor.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/jsobj.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/query/index_bounds.h" +#include "mongo/db/record_id.h" #include "mongo/platform/unordered_set.h" namespace mongo { diff --git a/src/mongo/db/exec/eof.h b/src/mongo/db/exec/eof.h index 78c9aa6b1e7..776df4f2946 100644 --- a/src/mongo/db/exec/eof.h +++ b/src/mongo/db/exec/eof.h @@ -28,8 +28,8 @@ #pragma once -#include "mongo/db/diskloc.h" #include "mongo/db/exec/plan_stage.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/exec/fetch.h b/src/mongo/db/exec/fetch.h index b6374c49ed2..8ea33b0a1ae 100644 --- a/src/mongo/db/exec/fetch.h +++ b/src/mongo/db/exec/fetch.h @@ -28,10 +28,10 @@ #pragma once -#include "mongo/db/diskloc.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/jsobj.h" #include "mongo/db/matcher/expression.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/exec/idhack.h b/src/mongo/db/exec/idhack.h index a05cfe56365..5c404fdf145 100644 --- a/src/mongo/db/exec/idhack.h +++ b/src/mongo/db/exec/idhack.h @@ -28,10 +28,10 @@ #pragma once -#include "mongo/db/diskloc.h" #include "mongo/db/catalog/collection.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/query/canonical_query.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/exec/index_scan.h b/src/mongo/db/exec/index_scan.h index 771982ea3b0..0626d5db716 100644 --- a/src/mongo/db/exec/index_scan.h +++ b/src/mongo/db/exec/index_scan.h @@ -29,12 +29,12 @@ #pragma once #include "mongo/db/exec/plan_stage.h" -#include "mongo/db/diskloc.h" #include "mongo/db/index/btree_index_cursor.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/jsobj.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/query/index_bounds.h" +#include "mongo/db/record_id.h" #include "mongo/platform/unordered_set.h" namespace mongo { diff --git a/src/mongo/db/exec/keep_mutations.h b/src/mongo/db/exec/keep_mutations.h index 735f8738d99..1828edd5b45 100644 --- a/src/mongo/db/exec/keep_mutations.h +++ b/src/mongo/db/exec/keep_mutations.h @@ -28,10 +28,10 @@ #pragma once -#include "mongo/db/diskloc.h" #include "mongo/db/jsobj.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/matcher/expression.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/exec/limit.h b/src/mongo/db/exec/limit.h index 6d0936e412b..0377247b919 100644 --- a/src/mongo/db/exec/limit.h +++ b/src/mongo/db/exec/limit.h @@ -28,9 +28,9 @@ #pragma once -#include "mongo/db/diskloc.h" #include "mongo/db/jsobj.h" #include "mongo/db/exec/plan_stage.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/exec/merge_sort.h b/src/mongo/db/exec/merge_sort.h index f27958365ee..db4fb189199 100644 --- a/src/mongo/db/exec/merge_sort.h +++ b/src/mongo/db/exec/merge_sort.h @@ -32,10 +32,10 @@ #include <queue> #include <vector> -#include "mongo/db/diskloc.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/exec/working_set.h" #include "mongo/db/jsobj.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/exec/multi_iterator.h b/src/mongo/db/exec/multi_iterator.h index 343c8c23cc5..823fa2f567f 100644 --- a/src/mongo/db/exec/multi_iterator.h +++ b/src/mongo/db/exec/multi_iterator.h @@ -28,10 +28,10 @@ #pragma once -#include "mongo/db/diskloc.h" #include "mongo/db/catalog/collection.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/exec/plan_stats.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/exec/multi_plan.h b/src/mongo/db/exec/multi_plan.h index 97da7eee427..fe2af28d4e8 100644 --- a/src/mongo/db/exec/multi_plan.h +++ b/src/mongo/db/exec/multi_plan.h @@ -28,7 +28,6 @@ #pragma once -#include "mongo/db/diskloc.h" #include "mongo/db/jsobj.h" #include "mongo/db/catalog/collection.h" #include "mongo/db/exec/plan_stage.h" @@ -37,6 +36,7 @@ #include "mongo/db/query/query_solution.h" #include "mongo/db/query/plan_ranker.h" #include "mongo/db/query/plan_yield_policy.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/exec/near.h b/src/mongo/db/exec/near.h index 4edc3dfc8f5..fbdba1e56db 100644 --- a/src/mongo/db/exec/near.h +++ b/src/mongo/db/exec/near.h @@ -32,12 +32,12 @@ #include "mongo/base/string_data.h" #include "mongo/base/status_with.h" -#include "mongo/db/diskloc.h" #include "mongo/db/catalog/collection.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/exec/plan_stats.h" #include "mongo/db/exec/working_set.h" #include "mongo/db/jsobj.h" +#include "mongo/db/record_id.h" #include "mongo/platform/unordered_map.h" namespace mongo { diff --git a/src/mongo/db/exec/oplogstart.h b/src/mongo/db/exec/oplogstart.h index a04e8a940f8..f8eeba337ff 100644 --- a/src/mongo/db/exec/oplogstart.h +++ b/src/mongo/db/exec/oplogstart.h @@ -29,10 +29,10 @@ #pragma once #include "mongo/base/owned_pointer_vector.h" -#include "mongo/db/diskloc.h" #include "mongo/db/exec/collection_scan.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/matcher/expression.h" +#include "mongo/db/record_id.h" #include "mongo/util/timer.h" namespace mongo { diff --git a/src/mongo/db/exec/or.h b/src/mongo/db/exec/or.h index 71272a3c95f..3aaa72e0de9 100644 --- a/src/mongo/db/exec/or.h +++ b/src/mongo/db/exec/or.h @@ -28,10 +28,10 @@ #pragma once -#include "mongo/db/diskloc.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/jsobj.h" #include "mongo/db/matcher/expression.h" +#include "mongo/db/record_id.h" #include "mongo/platform/unordered_set.h" namespace mongo { diff --git a/src/mongo/db/exec/pipeline_proxy.h b/src/mongo/db/exec/pipeline_proxy.h index 4427166e419..82955833fef 100644 --- a/src/mongo/db/exec/pipeline_proxy.h +++ b/src/mongo/db/exec/pipeline_proxy.h @@ -31,11 +31,11 @@ #include <boost/optional/optional.hpp> #include <boost/smart_ptr.hpp> -#include "mongo/db/diskloc.h" #include "mongo/db/catalog/collection.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/exec/plan_stats.h" #include "mongo/db/pipeline/pipeline.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/exec/projection.cpp b/src/mongo/db/exec/projection.cpp index 2ab07c40843..451fa1c8b2f 100644 --- a/src/mongo/db/exec/projection.cpp +++ b/src/mongo/db/exec/projection.cpp @@ -30,12 +30,12 @@ #include "mongo/db/exec/projection.h" -#include "mongo/db/diskloc.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/exec/scoped_timer.h" #include "mongo/db/exec/working_set_common.h" #include "mongo/db/jsobj.h" #include "mongo/db/matcher/expression.h" +#include "mongo/db/record_id.h" #include "mongo/util/log.h" #include "mongo/util/mongoutils/str.h" diff --git a/src/mongo/db/exec/projection.h b/src/mongo/db/exec/projection.h index 41b000ef482..d6b4990e200 100644 --- a/src/mongo/db/exec/projection.h +++ b/src/mongo/db/exec/projection.h @@ -28,11 +28,11 @@ #pragma once -#include "mongo/db/diskloc.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/exec/projection_exec.h" #include "mongo/db/jsobj.h" #include "mongo/db/matcher/expression.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/exec/shard_filter.h b/src/mongo/db/exec/shard_filter.h index 0125c4343c1..4fcd087125f 100644 --- a/src/mongo/db/exec/shard_filter.h +++ b/src/mongo/db/exec/shard_filter.h @@ -28,9 +28,9 @@ #pragma once -#include "mongo/db/diskloc.h" -#include "mongo/db/jsobj.h" #include "mongo/db/exec/plan_stage.h" +#include "mongo/db/jsobj.h" +#include "mongo/db/record_id.h" #include "mongo/s/chunk_version.h" #include "mongo/s/d_state.h" diff --git a/src/mongo/db/exec/skip.h b/src/mongo/db/exec/skip.h index 785697088b4..82d73cec57d 100644 --- a/src/mongo/db/exec/skip.h +++ b/src/mongo/db/exec/skip.h @@ -28,9 +28,9 @@ #pragma once -#include "mongo/db/diskloc.h" -#include "mongo/db/jsobj.h" #include "mongo/db/exec/plan_stage.h" +#include "mongo/db/jsobj.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/exec/sort.h b/src/mongo/db/exec/sort.h index 601f8d0e85e..4d8ac5f68d0 100644 --- a/src/mongo/db/exec/sort.h +++ b/src/mongo/db/exec/sort.h @@ -32,11 +32,11 @@ #include <vector> #include <set> -#include "mongo/db/diskloc.h" -#include "mongo/db/jsobj.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/exec/working_set.h" +#include "mongo/db/jsobj.h" #include "mongo/db/query/index_bounds.h" +#include "mongo/db/record_id.h" #include "mongo/platform/unordered_map.h" diff --git a/src/mongo/db/exec/subplan.h b/src/mongo/db/exec/subplan.h index 106464d1e58..c436b848266 100644 --- a/src/mongo/db/exec/subplan.h +++ b/src/mongo/db/exec/subplan.h @@ -33,11 +33,11 @@ #include <queue> #include "mongo/base/status.h" -#include "mongo/db/diskloc.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/query/query_planner_params.h" #include "mongo/db/query/query_solution.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/exec/text.h b/src/mongo/db/exec/text.h index 8ef53bd680c..5118a3f7541 100644 --- a/src/mongo/db/exec/text.h +++ b/src/mongo/db/exec/text.h @@ -28,7 +28,6 @@ #pragma once -#include "mongo/db/diskloc.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/fts/fts_index_format.h" #include "mongo/db/fts/fts_matcher.h" @@ -38,6 +37,7 @@ #include "mongo/db/index/index_descriptor.h" #include "mongo/db/jsobj.h" #include "mongo/db/matcher/expression.h" +#include "mongo/db/record_id.h" #include "mongo/platform/unordered_map.h" #include <map> diff --git a/src/mongo/db/exec/working_set.h b/src/mongo/db/exec/working_set.h index 555d88bdff5..287198a1cf7 100644 --- a/src/mongo/db/exec/working_set.h +++ b/src/mongo/db/exec/working_set.h @@ -32,8 +32,8 @@ #include <vector> #include "mongo/base/disallow_copying.h" -#include "mongo/db/diskloc.h" #include "mongo/db/jsobj.h" +#include "mongo/db/record_id.h" #include "mongo/platform/unordered_map.h" namespace mongo { diff --git a/src/mongo/db/index/btree_based_access_method.h b/src/mongo/db/index/btree_based_access_method.h index 24f35b66bcc..50fb49f0b66 100644 --- a/src/mongo/db/index/btree_based_access_method.h +++ b/src/mongo/db/index/btree_based_access_method.h @@ -31,13 +31,13 @@ #include <vector> #include "mongo/base/disallow_copying.h" -#include "mongo/db/diskloc.h" -#include "mongo/db/jsobj.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/index_cursor.h" #include "mongo/db/index/index_descriptor.h" -#include "mongo/db/storage/sorted_data_interface.h" +#include "mongo/db/jsobj.h" +#include "mongo/db/record_id.h" #include "mongo/db/storage/mmap_v1/btree/bucket_deletion_notification.h" // XXX HK this can go away +#include "mongo/db/storage/sorted_data_interface.h" namespace mongo { diff --git a/src/mongo/db/index/btree_index_cursor.cpp b/src/mongo/db/index/btree_index_cursor.cpp index 27e148284e6..eb843abe30a 100644 --- a/src/mongo/db/index/btree_index_cursor.cpp +++ b/src/mongo/db/index/btree_index_cursor.cpp @@ -31,10 +31,10 @@ #include <vector> #include "mongo/base/status.h" -#include "mongo/db/diskloc.h" -#include "mongo/db/jsobj.h" #include "mongo/db/index/index_cursor.h" #include "mongo/db/index/index_descriptor.h" +#include "mongo/db/jsobj.h" +#include "mongo/db/record_id.h" #include "mongo/platform/unordered_set.h" namespace mongo { diff --git a/src/mongo/db/index/btree_index_cursor.h b/src/mongo/db/index/btree_index_cursor.h index 21b7a2043e7..d92e0099143 100644 --- a/src/mongo/db/index/btree_index_cursor.h +++ b/src/mongo/db/index/btree_index_cursor.h @@ -31,10 +31,10 @@ #include <vector> #include "mongo/base/status.h" -#include "mongo/db/diskloc.h" -#include "mongo/db/jsobj.h" #include "mongo/db/index/index_cursor.h" #include "mongo/db/index/index_descriptor.h" +#include "mongo/db/jsobj.h" +#include "mongo/db/record_id.h" #include "mongo/db/storage/sorted_data_interface.h" namespace mongo { diff --git a/src/mongo/db/index/haystack_access_method_internal.h b/src/mongo/db/index/haystack_access_method_internal.h index 663aa10b204..792a708977f 100644 --- a/src/mongo/db/index/haystack_access_method_internal.h +++ b/src/mongo/db/index/haystack_access_method_internal.h @@ -30,8 +30,8 @@ #include <vector> -#include "mongo/db/diskloc.h" #include "mongo/db/geo/shapes.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/index/index_access_method.h b/src/mongo/db/index/index_access_method.h index 0c648c29e6e..59cf48b9f1c 100644 --- a/src/mongo/db/index/index_access_method.h +++ b/src/mongo/db/index/index_access_method.h @@ -28,11 +28,11 @@ #pragma once -#include "mongo/db/diskloc.h" #include "mongo/db/index/index_cursor.h" #include "mongo/db/index/index_descriptor.h" #include "mongo/db/jsobj.h" #include "mongo/db/operation_context.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/index/index_cursor.h b/src/mongo/db/index/index_cursor.h index 7b1048d2d46..31dbb62fc49 100644 --- a/src/mongo/db/index/index_cursor.h +++ b/src/mongo/db/index/index_cursor.h @@ -29,8 +29,9 @@ #pragma once #include <vector> -#include "mongo/db/diskloc.h" + #include "mongo/db/jsobj.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/record_id.h b/src/mongo/db/record_id.h new file mode 100644 index 00000000000..576e9c6c5b0 --- /dev/null +++ b/src/mongo/db/record_id.h @@ -0,0 +1,33 @@ +/** +* Copyright (C) 2014 MongoDB Inc. +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License, version 3, +* as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. +* +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. +* +* As a special exception, the copyright holders give permission to link the +* code of portions of this program with the OpenSSL library under certain +* conditions as described in each individual source file and distribute +* linked combinations including the program with the OpenSSL library. You +* must comply with the GNU Affero General Public License in all respects for +* all of the code used other than as permitted herein. If you modify file(s) +* with this exception, you may extend this exception to your version of the +* file(s), but you are not obligated to do so. If you do not wish to do so, +* delete this exception statement from your version. If you delete this +* exception statement from all source files in the program, then also delete +* it in the license file. +*/ + +#pragma once + +// TODO Remove once RecordId is more than just a typedef +#include "mongo/db/storage/mmap_v1/diskloc.h" + diff --git a/src/mongo/db/repl/sync.cpp b/src/mongo/db/repl/sync.cpp index 20ff2f5d26e..ee0790fa78a 100644 --- a/src/mongo/db/repl/sync.cpp +++ b/src/mongo/db/repl/sync.cpp @@ -34,12 +34,12 @@ #include <string> -#include "mongo/db/jsobj.h" +#include "mongo/db/catalog/collection.h" #include "mongo/db/catalog/database.h" #include "mongo/db/client.h" -#include "mongo/db/diskloc.h" +#include "mongo/db/jsobj.h" +#include "mongo/db/record_id.h" #include "mongo/db/repl/oplogreader.h" -#include "mongo/db/catalog/collection.h" #include "mongo/util/assert_util.h" #include "mongo/util/log.h" diff --git a/src/mongo/db/storage/capped_callback.h b/src/mongo/db/storage/capped_callback.h index 59c23f9dab9..c5b1954f4ff 100644 --- a/src/mongo/db/storage/capped_callback.h +++ b/src/mongo/db/storage/capped_callback.h @@ -30,7 +30,7 @@ #pragma once -#include "mongo/db/diskloc.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/storage/in_memory/in_memory_recovery_unit.h b/src/mongo/db/storage/in_memory/in_memory_recovery_unit.h index ec098f62891..28e79751436 100644 --- a/src/mongo/db/storage/in_memory/in_memory_recovery_unit.h +++ b/src/mongo/db/storage/in_memory/in_memory_recovery_unit.h @@ -32,7 +32,7 @@ #include <vector> -#include "mongo/db/diskloc.h" +#include "mongo/db/record_id.h" #include "mongo/db/storage/recovery_unit.h" namespace mongo { diff --git a/src/mongo/db/storage/index_entry_comparison.h b/src/mongo/db/storage/index_entry_comparison.h index d42666eb8ef..5765ad6d6bd 100644 --- a/src/mongo/db/storage/index_entry_comparison.h +++ b/src/mongo/db/storage/index_entry_comparison.h @@ -32,8 +32,8 @@ #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/diskloc.h" #include "mongo/bson/ordering.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/storage/kv/kv_catalog.h b/src/mongo/db/storage/kv/kv_catalog.h index fac3447d108..6370568515e 100644 --- a/src/mongo/db/storage/kv/kv_catalog.h +++ b/src/mongo/db/storage/kv/kv_catalog.h @@ -38,7 +38,7 @@ #include "mongo/base/string_data.h" #include "mongo/db/catalog/collection_options.h" -#include "mongo/db/diskloc.h" +#include "mongo/db/record_id.h" #include "mongo/db/storage/bson_collection_catalog_entry.h" namespace mongo { diff --git a/src/mongo/db/storage/mmap_v1/SConscript b/src/mongo/db/storage/mmap_v1/SConscript index 01e12836e51..14229e52314 100644 --- a/src/mongo/db/storage/mmap_v1/SConscript +++ b/src/mongo/db/storage/mmap_v1/SConscript @@ -164,3 +164,4 @@ env.CppUnitTest( ] ) +env.CppUnitTest('diskloc_test', 'diskloc_test.cpp', LIBDEPS=[]) diff --git a/src/mongo/db/storage/mmap_v1/btree/btree_interface.h b/src/mongo/db/storage/mmap_v1/btree/btree_interface.h index ad0d07b7ece..51b40aa9aee 100644 --- a/src/mongo/db/storage/mmap_v1/btree/btree_interface.h +++ b/src/mongo/db/storage/mmap_v1/btree/btree_interface.h @@ -28,9 +28,9 @@ #include "mongo/bson/ordering.h" #include "mongo/db/catalog/head_manager.h" -#include "mongo/db/diskloc.h" #include "mongo/db/jsobj.h" #include "mongo/db/operation_context.h" +#include "mongo/db/storage/mmap_v1/diskloc.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/sorted_data_interface.h" 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 7fbb8a3796b..290d6a16123 100644 --- a/src/mongo/db/storage/mmap_v1/btree/btree_logic.cpp +++ b/src/mongo/db/storage/mmap_v1/btree/btree_logic.cpp @@ -30,11 +30,11 @@ #include "mongo/platform/basic.h" -#include "mongo/db/diskloc.h" #include "mongo/db/jsobj.h" #include "mongo/db/operation_context.h" #include "mongo/db/storage/mmap_v1/btree/btree_logic.h" #include "mongo/db/storage/mmap_v1/btree/key.h" +#include "mongo/db/storage/mmap_v1/diskloc.h" #include "mongo/db/storage/record_store.h" #include "mongo/util/log.h" #include "mongo/util/mongoutils/str.h" diff --git a/src/mongo/db/storage/mmap_v1/btree/btree_logic.h b/src/mongo/db/storage/mmap_v1/btree/btree_logic.h index 839d1b958e7..51597371797 100644 --- a/src/mongo/db/storage/mmap_v1/btree/btree_logic.h +++ b/src/mongo/db/storage/mmap_v1/btree/btree_logic.h @@ -30,12 +30,12 @@ #include "mongo/db/catalog/head_manager.h" #include "mongo/db/catalog/index_catalog_entry.h" -#include "mongo/db/diskloc.h" #include "mongo/db/jsobj.h" #include "mongo/db/operation_context.h" #include "mongo/db/storage/mmap_v1/btree/btree_ondisk.h" -#include "mongo/db/storage/mmap_v1/btree/key.h" #include "mongo/db/storage/mmap_v1/btree/bucket_deletion_notification.h" +#include "mongo/db/storage/mmap_v1/btree/key.h" +#include "mongo/db/storage/mmap_v1/diskloc.h" namespace mongo { diff --git a/src/mongo/db/storage/mmap_v1/btree/btree_ondisk.h b/src/mongo/db/storage/mmap_v1/btree/btree_ondisk.h index 0edb6adb4ab..5dddf489247 100644 --- a/src/mongo/db/storage/mmap_v1/btree/btree_ondisk.h +++ b/src/mongo/db/storage/mmap_v1/btree/btree_ondisk.h @@ -28,9 +28,9 @@ #pragma once -#include "mongo/db/diskloc.h" #include "mongo/db/jsobj.h" #include "mongo/db/storage/mmap_v1/btree/key.h" +#include "mongo/db/storage/mmap_v1/diskloc.h" namespace mongo { diff --git a/src/mongo/db/storage/mmap_v1/btree/bucket_deletion_notification.h b/src/mongo/db/storage/mmap_v1/btree/bucket_deletion_notification.h index 5d6fa99434f..95cd6c9c9f0 100644 --- a/src/mongo/db/storage/mmap_v1/btree/bucket_deletion_notification.h +++ b/src/mongo/db/storage/mmap_v1/btree/bucket_deletion_notification.h @@ -28,7 +28,7 @@ #pragma once -#include "mongo/db/diskloc.h" +#include "mongo/db/storage/mmap_v1/diskloc.h" namespace mongo { diff --git a/src/mongo/db/storage/mmap_v1/catalog/index_details.h b/src/mongo/db/storage/mmap_v1/catalog/index_details.h index b2f34ec0681..2935889e0d0 100644 --- a/src/mongo/db/storage/mmap_v1/catalog/index_details.h +++ b/src/mongo/db/storage/mmap_v1/catalog/index_details.h @@ -30,7 +30,7 @@ #pragma once -#include "mongo/db/diskloc.h" +#include "mongo/db/storage/mmap_v1/diskloc.h" namespace mongo { diff --git a/src/mongo/db/storage/mmap_v1/catalog/namespace_details.h b/src/mongo/db/storage/mmap_v1/catalog/namespace_details.h index 32592e5692a..dcb0ab182da 100644 --- a/src/mongo/db/storage/mmap_v1/catalog/namespace_details.h +++ b/src/mongo/db/storage/mmap_v1/catalog/namespace_details.h @@ -28,10 +28,10 @@ #pragma once -#include "mongo/db/diskloc.h" #include "mongo/db/namespace_string.h" #include "mongo/db/storage/mmap_v1/catalog/index_details.h" #include "mongo/db/storage/mmap_v1/catalog/namespace.h" +#include "mongo/db/storage/mmap_v1/diskloc.h" namespace mongo { diff --git a/src/mongo/db/storage/mmap_v1/catalog/namespace_details_collection_entry.h b/src/mongo/db/storage/mmap_v1/catalog/namespace_details_collection_entry.h index 111fb25c711..d318519cd25 100644 --- a/src/mongo/db/storage/mmap_v1/catalog/namespace_details_collection_entry.h +++ b/src/mongo/db/storage/mmap_v1/catalog/namespace_details_collection_entry.h @@ -33,7 +33,7 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/catalog/collection_catalog_entry.h" -#include "mongo/db/diskloc.h" +#include "mongo/db/storage/mmap_v1/diskloc.h" namespace mongo { diff --git a/src/mongo/db/storage/mmap_v1/catalog/namespace_index.h b/src/mongo/db/storage/mmap_v1/catalog/namespace_index.h index 59c0a98a9ad..fa26b61f671 100644 --- a/src/mongo/db/storage/mmap_v1/catalog/namespace_index.h +++ b/src/mongo/db/storage/mmap_v1/catalog/namespace_index.h @@ -34,9 +34,9 @@ #include <string> #include "mongo/base/disallow_copying.h" -#include "mongo/db/diskloc.h" #include "mongo/db/storage/mmap_v1/catalog/hashtab.h" #include "mongo/db/storage/mmap_v1/catalog/namespace.h" +#include "mongo/db/storage/mmap_v1/diskloc.h" #include "mongo/db/storage/mmap_v1/durable_mapped_file.h" namespace mongo { diff --git a/src/mongo/db/storage/mmap_v1/data_file.h b/src/mongo/db/storage/mmap_v1/data_file.h index e52bb4b89f5..f16a9985868 100644 --- a/src/mongo/db/storage/mmap_v1/data_file.h +++ b/src/mongo/db/storage/mmap_v1/data_file.h @@ -30,7 +30,7 @@ #pragma once -#include "mongo/db/diskloc.h" +#include "mongo/db/storage/mmap_v1/diskloc.h" #include "mongo/db/storage/mmap_v1/durable_mapped_file.h" namespace mongo { diff --git a/src/mongo/db/diskloc.h b/src/mongo/db/storage/mmap_v1/diskloc.h index 7ac89937842..7ac89937842 100644 --- a/src/mongo/db/diskloc.h +++ b/src/mongo/db/storage/mmap_v1/diskloc.h diff --git a/src/mongo/db/diskloc_test.cpp b/src/mongo/db/storage/mmap_v1/diskloc_test.cpp index 85a3f0cbffa..4fa62dcdfee 100644 --- a/src/mongo/db/diskloc_test.cpp +++ b/src/mongo/db/storage/mmap_v1/diskloc_test.cpp @@ -28,7 +28,7 @@ /** Unit tests for DiskLoc. */ -#include "mongo/db/diskloc.h" +#include "mongo/db/storage/mmap_v1/diskloc.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/storage/mmap_v1/dur.h b/src/mongo/db/storage/mmap_v1/dur.h index 4f7e562fa6d..0eb7dd61dfc 100644 --- a/src/mongo/db/storage/mmap_v1/dur.h +++ b/src/mongo/db/storage/mmap_v1/dur.h @@ -30,7 +30,7 @@ #pragma once -#include "mongo/db/diskloc.h" +#include "mongo/db/storage/mmap_v1/diskloc.h" #include "mongo/db/storage/mmap_v1/durable_mapped_file.h" diff --git a/src/mongo/db/storage/mmap_v1/extent.h b/src/mongo/db/storage/mmap_v1/extent.h index f009e283380..b78c10d942c 100644 --- a/src/mongo/db/storage/mmap_v1/extent.h +++ b/src/mongo/db/storage/mmap_v1/extent.h @@ -33,8 +33,8 @@ #include <string> #include <vector> -#include "mongo/db/diskloc.h" #include "mongo/db/storage/mmap_v1/catalog/namespace.h" +#include "mongo/db/storage/mmap_v1/diskloc.h" namespace mongo { diff --git a/src/mongo/db/storage/mmap_v1/extent_manager.h b/src/mongo/db/storage/mmap_v1/extent_manager.h index aa164170949..5c5753f7a42 100644 --- a/src/mongo/db/storage/mmap_v1/extent_manager.h +++ b/src/mongo/db/storage/mmap_v1/extent_manager.h @@ -35,7 +35,7 @@ #include "mongo/base/status.h" #include "mongo/base/string_data.h" -#include "mongo/db/diskloc.h" +#include "mongo/db/storage/mmap_v1/diskloc.h" namespace mongo { 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 314a96d59bc..15958e15ef3 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 @@ -34,13 +34,13 @@ #include <boost/filesystem/path.hpp> -#include "mongo/platform/atomic_word.h" #include "mongo/base/status.h" #include "mongo/base/string_data.h" #include "mongo/db/concurrency/lock_mgr_defs.h" -#include "mongo/db/diskloc.h" +#include "mongo/db/storage/mmap_v1/diskloc.h" #include "mongo/db/storage/mmap_v1/extent_manager.h" #include "mongo/db/storage/mmap_v1/record_access_tracker.h" +#include "mongo/platform/atomic_word.h" #include "mongo/util/concurrency/mutex.h" namespace mongo { diff --git a/src/mongo/db/storage/mmap_v1/record.h b/src/mongo/db/storage/mmap_v1/record.h index 395a65cfdca..73e9e627287 100644 --- a/src/mongo/db/storage/mmap_v1/record.h +++ b/src/mongo/db/storage/mmap_v1/record.h @@ -31,7 +31,7 @@ #pragma once #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/diskloc.h" +#include "mongo/db/storage/mmap_v1/diskloc.h" #include "mongo/db/storage/record_data.h" #include "mongo/platform/atomic_word.h" diff --git a/src/mongo/db/storage/mmap_v1/record_store_v1_base.h b/src/mongo/db/storage/mmap_v1/record_store_v1_base.h index eb90eae5297..2f5505b43ce 100644 --- a/src/mongo/db/storage/mmap_v1/record_store_v1_base.h +++ b/src/mongo/db/storage/mmap_v1/record_store_v1_base.h @@ -30,7 +30,7 @@ #pragma once -#include "mongo/db/diskloc.h" +#include "mongo/db/storage/mmap_v1/diskloc.h" #include "mongo/db/storage/record_store.h" namespace mongo { diff --git a/src/mongo/db/storage/mmap_v1/record_store_v1_capped.h b/src/mongo/db/storage/mmap_v1/record_store_v1_capped.h index ff7402e583d..90f05a0eb67 100644 --- a/src/mongo/db/storage/mmap_v1/record_store_v1_capped.h +++ b/src/mongo/db/storage/mmap_v1/record_store_v1_capped.h @@ -31,8 +31,8 @@ #pragma once #include "mongo/base/owned_pointer_vector.h" -#include "mongo/db/diskloc.h" #include "mongo/db/storage/capped_callback.h" +#include "mongo/db/storage/mmap_v1/diskloc.h" #include "mongo/db/storage/mmap_v1/extent_manager.h" #include "mongo/db/storage/mmap_v1/record_store_v1_base.h" diff --git a/src/mongo/db/storage/mmap_v1/record_store_v1_simple.h b/src/mongo/db/storage/mmap_v1/record_store_v1_simple.h index ce03af14f25..e247902dc44 100644 --- a/src/mongo/db/storage/mmap_v1/record_store_v1_simple.h +++ b/src/mongo/db/storage/mmap_v1/record_store_v1_simple.h @@ -30,7 +30,7 @@ #pragma once -#include "mongo/db/diskloc.h" +#include "mongo/db/storage/mmap_v1/diskloc.h" #include "mongo/db/storage/mmap_v1/record_store_v1_base.h" namespace mongo { diff --git a/src/mongo/db/storage/oplog_hack.cpp b/src/mongo/db/storage/oplog_hack.cpp index b53562cc559..f2361fecc6f 100644 --- a/src/mongo/db/storage/oplog_hack.cpp +++ b/src/mongo/db/storage/oplog_hack.cpp @@ -35,8 +35,8 @@ #include "mongo/bson/bson_validate.h" #include "mongo/bson/optime.h" -#include "mongo/db/diskloc.h" #include "mongo/db/jsobj.h" +#include "mongo/db/record_id.h" namespace mongo { namespace oploghack { diff --git a/src/mongo/db/storage/record_store.h b/src/mongo/db/storage/record_store.h index aa0f493823a..9540067f83c 100644 --- a/src/mongo/db/storage/record_store.h +++ b/src/mongo/db/storage/record_store.h @@ -32,8 +32,8 @@ #include "mongo/base/owned_pointer_vector.h" #include "mongo/bson/mutable/damage_vector.h" -#include "mongo/db/diskloc.h" #include "mongo/db/exec/collection_scan_common.h" +#include "mongo/db/record_id.h" #include "mongo/db/storage/record_data.h" namespace mongo { diff --git a/src/mongo/db/storage/record_store_test_datafor.cpp b/src/mongo/db/storage/record_store_test_datafor.cpp index 487e7745f47..82f445fd2ab 100644 --- a/src/mongo/db/storage/record_store_test_datafor.cpp +++ b/src/mongo/db/storage/record_store_test_datafor.cpp @@ -30,7 +30,7 @@ #include "mongo/db/storage/record_store_test_harness.h" -#include "mongo/db/diskloc.h" +#include "mongo/db/record_id.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/storage/record_store_test_deleterecord.cpp b/src/mongo/db/storage/record_store_test_deleterecord.cpp index 6d589b418fa..d66708a021c 100644 --- a/src/mongo/db/storage/record_store_test_deleterecord.cpp +++ b/src/mongo/db/storage/record_store_test_deleterecord.cpp @@ -30,7 +30,7 @@ #include "mongo/db/storage/record_store_test_harness.h" -#include "mongo/db/diskloc.h" +#include "mongo/db/record_id.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/storage/record_store_test_insertrecord.cpp b/src/mongo/db/storage/record_store_test_insertrecord.cpp index 5115d447729..5415f8ad39e 100644 --- a/src/mongo/db/storage/record_store_test_insertrecord.cpp +++ b/src/mongo/db/storage/record_store_test_insertrecord.cpp @@ -30,7 +30,7 @@ #include "mongo/db/storage/record_store_test_harness.h" -#include "mongo/db/diskloc.h" +#include "mongo/db/record_id.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/record_store_test_docwriter.h" diff --git a/src/mongo/db/storage/record_store_test_manyiter.cpp b/src/mongo/db/storage/record_store_test_manyiter.cpp index 110db208a58..adbdf550f49 100644 --- a/src/mongo/db/storage/record_store_test_manyiter.cpp +++ b/src/mongo/db/storage/record_store_test_manyiter.cpp @@ -30,7 +30,7 @@ #include "mongo/db/storage/record_store_test_harness.h" -#include "mongo/db/diskloc.h" +#include "mongo/db/record_id.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/storage/record_store_test_recorditer.cpp b/src/mongo/db/storage/record_store_test_recorditer.cpp index 734bdb78a86..932644e2f65 100644 --- a/src/mongo/db/storage/record_store_test_recorditer.cpp +++ b/src/mongo/db/storage/record_store_test_recorditer.cpp @@ -33,7 +33,7 @@ #include <algorithm> #include "mongo/bson/util/builder.h" -#include "mongo/db/diskloc.h" +#include "mongo/db/record_id.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/storage/record_store_test_repairiter.cpp b/src/mongo/db/storage/record_store_test_repairiter.cpp index 61ff02cc789..260db54829a 100644 --- a/src/mongo/db/storage/record_store_test_repairiter.cpp +++ b/src/mongo/db/storage/record_store_test_repairiter.cpp @@ -30,7 +30,7 @@ #include "mongo/db/storage/record_store_test_harness.h" -#include "mongo/db/diskloc.h" +#include "mongo/db/record_id.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/storage/record_store_test_updaterecord.cpp b/src/mongo/db/storage/record_store_test_updaterecord.cpp index 432a7d979e0..66bc1a55158 100644 --- a/src/mongo/db/storage/record_store_test_updaterecord.cpp +++ b/src/mongo/db/storage/record_store_test_updaterecord.cpp @@ -30,7 +30,7 @@ #include "mongo/db/storage/record_store_test_updaterecord.h" -#include "mongo/db/diskloc.h" +#include "mongo/db/record_id.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/record_store_test_harness.h" diff --git a/src/mongo/db/storage/record_store_test_updaterecord.h b/src/mongo/db/storage/record_store_test_updaterecord.h index db432b09457..76e7653cbcd 100644 --- a/src/mongo/db/storage/record_store_test_updaterecord.h +++ b/src/mongo/db/storage/record_store_test_updaterecord.h @@ -30,7 +30,7 @@ #pragma once -#include "mongo/db/diskloc.h" +#include "mongo/db/record_id.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/storage/record_store_test_updatewithdamages.cpp b/src/mongo/db/storage/record_store_test_updatewithdamages.cpp index 86d35cb5d29..52a3d7fc705 100644 --- a/src/mongo/db/storage/record_store_test_updatewithdamages.cpp +++ b/src/mongo/db/storage/record_store_test_updatewithdamages.cpp @@ -30,7 +30,7 @@ #include "mongo/db/storage/record_store_test_harness.h" -#include "mongo/db/diskloc.h" +#include "mongo/db/record_id.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/storage/sorted_data_interface.h b/src/mongo/db/storage/sorted_data_interface.h index 4c5a04e376c..1fecf2591f0 100644 --- a/src/mongo/db/storage/sorted_data_interface.h +++ b/src/mongo/db/storage/sorted_data_interface.h @@ -28,9 +28,9 @@ #include "mongo/bson/ordering.h" #include "mongo/db/catalog/head_manager.h" -#include "mongo/db/diskloc.h" #include "mongo/db/jsobj.h" #include "mongo/db/operation_context.h" +#include "mongo/db/record_id.h" #include "mongo/db/storage/record_store.h" #pragma once diff --git a/src/mongo/db/storage/sorted_data_interface_test_harness.h b/src/mongo/db/storage/sorted_data_interface_test_harness.h index d62641a9f0f..f059cc114ec 100644 --- a/src/mongo/db/storage/sorted_data_interface_test_harness.h +++ b/src/mongo/db/storage/sorted_data_interface_test_harness.h @@ -30,10 +30,9 @@ #pragma once -#include "mongo/bson/bsonobj.h" -#include "mongo/bson/bsonmisc.h" -#include "mongo/db/diskloc.h" +#include "mongo/db/jsobj.h" #include "mongo/db/operation_context_noop.h" +#include "mongo/db/record_id.h" namespace mongo { diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit.h b/src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit.h index abfc3f89242..a1eb26215c3 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit.h +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit.h @@ -37,8 +37,8 @@ #include <boost/scoped_ptr.hpp> #include "mongo/base/owned_pointer_vector.h" -#include "mongo/db/diskloc.h" #include "mongo/db/operation_context.h" +#include "mongo/db/record_id.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/util/timer.h" |