diff options
Diffstat (limited to 'src/mongo/db')
56 files changed, 207 insertions, 195 deletions
diff --git a/src/mongo/db/btree.cpp b/src/mongo/db/btree.cpp index c74d71a6884..c295a2050d6 100644 --- a/src/mongo/db/btree.cpp +++ b/src/mongo/db/btree.cpp @@ -19,6 +19,7 @@ #include "mongo/pch.h" #include "mongo/db/btree.h" + #include "mongo/db/btree_stats.h" #include "mongo/db/btreebuilder.h" #include "mongo/db/client.h" diff --git a/src/mongo/db/btreebuilder.cpp b/src/mongo/db/btreebuilder.cpp index a97882b510a..ebc81b98ec1 100644 --- a/src/mongo/db/btreebuilder.cpp +++ b/src/mongo/db/btreebuilder.cpp @@ -16,19 +16,21 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "db.h" -#include "btree.h" -#include "pdfile.h" -#include "json.h" -#include "clientcursor.h" -#include "client.h" -#include "dbhelpers.h" -#include "curop-inl.h" -#include "stats/counters.h" -#include "dur_commitjob.h" -#include "btreebuilder.h" +#include "mongo/pch.h" + +#include "mongo/db/btreebuilder.h" + +#include "mongo/db/btree.h" +#include "mongo/db/client.h" +#include "mongo/db/clientcursor.h" +#include "mongo/db/curop-inl.h" +#include "mongo/db/db.h" +#include "mongo/db/dbhelpers.h" +#include "mongo/db/dur_commitjob.h" +#include "mongo/db/json.h" #include "mongo/db/kill_current_op.h" +#include "mongo/db/pdfile.h" +#include "mongo/db/stats/counters.h" namespace mongo { diff --git a/src/mongo/db/btreebuilder.h b/src/mongo/db/btreebuilder.h index a671d3895df..8916ea8c353 100644 --- a/src/mongo/db/btreebuilder.h +++ b/src/mongo/db/btreebuilder.h @@ -16,7 +16,7 @@ #pragma once -#include "btree.h" +#include "mongo/db/btree.h" namespace mongo { diff --git a/src/mongo/db/clientcursor.h b/src/mongo/db/clientcursor.h index e77d544371a..3acef2dde8a 100644 --- a/src/mongo/db/clientcursor.h +++ b/src/mongo/db/clientcursor.h @@ -28,17 +28,17 @@ #include <boost/thread/recursive_mutex.hpp> -#include "cursor.h" -#include "jsobj.h" -#include "../util/net/message.h" -#include "../util/background.h" -#include "cc_by_loc.h" -#include "diskloc.h" -#include "dbhelpers.h" -#include "matcher.h" -#include "projection.h" +#include "mongo/db/cc_by_loc.h" +#include "mongo/db/cursor.h" +#include "mongo/db/diskloc.h" +#include "mongo/db/dbhelpers.h" +#include "mongo/db/jsobj.h" #include "mongo/db/keypattern.h" +#include "mongo/db/matcher.h" +#include "mongo/db/projection.h" #include "mongo/s/collection_metadata.h" +#include "mongo/util/net/message.h" +#include "mongo/util/background.h" #include "mongo/util/elapsed_tracker.h" namespace mongo { diff --git a/src/mongo/db/commands/find_and_modify.cpp b/src/mongo/db/commands/find_and_modify.cpp index 325e879ac0e..871212e13d8 100644 --- a/src/mongo/db/commands/find_and_modify.cpp +++ b/src/mongo/db/commands/find_and_modify.cpp @@ -16,15 +16,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" #include "mongo/db/commands/find_and_modify.h" +#include "mongo/db/clientcursor.h" #include "mongo/db/commands.h" +#include "mongo/db/dbhelpers.h" #include "mongo/db/instance.h" -#include "mongo/db/clientcursor.h" #include "mongo/db/pagefault.h" -#include "mongo/db/dbhelpers.h" #include "mongo/db/ops/delete.h" #include "mongo/db/ops/update.h" #include "mongo/db/queryutil.h" diff --git a/src/mongo/db/commands/group.cpp b/src/mongo/db/commands/group.cpp index dd6fc28e43f..25680882c3e 100644 --- a/src/mongo/db/commands/group.cpp +++ b/src/mongo/db/commands/group.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" #include <vector> diff --git a/src/mongo/db/commands/isself.cpp b/src/mongo/db/commands/isself.cpp index 841863abf2a..96039f7f010 100644 --- a/src/mongo/db/commands/isself.cpp +++ b/src/mongo/db/commands/isself.cpp @@ -16,8 +16,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" +#include <boost/algorithm/string.hpp> #include <string> #include <vector> @@ -26,14 +27,12 @@ #include "mongo/db/auth/authorization_manager.h" #include "mongo/db/auth/privilege.h" #include "mongo/db/auth/security_key.h" +#include "mongo/db/commands.h" #include "mongo/db/jsobj.h" -#include "../../util/net/listen.h" -#include "../commands.h" +#include "mongo/util/net/listen.h" #include "mongo/util/net/hostandport.h" #include "mongo/client/dbclientinterface.h" -#include <boost/algorithm/string.hpp> - #ifndef _WIN32 # ifndef __sunos__ # include <ifaddrs.h> diff --git a/src/mongo/db/commands/pipeline_command.cpp b/src/mongo/db/commands/pipeline_command.cpp index 046f268978e..81082618a46 100644 --- a/src/mongo/db/commands/pipeline_command.cpp +++ b/src/mongo/db/commands/pipeline_command.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" #include <vector> diff --git a/src/mongo/db/commands/touch.cpp b/src/mongo/db/commands/touch.cpp index 301c06ced19..823c42884bb 100644 --- a/src/mongo/db/commands/touch.cpp +++ b/src/mongo/db/commands/touch.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" #include <string> #include <vector> diff --git a/src/mongo/db/common.cpp b/src/mongo/db/common.cpp index 2eb21edbde0..9dae0016977 100644 --- a/src/mongo/db/common.cpp +++ b/src/mongo/db/common.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "jsobjmanipulator.h" +#include "mongo/db/jsobjmanipulator.h" /** * this just has globals diff --git a/src/mongo/db/curop-inl.h b/src/mongo/db/curop-inl.h index c029aa5a51d..2d1e75fef7d 100644 --- a/src/mongo/db/curop-inl.h +++ b/src/mongo/db/curop-inl.h @@ -14,4 +14,4 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "curop.h" +#include "mongo/db/curop.h" diff --git a/src/mongo/db/db.rc b/src/mongo/db/db.rc index b589458cf73..e65be239465 100644 --- a/src/mongo/db/db.rc +++ b/src/mongo/db/db.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "resource.h" +#include "mongo/db/resource.h" ///////////////////////////////////////////////////////////////////////////// // @@ -9,4 +9,4 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. IDI_ICON2 ICON "mongo.ico" -/////////////////////////////////////////////////////////////////////////////
\ No newline at end of file +///////////////////////////////////////////////////////////////////////////// diff --git a/src/mongo/db/geo/geoparser.cpp b/src/mongo/db/geo/geoparser.cpp index 31e1cdee664..b4b94838a3e 100644 --- a/src/mongo/db/geo/geoparser.cpp +++ b/src/mongo/db/geo/geoparser.cpp @@ -14,10 +14,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "mongo/db/geo/geoparser.h" + #include <string> #include <vector> -#include "mongo/db/geo/geoparser.h" #include "mongo/db/geo/shapes.h" #include "mongo/db/jsobj.h" #include "mongo/util/mongoutils/str.h" diff --git a/src/mongo/db/geo/hash_test.cpp b/src/mongo/db/geo/hash_test.cpp index 65a700fae76..08b5760831c 100644 --- a/src/mongo/db/geo/hash_test.cpp +++ b/src/mongo/db/geo/hash_test.cpp @@ -24,7 +24,7 @@ #include "mongo/db/geo/hash.h" #include "mongo/platform/random.h" #include "mongo/unittest/unittest.h" -#include "util/assert_util.h" +#include "mongo/util/assert_util.h" using mongo::GeoHash; using std::string; diff --git a/src/mongo/db/index/hash_index_cursor.cpp b/src/mongo/db/index/hash_index_cursor.cpp index 366e1ddcdc9..1ed2ea1c255 100644 --- a/src/mongo/db/index/hash_index_cursor.cpp +++ b/src/mongo/db/index/hash_index_cursor.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "hash_index_cursor.h" +#include "mongo/db/index/hash_index_cursor.h" #include <boost/scoped_ptr.hpp> #include <vector> diff --git a/src/mongo/db/interrupt_status_mongod.cpp b/src/mongo/db/interrupt_status_mongod.cpp index 915a183651c..ee318b8b3f5 100644 --- a/src/mongo/db/interrupt_status_mongod.cpp +++ b/src/mongo/db/interrupt_status_mongod.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" #include "mongo/db/interrupt_status_mongod.h" diff --git a/src/mongo/db/interrupt_status_mongod.h b/src/mongo/db/interrupt_status_mongod.h index 0111571ec71..8601ffd1313 100644 --- a/src/mongo/db/interrupt_status_mongod.h +++ b/src/mongo/db/interrupt_status_mongod.h @@ -17,7 +17,7 @@ #pragma once #include "mongo/pch.h" -#include "db/interrupt_status.h" +#include "mongo/db/interrupt_status.h" namespace mongo { diff --git a/src/mongo/db/introspect.h b/src/mongo/db/introspect.h index 980d7c72b1c..3e452e847ec 100644 --- a/src/mongo/db/introspect.h +++ b/src/mongo/db/introspect.h @@ -20,8 +20,8 @@ #pragma once #include "mongo/pch.h" -#include "jsobj.h" -#include "pdfile.h" +#include "mongo/db/jsobj.h" +#include "mongo/db/pdfile.h" namespace mongo { diff --git a/src/mongo/db/memconcept.cpp b/src/mongo/db/memconcept.cpp index 00918691584..15c9a86b3cc 100644 --- a/src/mongo/db/memconcept.cpp +++ b/src/mongo/db/memconcept.cpp @@ -1,4 +1,3 @@ -#include "pch.h" /** * Copyright (C) 2012 10gen Inc. @@ -20,14 +19,17 @@ #define DDD(x) -#include <string> -#include <map> -#include "memconcept.h" -#include "../util/assert_util.h" +#include "mongo/db/memconcept.h" + #include <boost/functional/hash.hpp> +#include <map> +#include <string> + +#include "mongo/util/assert_util.h" +#include "mongo/util/log.h" +#include "mongo/util/startup_test.h" + using namespace std; -#include "../util/log.h" -#include "../util/startup_test.h" namespace mongo { namespace memconcept { diff --git a/src/mongo/db/ops/count.h b/src/mongo/db/ops/count.h index 624dd9e7b8d..b5a27df3e2a 100644 --- a/src/mongo/db/ops/count.h +++ b/src/mongo/db/ops/count.h @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "../jsobj.h" -#include "../diskloc.h" +#include "mongo/db/diskloc.h" +#include "mongo/db/jsobj.h" namespace mongo { diff --git a/src/mongo/db/pipeline/accumulator_add_to_set.cpp b/src/mongo/db/pipeline/accumulator_add_to_set.cpp index 6ecaccb3b40..2cfd0d7a658 100644 --- a/src/mongo/db/pipeline/accumulator_add_to_set.cpp +++ b/src/mongo/db/pipeline/accumulator_add_to_set.cpp @@ -14,11 +14,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "accumulator.h" +#include "mongo/pch.h" -#include "db/pipeline/expression_context.h" -#include "db/pipeline/value.h" +#include "mongo/db/pipeline/accumulator.h" +#include "mongo/db/pipeline/expression_context.h" +#include "mongo/db/pipeline/value.h" namespace mongo { void AccumulatorAddToSet::processInternal(const Value& input, bool merging) { diff --git a/src/mongo/db/pipeline/accumulator_avg.cpp b/src/mongo/db/pipeline/accumulator_avg.cpp index 9d323a799d7..5bb3d2de251 100644 --- a/src/mongo/db/pipeline/accumulator_avg.cpp +++ b/src/mongo/db/pipeline/accumulator_avg.cpp @@ -14,12 +14,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "accumulator.h" +#include "mongo/pch.h" -#include "db/pipeline/document.h" -#include "db/pipeline/expression_context.h" -#include "db/pipeline/value.h" +#include "mongo/db/pipeline/accumulator.h" +#include "mongo/db/pipeline/document.h" +#include "mongo/db/pipeline/expression_context.h" +#include "mongo/db/pipeline/value.h" namespace mongo { diff --git a/src/mongo/db/pipeline/accumulator_first.cpp b/src/mongo/db/pipeline/accumulator_first.cpp index c428226892b..531b97b19fb 100644 --- a/src/mongo/db/pipeline/accumulator_first.cpp +++ b/src/mongo/db/pipeline/accumulator_first.cpp @@ -14,10 +14,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "accumulator.h" +#include "mongo/pch.h" -#include "db/pipeline/value.h" +#include "mongo/db/pipeline/accumulator.h" +#include "mongo/db/pipeline/value.h" namespace mongo { diff --git a/src/mongo/db/pipeline/accumulator_last.cpp b/src/mongo/db/pipeline/accumulator_last.cpp index 25246dfb361..526b33521ad 100644 --- a/src/mongo/db/pipeline/accumulator_last.cpp +++ b/src/mongo/db/pipeline/accumulator_last.cpp @@ -14,10 +14,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "accumulator.h" +#include "mongo/pch.h" -#include "db/pipeline/value.h" +#include "mongo/db/pipeline/accumulator.h" +#include "mongo/db/pipeline/value.h" namespace mongo { diff --git a/src/mongo/db/pipeline/accumulator_min_max.cpp b/src/mongo/db/pipeline/accumulator_min_max.cpp index ace2cb34af5..42b0e158147 100644 --- a/src/mongo/db/pipeline/accumulator_min_max.cpp +++ b/src/mongo/db/pipeline/accumulator_min_max.cpp @@ -14,10 +14,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "accumulator.h" +#include "mongo/pch.h" -#include "db/pipeline/value.h" +#include "mongo/db/pipeline/accumulator.h" +#include "mongo/db/pipeline/value.h" namespace mongo { diff --git a/src/mongo/db/pipeline/accumulator_push.cpp b/src/mongo/db/pipeline/accumulator_push.cpp index cb60529274e..a61a0858097 100644 --- a/src/mongo/db/pipeline/accumulator_push.cpp +++ b/src/mongo/db/pipeline/accumulator_push.cpp @@ -14,11 +14,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "accumulator.h" +#include "mongo/pch.h" -#include "db/pipeline/expression_context.h" -#include "db/pipeline/value.h" +#include "mongo/db/pipeline/accumulator.h" +#include "mongo/db/pipeline/expression_context.h" +#include "mongo/db/pipeline/value.h" namespace mongo { void AccumulatorPush::processInternal(const Value& input, bool merging) { diff --git a/src/mongo/db/pipeline/accumulator_sum.cpp b/src/mongo/db/pipeline/accumulator_sum.cpp index 895c2fb1e53..1734f81bcc9 100644 --- a/src/mongo/db/pipeline/accumulator_sum.cpp +++ b/src/mongo/db/pipeline/accumulator_sum.cpp @@ -14,10 +14,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "accumulator.h" +#include "mongo/pch.h" -#include "db/pipeline/value.h" +#include "mongo/db/pipeline/accumulator.h" +#include "mongo/db/pipeline/value.h" namespace mongo { diff --git a/src/mongo/db/pipeline/builder.cpp b/src/mongo/db/pipeline/builder.cpp index 69eddcf9747..930756473e7 100644 --- a/src/mongo/db/pipeline/builder.cpp +++ b/src/mongo/db/pipeline/builder.cpp @@ -14,10 +14,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" -#include "db/jsobj.h" -#include "db/pipeline/builder.h" +#include "mongo/db/jsobj.h" +#include "mongo/db/pipeline/builder.h" namespace mongo { diff --git a/src/mongo/db/pipeline/document.cpp b/src/mongo/db/pipeline/document.cpp index bb6b6969ab9..c4273dfd461 100644 --- a/src/mongo/db/pipeline/document.cpp +++ b/src/mongo/db/pipeline/document.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" #include "mongo/db/pipeline/document.h" diff --git a/src/mongo/db/pipeline/document_source.cpp b/src/mongo/db/pipeline/document_source.cpp index ac6e66fdb46..60d2b2bebae 100644 --- a/src/mongo/db/pipeline/document_source.cpp +++ b/src/mongo/db/pipeline/document_source.cpp @@ -14,10 +14,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" -#include "db/pipeline/document_source.h" -#include "db/pipeline/expression_context.h" +#include "mongo/db/pipeline/document_source.h" +#include "mongo/db/pipeline/expression_context.h" namespace mongo { diff --git a/src/mongo/db/pipeline/document_source_bson_array.cpp b/src/mongo/db/pipeline/document_source_bson_array.cpp index 64217cc9716..795084e3056 100644 --- a/src/mongo/db/pipeline/document_source_bson_array.cpp +++ b/src/mongo/db/pipeline/document_source_bson_array.cpp @@ -14,10 +14,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" -#include "db/pipeline/document_source.h" -#include "db/pipeline/document.h" +#include "mongo/db/pipeline/document.h" +#include "mongo/db/pipeline/document_source.h" namespace mongo { diff --git a/src/mongo/db/pipeline/document_source_command_shards.cpp b/src/mongo/db/pipeline/document_source_command_shards.cpp index e1f04ae1a50..56e349bf0c8 100644 --- a/src/mongo/db/pipeline/document_source_command_shards.cpp +++ b/src/mongo/db/pipeline/document_source_command_shards.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" #include "mongo/db/pipeline/document_source.h" #include "mongo/s/shard.h" diff --git a/src/mongo/db/pipeline/document_source_filter.cpp b/src/mongo/db/pipeline/document_source_filter.cpp index 3b5537b23bd..6733d8fbee4 100644 --- a/src/mongo/db/pipeline/document_source_filter.cpp +++ b/src/mongo/db/pipeline/document_source_filter.cpp @@ -14,13 +14,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" -#include "db/pipeline/document_source.h" - -#include "db/jsobj.h" -#include "db/pipeline/expression.h" -#include "db/pipeline/value.h" +#include "mongo/db/jsobj.h" +#include "mongo/db/pipeline/document_source.h" +#include "mongo/db/pipeline/expression.h" +#include "mongo/db/pipeline/value.h" namespace mongo { diff --git a/src/mongo/db/pipeline/document_source_filter_base.cpp b/src/mongo/db/pipeline/document_source_filter_base.cpp index fd42993b23e..87b2f80440e 100644 --- a/src/mongo/db/pipeline/document_source_filter_base.cpp +++ b/src/mongo/db/pipeline/document_source_filter_base.cpp @@ -14,13 +14,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" -#include "db/pipeline/document_source.h" - -#include "db/jsobj.h" -#include "db/pipeline/expression.h" -#include "db/pipeline/value.h" +#include "mongo/db/jsobj.h" +#include "mongo/db/pipeline/document_source.h" +#include "mongo/db/pipeline/expression.h" +#include "mongo/db/pipeline/value.h" namespace mongo { diff --git a/src/mongo/db/pipeline/document_source_group.cpp b/src/mongo/db/pipeline/document_source_group.cpp index c17e12630fd..7b777534616 100644 --- a/src/mongo/db/pipeline/document_source_group.cpp +++ b/src/mongo/db/pipeline/document_source_group.cpp @@ -14,16 +14,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" -#include "db/pipeline/document_source.h" -#include "db/jsobj.h" -#include "db/pipeline/accumulator.h" -#include "db/pipeline/document.h" -#include "db/pipeline/expression.h" -#include "db/pipeline/expression_context.h" -#include "db/pipeline/value.h" +#include "mongo/db/jsobj.h" +#include "mongo/db/pipeline/accumulator.h" +#include "mongo/db/pipeline/document.h" +#include "mongo/db/pipeline/document_source.h" +#include "mongo/db/pipeline/expression.h" +#include "mongo/db/pipeline/expression_context.h" +#include "mongo/db/pipeline/value.h" namespace mongo { const char DocumentSourceGroup::groupName[] = "$group"; diff --git a/src/mongo/db/pipeline/document_source_limit.cpp b/src/mongo/db/pipeline/document_source_limit.cpp index 863bc5f16a7..225109e4954 100644 --- a/src/mongo/db/pipeline/document_source_limit.cpp +++ b/src/mongo/db/pipeline/document_source_limit.cpp @@ -14,15 +14,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" - -#include "db/pipeline/document_source.h" - -#include "db/jsobj.h" -#include "db/pipeline/document.h" -#include "db/pipeline/expression.h" -#include "db/pipeline/expression_context.h" -#include "db/pipeline/value.h" +#include "mongo/pch.h" + +#include "mongo/db/jsobj.h" +#include "mongo/db/pipeline/document.h" +#include "mongo/db/pipeline/document_source.h" +#include "mongo/db/pipeline/expression.h" +#include "mongo/db/pipeline/expression_context.h" +#include "mongo/db/pipeline/value.h" namespace mongo { const char DocumentSourceLimit::limitName[] = "$limit"; diff --git a/src/mongo/db/pipeline/document_source_match.cpp b/src/mongo/db/pipeline/document_source_match.cpp index 920bb8ff369..ee7b9c80f8a 100644 --- a/src/mongo/db/pipeline/document_source_match.cpp +++ b/src/mongo/db/pipeline/document_source_match.cpp @@ -14,14 +14,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" -#include "db/pipeline/document_source.h" - -#include "db/jsobj.h" -#include "db/matcher.h" -#include "db/pipeline/document.h" -#include "db/pipeline/expression.h" +#include "mongo/db/jsobj.h" +#include "mongo/db/matcher.h" +#include "mongo/db/pipeline/document.h" +#include "mongo/db/pipeline/document_source.h" +#include "mongo/db/pipeline/expression.h" namespace mongo { diff --git a/src/mongo/db/pipeline/document_source_out.cpp b/src/mongo/db/pipeline/document_source_out.cpp index bbdaacfa053..73cba2ef9a6 100644 --- a/src/mongo/db/pipeline/document_source_out.cpp +++ b/src/mongo/db/pipeline/document_source_out.cpp @@ -14,9 +14,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" -#include "db/pipeline/document_source.h" +#include "mongo/db/pipeline/document_source.h" namespace mongo { diff --git a/src/mongo/db/pipeline/document_source_project.cpp b/src/mongo/db/pipeline/document_source_project.cpp index 3bc65b8bff4..ed26948b63d 100644 --- a/src/mongo/db/pipeline/document_source_project.cpp +++ b/src/mongo/db/pipeline/document_source_project.cpp @@ -14,13 +14,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "db/pipeline/document_source.h" +#include "mongo/pch.h" -#include "db/jsobj.h" -#include "db/pipeline/document.h" -#include "db/pipeline/expression.h" -#include "db/pipeline/value.h" +#include "mongo/db/jsobj.h" +#include "mongo/db/pipeline/document.h" +#include "mongo/db/pipeline/document_source.h" +#include "mongo/db/pipeline/expression.h" +#include "mongo/db/pipeline/value.h" namespace mongo { diff --git a/src/mongo/db/pipeline/document_source_skip.cpp b/src/mongo/db/pipeline/document_source_skip.cpp index 833de29061a..3141ecaf9cc 100644 --- a/src/mongo/db/pipeline/document_source_skip.cpp +++ b/src/mongo/db/pipeline/document_source_skip.cpp @@ -14,15 +14,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" - -#include "db/pipeline/document_source.h" - -#include "db/jsobj.h" -#include "db/pipeline/document.h" -#include "db/pipeline/expression.h" -#include "db/pipeline/expression_context.h" -#include "db/pipeline/value.h" +#include "mongo/pch.h" + +#include "mongo/db/jsobj.h" +#include "mongo/db/pipeline/document.h" +#include "mongo/db/pipeline/document_source.h" +#include "mongo/db/pipeline/expression.h" +#include "mongo/db/pipeline/expression_context.h" +#include "mongo/db/pipeline/value.h" namespace mongo { diff --git a/src/mongo/db/pipeline/document_source_unwind.cpp b/src/mongo/db/pipeline/document_source_unwind.cpp index 249d3efb593..5df71bdb5c4 100644 --- a/src/mongo/db/pipeline/document_source_unwind.cpp +++ b/src/mongo/db/pipeline/document_source_unwind.cpp @@ -14,13 +14,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "db/pipeline/document_source.h" +#include "mongo/pch.h" -#include "db/jsobj.h" -#include "db/pipeline/document.h" -#include "db/pipeline/expression.h" -#include "db/pipeline/value.h" +#include "mongo/db/jsobj.h" +#include "mongo/db/pipeline/document.h" +#include "mongo/db/pipeline/document_source.h" +#include "mongo/db/pipeline/expression.h" +#include "mongo/db/pipeline/value.h" namespace mongo { diff --git a/src/mongo/db/pipeline/expression.cpp b/src/mongo/db/pipeline/expression.cpp index bb99a5efba4..9a9434a68fd 100644 --- a/src/mongo/db/pipeline/expression.cpp +++ b/src/mongo/db/pipeline/expression.cpp @@ -14,18 +14,19 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <boost/algorithm/string.hpp> - #include "pch.h" + #include "db/pipeline/expression.h" +#include <boost/algorithm/string.hpp> #include <cstdio> -#include "db/jsobj.h" -#include "db/pipeline/builder.h" -#include "db/pipeline/document.h" -#include "db/pipeline/expression_context.h" -#include "db/pipeline/value.h" -#include "util/mongoutils/str.h" + +#include "mongo/db/jsobj.h" +#include "mongo/db/pipeline/builder.h" +#include "mongo/db/pipeline/document.h" +#include "mongo/db/pipeline/expression_context.h" +#include "mongo/db/pipeline/value.h" +#include "mongo/util/mongoutils/str.h" namespace mongo { using namespace mongoutils; diff --git a/src/mongo/db/pipeline/expression_context.cpp b/src/mongo/db/pipeline/expression_context.cpp index ba0813faaa6..7cb82ac9eda 100644 --- a/src/mongo/db/pipeline/expression_context.cpp +++ b/src/mongo/db/pipeline/expression_context.cpp @@ -14,10 +14,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" -#include "db/interrupt_status.h" -#include "db/pipeline/expression_context.h" +#include "mongo/db/pipeline/expression_context.h" + +#include "mongo/db/interrupt_status.h" namespace mongo { diff --git a/src/mongo/db/pipeline/expression_context.h b/src/mongo/db/pipeline/expression_context.h index d87fa06e924..a179e8c371e 100644 --- a/src/mongo/db/pipeline/expression_context.h +++ b/src/mongo/db/pipeline/expression_context.h @@ -18,7 +18,7 @@ #include "mongo/pch.h" -#include "util/intrusive_counter.h" +#include "mongo/util/intrusive_counter.h" namespace mongo { diff --git a/src/mongo/db/pipeline/field_path.cpp b/src/mongo/db/pipeline/field_path.cpp index a21010bb95c..9fcc4e2f708 100644 --- a/src/mongo/db/pipeline/field_path.cpp +++ b/src/mongo/db/pipeline/field_path.cpp @@ -14,9 +14,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "db/pipeline/field_path.h" -#include "util/mongoutils/str.h" +#include "mongo/pch.h" + +#include "mongo/db/pipeline/field_path.h" + +#include "mongo/util/mongoutils/str.h" namespace mongo { diff --git a/src/mongo/db/pipeline/pipeline.cpp b/src/mongo/db/pipeline/pipeline.cpp index 2a5a9313f79..c7ace402a9c 100644 --- a/src/mongo/db/pipeline/pipeline.cpp +++ b/src/mongo/db/pipeline/pipeline.cpp @@ -14,16 +14,17 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "db/pipeline/pipeline.h" - -#include "db/jsobj.h" -#include "db/pipeline/accumulator.h" -#include "db/pipeline/document.h" -#include "db/pipeline/document_source.h" -#include "db/pipeline/expression.h" -#include "db/pipeline/expression_context.h" -#include "util/mongoutils/str.h" +#include "mongo/pch.h" + +#include "mongo/db/pipeline/pipeline.h" + +#include "mongo/db/jsobj.h" +#include "mongo/db/pipeline/accumulator.h" +#include "mongo/db/pipeline/document.h" +#include "mongo/db/pipeline/document_source.h" +#include "mongo/db/pipeline/expression.h" +#include "mongo/db/pipeline/expression_context.h" +#include "mongo/util/mongoutils/str.h" namespace mongo { diff --git a/src/mongo/db/pipeline/pipeline.h b/src/mongo/db/pipeline/pipeline.h index 74aad4f4980..058be129750 100644 --- a/src/mongo/db/pipeline/pipeline.h +++ b/src/mongo/db/pipeline/pipeline.h @@ -20,8 +20,8 @@ #include "mongo/pch.h" -#include "util/intrusive_counter.h" -#include "util/timer.h" +#include "mongo/util/intrusive_counter.h" +#include "mongo/util/timer.h" namespace mongo { class BSONObj; diff --git a/src/mongo/db/pipeline/pipeline_d.cpp b/src/mongo/db/pipeline/pipeline_d.cpp index bd9e5d1e991..86e008db94f 100644 --- a/src/mongo/db/pipeline/pipeline_d.cpp +++ b/src/mongo/db/pipeline/pipeline_d.cpp @@ -14,9 +14,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" -#include "mongo/db/pipeline/pipeline.h" #include "mongo/db/pipeline/pipeline_d.h" #include "mongo/client/dbclientinterface.h" @@ -24,6 +23,7 @@ #include "mongo/db/instance.h" #include "mongo/db/parsed_query.h" #include "mongo/db/pipeline/document_source.h" +#include "mongo/db/pipeline/pipeline.h" #include "mongo/db/query_optimizer.h" diff --git a/src/mongo/db/pipeline/pipeline_d.h b/src/mongo/db/pipeline/pipeline_d.h index 154ef36a824..11a6ded8542 100644 --- a/src/mongo/db/pipeline/pipeline_d.h +++ b/src/mongo/db/pipeline/pipeline_d.h @@ -20,6 +20,7 @@ namespace mongo { class DocumentSourceCursor; + class ExpressionContext; class Pipeline; /* diff --git a/src/mongo/db/projection.cpp b/src/mongo/db/projection.cpp index 5e2f204de56..31315048e4e 100644 --- a/src/mongo/db/projection.cpp +++ b/src/mongo/db/projection.cpp @@ -15,8 +15,10 @@ * limitations under the License. */ -#include "pch.h" -#include "projection.h" +#include "mongo/pch.h" + +#include "mongo/db/projection.h" + #include "mongo/db/matcher.h" #include "mongo/util/mongoutils/str.h" diff --git a/src/mongo/db/queryoptimizercursorimpl.cpp b/src/mongo/db/queryoptimizercursorimpl.cpp index ef520ff8856..278b39445b6 100644 --- a/src/mongo/db/queryoptimizercursorimpl.cpp +++ b/src/mongo/db/queryoptimizercursorimpl.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" #include "mongo/db/queryoptimizercursorimpl.h" diff --git a/src/mongo/db/queryutil.cpp b/src/mongo/db/queryutil.cpp index 02875e03770..9a649d3207d 100644 --- a/src/mongo/db/queryutil.cpp +++ b/src/mongo/db/queryutil.cpp @@ -13,14 +13,14 @@ * limitations under the License. */ -#include "pch.h" +#include "mongo/pch.h" #include "mongo/db/queryutil.h" -#include "mongo/db/index_names.h" -#include "pdfile.h" -#include "../util/startup_test.h" -#include "../util/mongoutils/str.h" +#include "mongo/db/index_names.h" +#include "mongo/db/pdfile.h" +#include "mongo/util/mongoutils/str.h" +#include "mongo/util/startup_test.h" namespace mongo { diff --git a/src/mongo/db/record.cpp b/src/mongo/db/record.cpp index 9c4a7b2ef9e..51987e7d978 100644 --- a/src/mongo/db/record.cpp +++ b/src/mongo/db/record.cpp @@ -16,14 +16,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" + +#include "mongo/db/record.h" + #include "mongo/base/init.h" +#include "mongo/db/commands/server_status.h" #include "mongo/db/curop.h" #include "mongo/db/database_holder.h" #include "mongo/db/pagefault.h" #include "mongo/db/pdfile.h" -#include "mongo/db/record.h" -#include "mongo/db/commands/server_status.h" #include "mongo/platform/bits.h" #include "mongo/platform/unordered_set.h" #include "mongo/util/net/listen.h" diff --git a/src/mongo/db/stats/counters.cpp b/src/mongo/db/stats/counters.cpp index 8a88fef8c01..c323222e1a6 100644 --- a/src/mongo/db/stats/counters.cpp +++ b/src/mongo/db/stats/counters.cpp @@ -16,9 +16,11 @@ */ -#include "pch.h" -#include "../jsobj.h" -#include "counters.h" +#include "mongo/pch.h" + +#include "mongo/db/stats/counters.h" + +#include "mongo/db/jsobj.h" namespace mongo { OpCounters::OpCounters() {} diff --git a/src/mongo/db/storage/namespace.cpp b/src/mongo/db/storage/namespace.cpp index 045f56b949e..4ab6e6f2790 100644 --- a/src/mongo/db/storage/namespace.cpp +++ b/src/mongo/db/storage/namespace.cpp @@ -16,12 +16,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -#include <boost/static_assert.hpp> - #include "mongo/pch.h" #include "mongo/db/storage/namespace.h" + +#include <boost/static_assert.hpp> + #include "mongo/db/namespace_string.h" namespace mongo { diff --git a/src/mongo/db/ttl.cpp b/src/mongo/db/ttl.cpp index 6731a07b6bb..799b98ba331 100644 --- a/src/mongo/db/ttl.cpp +++ b/src/mongo/db/ttl.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" #include "mongo/db/ttl.h" |