diff options
25 files changed, 33 insertions, 40 deletions
diff --git a/src/mongo/SConscript b/src/mongo/SConscript index 9c91e09e1a7..40357793259 100644 --- a/src/mongo/SConscript +++ b/src/mongo/SConscript @@ -519,8 +519,8 @@ serverOnlyFiles = [ "db/curop.cpp", "db/d_concurrency.cpp", "db/lockstat.cpp", "db/lockstate.cpp", - "db/key.cpp", - "db/btreebuilder.cpp", + "db/structure/btree/key.cpp", + "db/structure/btree/btreebuilder.cpp", "util/logfile.cpp", "util/alignedbuilder.cpp", "util/elapsed_tracker.cpp", @@ -534,8 +534,8 @@ serverOnlyFiles = [ "db/curop.cpp", "db/dur_recover.cpp", "db/dur_journal.cpp", "db/introspect.cpp", - "db/btree.cpp", - "db/btree_stats.cpp", + "db/structure/btree/btree.cpp", + "db/structure/btree/btree_stats.cpp", "db/clientcursor.cpp", "db/tests.cpp", "db/range_deleter_db_env.cpp", diff --git a/src/mongo/db/catalog/index_create.cpp b/src/mongo/db/catalog/index_create.cpp index 6cbc92f0997..0df55d7e3ab 100644 --- a/src/mongo/db/catalog/index_create.cpp +++ b/src/mongo/db/catalog/index_create.cpp @@ -33,7 +33,7 @@ #include "mongo/client/dbclientinterface.h" #include "mongo/db/audit.h" #include "mongo/db/background.h" -#include "mongo/db/btreebuilder.h" +#include "mongo/db/structure/btree/btreebuilder.h" #include "mongo/db/clientcursor.h" #include "mongo/db/extsort.h" #include "mongo/db/storage/index_details.h" diff --git a/src/mongo/db/commands/index_stats.cpp b/src/mongo/db/commands/index_stats.cpp index 05287294735..f4062cfbc66 100644 --- a/src/mongo/db/commands/index_stats.cpp +++ b/src/mongo/db/commands/index_stats.cpp @@ -30,7 +30,7 @@ #include "mongo/db/auth/action_set.h" #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/privilege.h" -#include "mongo/db/btree.h" +#include "mongo/db/structure/btree/btree.h" #include "mongo/db/commands.h" #include "mongo/db/db.h" #include "mongo/db/storage/index_details.h" diff --git a/src/mongo/db/index/btree_access_method.h b/src/mongo/db/index/btree_access_method.h index 3a0a6d27828..149c34c3a46 100644 --- a/src/mongo/db/index/btree_access_method.h +++ b/src/mongo/db/index/btree_access_method.h @@ -31,7 +31,7 @@ #include <boost/scoped_ptr.hpp> #include "mongo/base/status.h" -#include "mongo/db/btree.h" +#include "mongo/db/structure/btree/btree.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/btree_key_generator.h" #include "mongo/db/index/btree_access_method_internal.h" diff --git a/src/mongo/db/index/btree_based_builder.cpp b/src/mongo/db/index/btree_based_builder.cpp index abd657649d6..cb5a2c92967 100644 --- a/src/mongo/db/index/btree_based_builder.cpp +++ b/src/mongo/db/index/btree_based_builder.cpp @@ -28,7 +28,7 @@ #include "mongo/db/index/btree_based_builder.h" -#include "mongo/db/btreebuilder.h" +#include "mongo/db/structure/btree/btreebuilder.h" #include "mongo/db/index/btree_access_method.h" #include "mongo/db/index/index_descriptor.h" #include "mongo/db/index/index_access_method.h" diff --git a/src/mongo/db/index/btree_interface.cpp b/src/mongo/db/index/btree_interface.cpp index d1fa3594c27..548537e43fa 100644 --- a/src/mongo/db/index/btree_interface.cpp +++ b/src/mongo/db/index/btree_interface.cpp @@ -26,7 +26,7 @@ * it in the license file. */ -#include "mongo/db/btree.h" +#include "mongo/db/structure/btree/btree.h" #include "mongo/db/index/btree_interface.h" #include "mongo/db/pdfile.h" diff --git a/src/mongo/db/index/btree_interface.h b/src/mongo/db/index/btree_interface.h index dc7a20670f1..5af0cea2f25 100644 --- a/src/mongo/db/index/btree_interface.h +++ b/src/mongo/db/index/btree_interface.h @@ -28,7 +28,7 @@ #pragma once -#include "mongo/db/btree.h" +#include "mongo/db/structure/btree/btree.h" #include "mongo/db/diskloc.h" #include "mongo/db/jsobj.h" @@ -38,7 +38,7 @@ namespace mongo { * We have two Btree on-disk formats which support identical operations. We hide this as much * as possible by having one implementation of this interface per format. * - * For documentation on all of the methods here, look at mongo/db/btree.h + * For documentation on all of the methods here, look at mongo/db/structure/btree/btree.h */ class BtreeInterface { public: diff --git a/src/mongo/db/index/hash_access_method.cpp b/src/mongo/db/index/hash_access_method.cpp index a334bbcea0c..ed8ac39defa 100644 --- a/src/mongo/db/index/hash_access_method.cpp +++ b/src/mongo/db/index/hash_access_method.cpp @@ -26,7 +26,7 @@ * it in the license file. */ -#include "mongo/db/btree.h" +#include "mongo/db/structure/btree/btree.h" #include "mongo/db/hasher.h" #include "mongo/db/index/hash_access_method.h" diff --git a/src/mongo/db/pdfile.cpp b/src/mongo/db/pdfile.cpp index 08b842cedc1..29316a6f20c 100644 --- a/src/mongo/db/pdfile.cpp +++ b/src/mongo/db/pdfile.cpp @@ -51,7 +51,7 @@ _ disallow system* manipulations from the database. #include "mongo/db/auth/user_document_parser.h" #include "mongo/db/pdfile_private.h" #include "mongo/db/background.h" -#include "mongo/db/btree.h" +#include "mongo/db/structure/btree/btree.h" #include "mongo/db/clientcursor.h" #include "mongo/db/cloner.h" #include "mongo/db/commands/server_status.h" diff --git a/src/mongo/db/query/idhack_runner.cpp b/src/mongo/db/query/idhack_runner.cpp index fc184617f7a..b63fdae6bff 100644 --- a/src/mongo/db/query/idhack_runner.cpp +++ b/src/mongo/db/query/idhack_runner.cpp @@ -28,7 +28,7 @@ #include "mongo/db/query/idhack_runner.h" -#include "mongo/db/btree.h" +#include "mongo/db/structure/btree/btree.h" #include "mongo/db/catalog/index_catalog.h" #include "mongo/db/diskloc.h" #include "mongo/db/exec/projection_exec.h" diff --git a/src/mongo/db/query_runner.cpp b/src/mongo/db/query_runner.cpp index 643ad5f76a2..38fd7f2ba2f 100644 --- a/src/mongo/db/query_runner.cpp +++ b/src/mongo/db/query_runner.cpp @@ -28,7 +28,7 @@ #include "mongo/db/query_runner.h" -#include "mongo/db/btree.h" +#include "mongo/db/structure/btree/btree.h" #include "mongo/db/storage/index_details.h" #include "mongo/db/jsobj.h" #include "mongo/db/pdfile.h" diff --git a/src/mongo/db/storage/index_details.h b/src/mongo/db/storage/index_details.h index 43f6e2ae057..e58462714ef 100644 --- a/src/mongo/db/storage/index_details.h +++ b/src/mongo/db/storage/index_details.h @@ -36,7 +36,7 @@ #include "mongo/db/diskloc.h" #include "mongo/db/jsobj.h" -#include "mongo/db/key.h" +#include "mongo/db/structure/btree/key.h" #include "mongo/db/catalog/ondisk/namespace.h" namespace mongo { diff --git a/src/mongo/db/btree.cpp b/src/mongo/db/structure/btree/btree.cpp index 7ce7fb48325..04e52aa6376 100644 --- a/src/mongo/db/btree.cpp +++ b/src/mongo/db/structure/btree/btree.cpp @@ -30,10 +30,10 @@ #include "mongo/pch.h" -#include "mongo/db/btree.h" +#include "mongo/db/structure/btree/btree.h" -#include "mongo/db/btree_stats.h" -#include "mongo/db/btreebuilder.h" +#include "mongo/db/structure/btree/btree_stats.h" +#include "mongo/db/structure/btree/btreebuilder.h" #include "mongo/db/client.h" #include "mongo/db/clientcursor.h" #include "mongo/db/curop-inl.h" @@ -1862,13 +1862,6 @@ namespace mongo { return kn.recordLoc; } -} // namespace mongo - -#include "db.h" -#include "dbhelpers.h" - -namespace mongo { - template< class V > void BtreeBucket<V>::a_test(IndexDetails& id) { BtreeBucket *b = id.head.btreemod<V>(); diff --git a/src/mongo/db/btree.h b/src/mongo/db/structure/btree/btree.h index 9e075bf02de..953b24072e8 100644 --- a/src/mongo/db/btree.h +++ b/src/mongo/db/structure/btree/btree.h @@ -35,7 +35,7 @@ #include "mongo/db/diskloc.h" #include "mongo/db/dur.h" #include "mongo/db/jsobj.h" -#include "mongo/db/key.h" +#include "mongo/db/structure/btree/key.h" namespace mongo { diff --git a/src/mongo/db/btree_stats.cpp b/src/mongo/db/structure/btree/btree_stats.cpp index 814a2403e8a..ad8ea10e173 100644 --- a/src/mongo/db/btree_stats.cpp +++ b/src/mongo/db/structure/btree/btree_stats.cpp @@ -31,7 +31,7 @@ #include "mongo/pch.h" #include "mongo/base/init.h" -#include "mongo/db/btree_stats.h" +#include "mongo/db/structure/btree/btree_stats.h" namespace mongo { diff --git a/src/mongo/db/btree_stats.h b/src/mongo/db/structure/btree/btree_stats.h index 249c29ed76c..249c29ed76c 100644 --- a/src/mongo/db/btree_stats.h +++ b/src/mongo/db/structure/btree/btree_stats.h diff --git a/src/mongo/db/btreebuilder.cpp b/src/mongo/db/structure/btree/btreebuilder.cpp index bbf724b3fa0..aaccaf89b35 100644 --- a/src/mongo/db/btreebuilder.cpp +++ b/src/mongo/db/structure/btree/btreebuilder.cpp @@ -30,9 +30,9 @@ #include "mongo/pch.h" -#include "mongo/db/btreebuilder.h" +#include "mongo/db/structure/btree/btreebuilder.h" -#include "mongo/db/btree.h" +#include "mongo/db/structure/btree/btree.h" #include "mongo/db/client.h" #include "mongo/db/clientcursor.h" #include "mongo/db/curop-inl.h" diff --git a/src/mongo/db/btreebuilder.h b/src/mongo/db/structure/btree/btreebuilder.h index 100568d536c..7124d7428e2 100644 --- a/src/mongo/db/btreebuilder.h +++ b/src/mongo/db/structure/btree/btreebuilder.h @@ -28,7 +28,7 @@ #pragma once -#include "mongo/db/btree.h" +#include "mongo/db/structure/btree/btree.h" namespace mongo { diff --git a/src/mongo/db/key.cpp b/src/mongo/db/structure/btree/key.cpp index 4e38bc20a85..5b1262fb275 100644 --- a/src/mongo/db/key.cpp +++ b/src/mongo/db/structure/btree/key.cpp @@ -30,7 +30,7 @@ #include "mongo/pch.h" -#include "mongo/db/key.h" +#include "mongo/db/structure/btree/key.h" #include "mongo/bson/util/builder.h" #include "mongo/platform/float_utils.h" diff --git a/src/mongo/db/key.h b/src/mongo/db/structure/btree/key.h index e26b6617947..214bfacf1e4 100644 --- a/src/mongo/db/key.h +++ b/src/mongo/db/structure/btree/key.h @@ -29,10 +29,10 @@ */ #pragma once - -#include "jsobj.h" -namespace mongo { +#include "mongo/db/jsobj.h" + +namespace mongo { /** Key class for precomputing a small format index key that is denser than a traditional BSONObj. diff --git a/src/mongo/dbtests/btreebuildertests.cpp b/src/mongo/dbtests/btreebuildertests.cpp index 5e23f6b4c3f..ca3c1fa72e8 100644 --- a/src/mongo/dbtests/btreebuildertests.cpp +++ b/src/mongo/dbtests/btreebuildertests.cpp @@ -28,7 +28,7 @@ * then also delete it in the license file. */ -#include "mongo/db/btreebuilder.h" +#include "mongo/db/structure/btree/btreebuilder.h" #include "mongo/db/catalog/index_catalog.h" #include "mongo/db/pdfile.h" diff --git a/src/mongo/dbtests/btreetests.cpp b/src/mongo/dbtests/btreetests.cpp index f04406e49a3..0bdb2256deb 100644 --- a/src/mongo/dbtests/btreetests.cpp +++ b/src/mongo/dbtests/btreetests.cpp @@ -31,7 +31,7 @@ #include "mongo/pch.h" -#include "mongo/db/btree.h" +#include "mongo/db/structure/btree/btree.h" #include "mongo/db/db.h" #include "mongo/db/json.h" #include "mongo/dbtests/dbtests.h" diff --git a/src/mongo/dbtests/indexupdatetests.cpp b/src/mongo/dbtests/indexupdatetests.cpp index 8caf6f6c7da..ba740921032 100644 --- a/src/mongo/dbtests/indexupdatetests.cpp +++ b/src/mongo/dbtests/indexupdatetests.cpp @@ -28,7 +28,7 @@ * then also delete it in the license file. */ -#include "mongo/db/btree.h" +#include "mongo/db/structure/btree/btree.h" #include "mongo/db/catalog/index_catalog.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/index/btree_based_builder.h" diff --git a/src/mongo/dbtests/jsobjtests.cpp b/src/mongo/dbtests/jsobjtests.cpp index 2790ddf8db1..aff58e04e62 100644 --- a/src/mongo/dbtests/jsobjtests.cpp +++ b/src/mongo/dbtests/jsobjtests.cpp @@ -35,7 +35,7 @@ #include "mongo/db/jsobj.h" #include "mongo/db/jsobjmanipulator.h" #include "mongo/db/json.h" -#include "mongo/db/key.h" +#include "mongo/db/structure/btree/key.h" #include "mongo/dbtests/dbtests.h" #include "mongo/platform/float_utils.h" #include "mongo/util/mongoutils/checksum.h" diff --git a/src/mongo/dbtests/perftests.cpp b/src/mongo/dbtests/perftests.cpp index d97851f3aad..d81e52ec11d 100644 --- a/src/mongo/dbtests/perftests.cpp +++ b/src/mongo/dbtests/perftests.cpp @@ -44,7 +44,7 @@ #include "mongo/db/dur_stats.h" #include "mongo/db/instance.h" #include "mongo/db/json.h" -#include "mongo/db/key.h" +#include "mongo/db/structure/btree/key.h" #include "mongo/db/lasterror.h" #include "mongo/db/taskqueue.h" #include "mongo/dbtests/dbtests.h" |