diff options
166 files changed, 570 insertions, 526 deletions
diff --git a/src/mongo/base/counter_test.cpp b/src/mongo/base/counter_test.cpp index 0966cbddd78..94998192eb1 100644 --- a/src/mongo/base/counter_test.cpp +++ b/src/mongo/base/counter_test.cpp @@ -13,14 +13,14 @@ * limitations under the License. */ -#include "mongo/platform/basic.h" -#include <iostream> +#include "mongo/platform/basic.h" #include <boost/static_assert.hpp> #include <climits> +#include <iostream> -#include "counter.h" +#include "mongo/base/counter.h" #include "mongo/unittest/unittest.h" namespace mongo { diff --git a/src/mongo/base/string_data.h b/src/mongo/base/string_data.h index 3ffbba834e8..6514a9a1a29 100644 --- a/src/mongo/base/string_data.h +++ b/src/mongo/base/string_data.h @@ -174,4 +174,4 @@ namespace mongo { } // namespace mongo -#include "string_data-inl.h" +#include "mongo/base/string_data-inl.h" diff --git a/src/mongo/bson/bson_db.h b/src/mongo/bson/bson_db.h index 639dae54b44..31cadb76ff2 100644 --- a/src/mongo/bson/bson_db.h +++ b/src/mongo/bson/bson_db.h @@ -27,7 +27,7 @@ #pragma once #include "mongo/bson/optime.h" -#include "../util/time_support.h" +#include "mongo/util/time_support.h" namespace mongo { diff --git a/src/mongo/client/clientAndShell.cpp b/src/mongo/client/clientAndShell.cpp index 92f12e40055..a7dd940aa8e 100644 --- a/src/mongo/client/clientAndShell.cpp +++ b/src/mongo/client/clientAndShell.cpp @@ -15,13 +15,14 @@ * limitations under the License. */ -#include "pch.h" +#include "mongo/pch.h" + +#include "mongo/client/clientOnly-private.h" +#include "mongo/db/client_basic.h" +#include "mongo/db/cmdline.h" +#include "mongo/s/shard.h" #include "mongo/util/assert_util.h" -#include "../db/cmdline.h" -#include "../db/client_basic.h" -#include "../s/shard.h" -#include "../util/timer.h" -#include "clientOnly-private.h" +#include "mongo/util/timer.h" namespace mongo { diff --git a/src/mongo/client/connpool.cpp b/src/mongo/client/connpool.cpp index 36cd5919e85..d868b4cc6c9 100644 --- a/src/mongo/client/connpool.cpp +++ b/src/mongo/client/connpool.cpp @@ -18,11 +18,12 @@ // _ todo: reconnect? -#include "pch.h" -#include "connpool.h" -#include "syncclusterconnection.h" -#include "../s/shard.h" +#include "mongo/pch.h" + +#include "mongo/client/connpool.h" #include "mongo/client/dbclient_rs.h" +#include "mongo/client/syncclusterconnection.h" +#include "mongo/s/shard.h" namespace mongo { diff --git a/src/mongo/client/dbclient.cpp b/src/mongo/client/dbclient.cpp index ff42ea2c180..5e9d508e75b 100644 --- a/src/mongo/client/dbclient.cpp +++ b/src/mongo/client/dbclient.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "pch.h" +#include "mongo/pch.h" #include "mongo/bson/util/bson_extract.h" #include "mongo/bson/util/builder.h" diff --git a/src/mongo/client/dbclient_rs.cpp b/src/mongo/client/dbclient_rs.cpp index 89c52270d5b..94e42160e7e 100644 --- a/src/mongo/client/dbclient_rs.cpp +++ b/src/mongo/client/dbclient_rs.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "pch.h" +#include "mongo/pch.h" #include "mongo/client/dbclient_rs.h" diff --git a/src/mongo/client/dbclientcursor.cpp b/src/mongo/client/dbclientcursor.cpp index 53f22425fec..1c9ba855ff1 100644 --- a/src/mongo/client/dbclientcursor.cpp +++ b/src/mongo/client/dbclientcursor.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "pch.h" +#include "mongo/pch.h" #include "mongo/client/dbclientcursor.h" diff --git a/src/mongo/client/dbclientmockcursor.h b/src/mongo/client/dbclientmockcursor.h index 8d85ff5ad2e..41e0475a72e 100644 --- a/src/mongo/client/dbclientmockcursor.h +++ b/src/mongo/client/dbclientmockcursor.h @@ -17,7 +17,7 @@ #pragma once -#include "dbclientcursor.h" +#include "mongo/client/dbclientcursor.h" namespace mongo { diff --git a/src/mongo/client/distlock.cpp b/src/mongo/client/distlock.cpp index 9a4d39f9770..f4efa174bbb 100644 --- a/src/mongo/client/distlock.cpp +++ b/src/mongo/client/distlock.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "pch.h" +#include "mongo/pch.h" #include "mongo/client/distlock.h" diff --git a/src/mongo/client/distlock.h b/src/mongo/client/distlock.h index 183826afcce..798ffbda44c 100644 --- a/src/mongo/client/distlock.h +++ b/src/mongo/client/distlock.h @@ -18,8 +18,8 @@ #pragma once #include "mongo/pch.h" -#include "connpool.h" -#include "syncclusterconnection.h" +#include "mongo/client/connpool.h" +#include "mongo/client/syncclusterconnection.h" #define LOCK_TIMEOUT (15 * 60 * 1000) #define LOCK_SKEW_FACTOR (30) diff --git a/src/mongo/client/distlock_test.cpp b/src/mongo/client/distlock_test.cpp index aa5ba21069a..f579f603c34 100644 --- a/src/mongo/client/distlock_test.cpp +++ b/src/mongo/client/distlock_test.cpp @@ -15,13 +15,13 @@ * limitations under the License. */ -#include "pch.h" +#include "mongo/pch.h" -#include "distlock.h" +#include "mongo/client/distlock.h" -#include <vector> -#include <iostream> #include <boost/thread/thread.hpp> +#include <iostream> +#include <vector> #include "mongo/base/init.h" #include "mongo/db/auth/action_set.h" diff --git a/src/mongo/client/examples/httpClientTest.cpp b/src/mongo/client/examples/httpClientTest.cpp index c36d8b4752c..4d1774a1c36 100644 --- a/src/mongo/client/examples/httpClientTest.cpp +++ b/src/mongo/client/examples/httpClientTest.cpp @@ -19,7 +19,7 @@ #include "mongo/base/init.h" #include "mongo/client/dbclient.h" -#include "util/net/httpclient.h" +#include "mongo/util/net/httpclient.h" #ifndef verify # define verify(x) MONGO_verify(x) diff --git a/src/mongo/client/examples/mongoperf.cpp b/src/mongo/client/examples/mongoperf.cpp index 4ea9eb74684..e535f187d59 100644 --- a/src/mongo/client/examples/mongoperf.cpp +++ b/src/mongo/client/examples/mongoperf.cpp @@ -25,7 +25,7 @@ // so we define the following macro #define MONGO_EXPOSE_MACROS 1 -#include "pch.h" +#include "mongo/pch.h" #include <iostream> diff --git a/src/mongo/client/examples/tail.cpp b/src/mongo/client/examples/tail.cpp index 90e62d279c1..d6d7a4f40ce 100644 --- a/src/mongo/client/examples/tail.cpp +++ b/src/mongo/client/examples/tail.cpp @@ -17,8 +17,8 @@ /* example of using a tailable cursor */ -#include "../../client/dbclient.h" -#include "../../util/goodies.h" +#include "mongo/client/dbclient.h" +#include "mongo/util/goodies.h" using namespace mongo; diff --git a/src/mongo/client/gridfs.cpp b/src/mongo/client/gridfs.cpp index e2d1038d6ee..1c3d0dd3142 100644 --- a/src/mongo/client/gridfs.cpp +++ b/src/mongo/client/gridfs.cpp @@ -15,25 +15,26 @@ * limitations under the License. */ -#include "pch.h" +#include "mongo/pch.h" +#include "mongo/client/gridfs.h" + +#include <boost/filesystem/operations.hpp> #include <boost/smart_ptr.hpp> #include <fcntl.h> #include <fstream> #include <utility> -#include "mongo/client/gridfs.h" -#include "mongo/client/dbclientcursor.h" - #if defined(_WIN32) #include <io.h> #endif +#include "mongo/client/dbclientcursor.h" + #ifndef MIN #define MIN(a,b) ( (a) < (b) ? (a) : (b) ) #endif -#include <boost/filesystem/operations.hpp> namespace mongo { diff --git a/src/mongo/client/model.cpp b/src/mongo/client/model.cpp index ac9bd119e76..deb3243b4dd 100644 --- a/src/mongo/client/model.cpp +++ b/src/mongo/client/model.cpp @@ -15,9 +15,11 @@ * limitations under the License. */ -#include "pch.h" -#include "model.h" -#include "connpool.h" +#include "mongo/pch.h" + +#include "mongo/client/model.h" + +#include "mongo/client/connpool.h" namespace mongo { diff --git a/src/mongo/client/parallel.cpp b/src/mongo/client/parallel.cpp index a55eb9785a2..65ba208119d 100644 --- a/src/mongo/client/parallel.cpp +++ b/src/mongo/client/parallel.cpp @@ -16,11 +16,12 @@ */ -#include "pch.h" +#include "mongo/pch.h" + +#include "mongo/client/parallel.h" #include "mongo/client/connpool.h" #include "mongo/client/dbclientcursor.h" -#include "mongo/client/parallel.h" #include "mongo/db/dbmessage.h" #include "mongo/s/chunk.h" #include "mongo/s/chunk_version.h" diff --git a/src/mongo/client/syncclusterconnection.cpp b/src/mongo/client/syncclusterconnection.cpp index 28977d673d0..2da9db0d28e 100644 --- a/src/mongo/client/syncclusterconnection.cpp +++ b/src/mongo/client/syncclusterconnection.cpp @@ -16,7 +16,7 @@ */ -#include "pch.h" +#include "mongo/pch.h" #include "mongo/client/syncclusterconnection.h" 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" diff --git a/src/mongo/dbtests/accumulatortests.cpp b/src/mongo/dbtests/accumulatortests.cpp index 53cde84af92..4b5a00a1e41 100644 --- a/src/mongo/dbtests/accumulatortests.cpp +++ b/src/mongo/dbtests/accumulatortests.cpp @@ -16,15 +16,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" - -#include "mongo/db/pipeline/accumulator.h" +#include "mongo/pch.h" #include "mongo/db/interrupt_status_mongod.h" +#include "mongo/db/pipeline/accumulator.h" #include "mongo/db/pipeline/document.h" #include "mongo/db/pipeline/expression_context.h" - -#include "dbtests.h" +#include "mongo/dbtests/dbtests.h" namespace AccumulatorTests { diff --git a/src/mongo/dbtests/background_job_test.cpp b/src/mongo/dbtests/background_job_test.cpp index a009252288f..d08729f5135 100644 --- a/src/mongo/dbtests/background_job_test.cpp +++ b/src/mongo/dbtests/background_job_test.cpp @@ -16,12 +16,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "../pch.h" +#include "mongo/pch.h" + #include <boost/thread/thread.hpp> -#include "dbtests.h" -#include "../util/time_support.h" -#include "../util/background.h" +#include "mongo/dbtests/dbtests.h" +#include "mongo/util/background.h" +#include "mongo/util/time_support.h" namespace BackgroundJobTests { diff --git a/src/mongo/dbtests/basictests.cpp b/src/mongo/dbtests/basictests.cpp index ccc81202170..122d6ad3c27 100644 --- a/src/mongo/dbtests/basictests.cpp +++ b/src/mongo/dbtests/basictests.cpp @@ -17,18 +17,18 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" - -#include "dbtests.h" -#include "../util/base64.h" -#include "../util/array.h" -#include "../util/text.h" -#include "../util/queue.h" -#include "../util/paths.h" -#include "../util/stringutils.h" -#include "../util/compress.h" -#include "../util/time_support.h" -#include "../db/db.h" +#include "mongo/pch.h" + +#include "mongo/db/db.h" +#include "mongo/dbtests/dbtests.h" +#include "mongo/util/array.h" +#include "mongo/util/base64.h" +#include "mongo/util/compress.h" +#include "mongo/util/paths.h" +#include "mongo/util/queue.h" +#include "mongo/util/stringutils.h" +#include "mongo/util/text.h" +#include "mongo/util/time_support.h" namespace BasicTests { diff --git a/src/mongo/dbtests/btreetests.cpp b/src/mongo/dbtests/btreetests.cpp index ce73de027f7..8560a759d4a 100644 --- a/src/mongo/dbtests/btreetests.cpp +++ b/src/mongo/dbtests/btreetests.cpp @@ -17,14 +17,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" -#include "../db/db.h" #include "mongo/db/btree.h" #include "mongo/db/btreecursor.h" +#include "mongo/db/db.h" #include "mongo/db/json.h" - -#include "dbtests.h" +#include "mongo/dbtests/dbtests.h" #define BtreeBucket BtreeBucket<V0> #define btree btree<V0> @@ -32,7 +31,7 @@ #define testName "btree" #define BTVERSION 0 namespace BtreeTests0 { -#include "btreetests.inl" +#include "mongo/dbtests/btreetests.inl" } #undef BtreeBucket @@ -46,5 +45,5 @@ namespace BtreeTests0 { #undef BTVERSION #define BTVERSION 1 namespace BtreeTests1 { -#include "btreetests.inl" +#include "mongo/dbtests/btreetests.inl" } diff --git a/src/mongo/dbtests/chunktests.cpp b/src/mongo/dbtests/chunktests.cpp index 080a80fe237..da5297bc666 100644 --- a/src/mongo/dbtests/chunktests.cpp +++ b/src/mongo/dbtests/chunktests.cpp @@ -16,12 +16,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" -#include "../s/chunk.h" #include "mongo/db/json.h" - -#include "dbtests.h" +#include "mongo/dbtests/dbtests.h" +#include "mongo/s/chunk.h" namespace mongo { diff --git a/src/mongo/dbtests/clienttests.cpp b/src/mongo/dbtests/clienttests.cpp index 609b9d07f1f..6e30d934e7a 100644 --- a/src/mongo/dbtests/clienttests.cpp +++ b/src/mongo/dbtests/clienttests.cpp @@ -16,12 +16,12 @@ // client.cpp -#include "pch.h" +#include "mongo/pch.h" -#include "dbtests.h" #include "mongo/client/dbclientcursor.h" #include "mongo/db/d_concurrency.h" #include "mongo/db/pdfile.h" +#include "mongo/dbtests/dbtests.h" namespace ClientTests { diff --git a/src/mongo/dbtests/commandtests.cpp b/src/mongo/dbtests/commandtests.cpp index 691eac1e613..36998741303 100644 --- a/src/mongo/dbtests/commandtests.cpp +++ b/src/mongo/dbtests/commandtests.cpp @@ -14,9 +14,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "dbtests.h" -#include "../db/d_concurrency.h" +#include "mongo/pch.h" + +#include "mongo/db/d_concurrency.h" +#include "mongo/dbtests/dbtests.h" using namespace mongo; diff --git a/src/mongo/dbtests/dbtests.cpp b/src/mongo/dbtests/dbtests.cpp index 0db95938651..61fbdf76ce0 100644 --- a/src/mongo/dbtests/dbtests.cpp +++ b/src/mongo/dbtests/dbtests.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" #include "mongo/base/initializer.h" #include "mongo/db/commands.h" diff --git a/src/mongo/dbtests/directclienttests.cpp b/src/mongo/dbtests/directclienttests.cpp index 0bf1feb6067..5f710eef27c 100644 --- a/src/mongo/dbtests/directclienttests.cpp +++ b/src/mongo/dbtests/directclienttests.cpp @@ -17,13 +17,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "../db/db.h" -#include "../db/instance.h" -#include "../db/json.h" -#include "../db/lasterror.h" -#include "../util/timer.h" -#include "dbtests.h" +#include "mongo/pch.h" + +#include "mongo/db/db.h" +#include "mongo/db/instance.h" +#include "mongo/db/json.h" +#include "mongo/db/lasterror.h" +#include "mongo/dbtests/dbtests.h" +#include "mongo/util/timer.h" namespace DirectClientTests { diff --git a/src/mongo/dbtests/documentsourcetests.cpp b/src/mongo/dbtests/documentsourcetests.cpp index 77ee570a672..966a7405cfe 100644 --- a/src/mongo/dbtests/documentsourcetests.cpp +++ b/src/mongo/dbtests/documentsourcetests.cpp @@ -16,15 +16,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "mongo/db/pipeline/document_source.h" +#include "mongo/pch.h" #include <boost/thread/thread.hpp> #include "mongo/db/interrupt_status_mongod.h" +#include "mongo/db/pipeline/document_source.h" #include "mongo/db/pipeline/expression_context.h" - -#include "dbtests.h" +#include "mongo/dbtests/dbtests.h" namespace DocumentSourceTests { diff --git a/src/mongo/dbtests/documenttests.cpp b/src/mongo/dbtests/documenttests.cpp index d488b44bd26..80657208543 100644 --- a/src/mongo/dbtests/documenttests.cpp +++ b/src/mongo/dbtests/documenttests.cpp @@ -16,13 +16,12 @@ * 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" #include "mongo/db/pipeline/field_path.h" #include "mongo/db/pipeline/value.h" - -#include "dbtests.h" +#include "mongo/dbtests/dbtests.h" namespace DocumentTests { diff --git a/src/mongo/dbtests/expressiontests.cpp b/src/mongo/dbtests/expressiontests.cpp index a851d7b99e1..226b9d08787 100644 --- a/src/mongo/dbtests/expressiontests.cpp +++ b/src/mongo/dbtests/expressiontests.cpp @@ -16,13 +16,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" - -#include "mongo/db/pipeline/expression.h" +#include "mongo/pch.h" #include "mongo/db/pipeline/document.h" - -#include "dbtests.h" +#include "mongo/db/pipeline/expression.h" +#include "mongo/dbtests/dbtests.h" namespace ExpressionTests { diff --git a/src/mongo/dbtests/framework.cpp b/src/mongo/dbtests/framework.cpp index ebf44dc41f8..8eb3f532d0d 100644 --- a/src/mongo/dbtests/framework.cpp +++ b/src/mongo/dbtests/framework.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/dbtests/framework.h" diff --git a/src/mongo/dbtests/histogram_test.cpp b/src/mongo/dbtests/histogram_test.cpp index e9cbb5bdf25..168cefa639f 100644 --- a/src/mongo/dbtests/histogram_test.cpp +++ b/src/mongo/dbtests/histogram_test.cpp @@ -16,10 +16,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "../pch.h" +#include "mongo/pch.h" -#include "dbtests.h" -#include "../util/histogram.h" +#include "mongo/dbtests/dbtests.h" +#include "mongo/util/histogram.h" namespace mongo { diff --git a/src/mongo/dbtests/jsobjtests.cpp b/src/mongo/dbtests/jsobjtests.cpp index d655c771c9d..db6ff626cf4 100644 --- a/src/mongo/dbtests/jsobjtests.cpp +++ b/src/mongo/dbtests/jsobjtests.cpp @@ -17,16 +17,17 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "../bson/util/builder.h" -#include "../db/jsobj.h" -#include "../db/jsobjmanipulator.h" -#include "../db/json.h" -#include "dbtests.h" -#include "../util/stringutils.h" -#include "../util/mongoutils/checksum.h" -#include "../db/key.h" +#include "mongo/pch.h" + +#include "mongo/bson/util/builder.h" +#include "mongo/db/jsobj.h" +#include "mongo/db/jsobjmanipulator.h" +#include "mongo/db/json.h" +#include "mongo/db/key.h" +#include "mongo/dbtests/dbtests.h" #include "mongo/platform/float_utils.h" +#include "mongo/util/mongoutils/checksum.h" +#include "mongo/util/stringutils.h" namespace JsobjTests { diff --git a/src/mongo/dbtests/jsontests.cpp b/src/mongo/dbtests/jsontests.cpp index 857f7663438..cdebd4f760c 100644 --- a/src/mongo/dbtests/jsontests.cpp +++ b/src/mongo/dbtests/jsontests.cpp @@ -17,14 +17,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "../db/jsobj.h" -#include "../db/json.h" - -#include "dbtests.h" +#include "mongo/pch.h" #include <limits> +#include "mongo/db/jsobj.h" +#include "mongo/db/json.h" +#include "mongo/dbtests/dbtests.h" + + namespace JsonTests { namespace JsonStringTests { diff --git a/src/mongo/dbtests/jstests.cpp b/src/mongo/dbtests/jstests.cpp index fb201d3aba7..0f191c49cfd 100644 --- a/src/mongo/dbtests/jstests.cpp +++ b/src/mongo/dbtests/jstests.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" #include "mongo/base/parse_number.h" #include "mongo/db/instance.h" diff --git a/src/mongo/dbtests/matchertests.cpp b/src/mongo/dbtests/matchertests.cpp index f7512871205..8980b3ee8a4 100644 --- a/src/mongo/dbtests/matchertests.cpp +++ b/src/mongo/dbtests/matchertests.cpp @@ -17,15 +17,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" - -#include "mongo/db/matcher.h" +#include "mongo/pch.h" #include "mongo/db/cursor.h" #include "mongo/db/json.h" +#include "mongo/db/matcher.h" +#include "mongo/db/matcher/matcher.h" #include "mongo/db/namespace_details.h" #include "mongo/db/query_optimizer.h" -#include "mongo/db/matcher/matcher.h" #include "mongo/dbtests/dbtests.h" #include "mongo/util/timer.h" diff --git a/src/mongo/dbtests/mmaptests.cpp b/src/mongo/dbtests/mmaptests.cpp index b96ac410ca6..20e363c9db0 100644 --- a/src/mongo/dbtests/mmaptests.cpp +++ b/src/mongo/dbtests/mmaptests.cpp @@ -17,12 +17,13 @@ */ #include "mongo/pch.h" + +#include <boost/filesystem/operations.hpp> + #include "mongo/db/storage/durable_mapped_file.h" #include "mongo/util/timer.h" #include "mongo/dbtests/dbtests.h" -#include <boost/filesystem/operations.hpp> - namespace MMapTests { class LeakTest { diff --git a/src/mongo/dbtests/namespacetests.cpp b/src/mongo/dbtests/namespacetests.cpp index 3ac695df269..57e1fb4a7ee 100644 --- a/src/mongo/dbtests/namespacetests.cpp +++ b/src/mongo/dbtests/namespacetests.cpp @@ -26,10 +26,10 @@ #include "mongo/db/index_legacy.h" #include "mongo/db/index_selection.h" #include "mongo/db/json.h" -#include "mongo/db/storage/namespace.h" #include "mongo/db/queryutil.h" +#include "mongo/db/storage/namespace.h" +#include "mongo/dbtests/dbtests.h" -#include "dbtests.h" namespace NamespaceTests { diff --git a/src/mongo/dbtests/pdfiletests.cpp b/src/mongo/dbtests/pdfiletests.cpp index e9fe6e744be..1c4142a03de 100644 --- a/src/mongo/dbtests/pdfiletests.cpp +++ b/src/mongo/dbtests/pdfiletests.cpp @@ -17,13 +17,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "../db/pdfile.h" +#include "mongo/pch.h" -#include "../db/db.h" -#include "../db/json.h" - -#include "dbtests.h" +#include "mongo/db/db.h" +#include "mongo/db/json.h" +#include "mongo/db/pdfile.h" +#include "mongo/dbtests/dbtests.h" namespace PdfileTests { diff --git a/src/mongo/dbtests/perf/perftest.cpp b/src/mongo/dbtests/perf/perftest.cpp index 290b371150d..0f5e23d8ffe 100644 --- a/src/mongo/dbtests/perf/perftest.cpp +++ b/src/mongo/dbtests/perf/perftest.cpp @@ -17,7 +17,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" + #include <boost/date_time/posix_time/posix_time.hpp> #include "mongo/base/initializer.h" diff --git a/src/mongo/dbtests/perftests.cpp b/src/mongo/dbtests/perftests.cpp index 2ee37be23f3..a7494dda5d5 100644 --- a/src/mongo/dbtests/perftests.cpp +++ b/src/mongo/dbtests/perftests.cpp @@ -22,26 +22,26 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" +#include <boost/filesystem/operations.hpp> #include <boost/thread/thread.hpp> - #include <fstream> -#include "../db/db.h" -#include "../db/instance.h" -#include "../db/json.h" -#include "../db/lasterror.h" -#include "../db/taskqueue.h" -#include "../util/timer.h" -#include "dbtests.h" -#include "../db/dur_stats.h" -#include "../util/checksum.h" -#include "../util/version.h" -#include "../db/key.h" -#include "../util/compress.h" -#include "../util/concurrency/qlock.h" -#include "../util/fail_point.h" -#include <boost/filesystem/operations.hpp> + +#include "mongo/db/db.h" +#include "mongo/db/dur_stats.h" +#include "mongo/db/instance.h" +#include "mongo/db/json.h" +#include "mongo/db/key.h" +#include "mongo/db/lasterror.h" +#include "mongo/db/taskqueue.h" +#include "mongo/dbtests/dbtests.h" +#include "mongo/util/checksum.h" +#include "mongo/util/compress.h" +#include "mongo/util/concurrency/qlock.h" +#include "mongo/util/fail_point.h" +#include "mongo/util/timer.h" +#include "mongo/util/version.h" #if (__cplusplus >= 201103L) #include <mutex> diff --git a/src/mongo/dbtests/pipelinetests.cpp b/src/mongo/dbtests/pipelinetests.cpp index e77f19b54f1..7af84021e2a 100644 --- a/src/mongo/dbtests/pipelinetests.cpp +++ b/src/mongo/dbtests/pipelinetests.cpp @@ -16,10 +16,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "mongo/db/pipeline/field_path.h" +#include "mongo/pch.h" -#include "dbtests.h" +#include "mongo/db/pipeline/field_path.h" +#include "mongo/dbtests/dbtests.h" namespace PipelineTests { diff --git a/src/mongo/dbtests/queryoptimizercursortests.cpp b/src/mongo/dbtests/queryoptimizercursortests.cpp index d7c818b2d01..32bc7f7787b 100644 --- a/src/mongo/dbtests/queryoptimizercursortests.cpp +++ b/src/mongo/dbtests/queryoptimizercursortests.cpp @@ -17,18 +17,18 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" -#include "../db/queryoptimizercursorimpl.h" #include "mongo/client/dbclientcursor.h" #include "mongo/db/clientcursor.h" #include "mongo/db/instance.h" #include "mongo/db/json.h" +#include "mongo/db/pdfile.h" #include "mongo/db/query_optimizer.h" #include "mongo/db/query_optimizer_internal.h" +#include "mongo/db/queryoptimizercursorimpl.h" #include "mongo/db/queryutil.h" -#include "mongo/db/pdfile.h" #include "mongo/dbtests/dbtests.h" namespace mongo { diff --git a/src/mongo/dbtests/queryoptimizertests.cpp b/src/mongo/dbtests/queryoptimizertests.cpp index 31d713a9be7..31266e3a4f6 100644 --- a/src/mongo/dbtests/queryoptimizertests.cpp +++ b/src/mongo/dbtests/queryoptimizertests.cpp @@ -16,14 +16,13 @@ #include "mongo/pch.h" -#include "mongo/db/query_optimizer_internal.h" - #include "mongo/db/instance.h" #include "mongo/db/json.h" #include "mongo/db/ops/count.h" #include "mongo/db/ops/delete.h" #include "mongo/db/ops/query.h" #include "mongo/db/parsed_query.h" +#include "mongo/db/query_optimizer_internal.h" #include "mongo/db/queryutil.h" #include "mongo/dbtests/dbtests.h" diff --git a/src/mongo/dbtests/querytests.cpp b/src/mongo/dbtests/querytests.cpp index 964886f0f54..2e7e7e59216 100644 --- a/src/mongo/dbtests/querytests.cpp +++ b/src/mongo/dbtests/querytests.cpp @@ -16,9 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" - -#include "mongo/db/ops/query.h" +#include "mongo/pch.h" #include "mongo/client/dbclientcursor.h" #include "mongo/db/clientcursor.h" @@ -27,13 +25,13 @@ #include "mongo/db/json.h" #include "mongo/db/kill_current_op.h" #include "mongo/db/lasterror.h" +#include "mongo/db/ops/query.h" #include "mongo/db/parsed_query.h" #include "mongo/db/repl/finding_start_cursor.h" #include "mongo/db/scanandorder.h" +#include "mongo/dbtests/dbtests.h" #include "mongo/util/timer.h" -#include "dbtests.h" - namespace mongo { void assembleRequest( const string &ns, BSONObj query, int nToReturn, int nToSkip, const BSONObj *fieldsToReturn, int queryOptions, Message &toSend ); diff --git a/src/mongo/dbtests/queryutiltests.cpp b/src/mongo/dbtests/queryutiltests.cpp index 949f49e099c..f9085535bb8 100644 --- a/src/mongo/dbtests/queryutiltests.cpp +++ b/src/mongo/dbtests/queryutiltests.cpp @@ -17,15 +17,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" - -#include "mongo/db/queryutil.h" +#include "mongo/pch.h" #include "mongo/db/instance.h" #include "mongo/db/json.h" #include "mongo/db/pdfile.h" #include "mongo/db/query_optimizer_internal.h" #include "mongo/db/querypattern.h" +#include "mongo/db/queryutil.h" #include "mongo/dbtests/dbtests.h" namespace QueryUtilTests { diff --git a/src/mongo/dbtests/sharding.cpp b/src/mongo/dbtests/sharding.cpp index d8ab0b55c36..aa1ad4fb0b4 100644 --- a/src/mongo/dbtests/sharding.cpp +++ b/src/mongo/dbtests/sharding.cpp @@ -16,12 +16,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" - -#include "mongo/dbtests/dbtests.h" +#include "mongo/pch.h" #include "mongo/client/dbclientmockcursor.h" #include "mongo/client/parallel.h" +#include "mongo/dbtests/dbtests.h" #include "mongo/s/chunk_diff.h" #include "mongo/s/chunk_version.h" #include "mongo/s/type_chunk.h" diff --git a/src/mongo/dbtests/socktests.cpp b/src/mongo/dbtests/socktests.cpp index 176db8c8e95..3c615bcd502 100644 --- a/src/mongo/dbtests/socktests.cpp +++ b/src/mongo/dbtests/socktests.cpp @@ -17,9 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "../util/net/sock.h" -#include "dbtests.h" +#include "mongo/pch.h" + +#include "mongo/dbtests/dbtests.h" +#include "mongo/util/net/sock.h" namespace SockTests { diff --git a/src/mongo/dbtests/spin_lock_test.cpp b/src/mongo/dbtests/spin_lock_test.cpp index 408c51eb408..fd74bd25ecb 100644 --- a/src/mongo/dbtests/spin_lock_test.cpp +++ b/src/mongo/dbtests/spin_lock_test.cpp @@ -16,11 +16,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" + #include <boost/thread/thread.hpp> -#include "dbtests.h" -#include "../util/concurrency/spin_lock.h" -#include "../util/timer.h" + +#include "mongo/dbtests/dbtests.h" +#include "mongo/util/concurrency/spin_lock.h" +#include "mongo/util/timer.h" namespace { diff --git a/src/mongo/dbtests/stacktests.cpp b/src/mongo/dbtests/stacktests.cpp index 540fec0b7d2..5e325d436e6 100644 --- a/src/mongo/dbtests/stacktests.cpp +++ b/src/mongo/dbtests/stacktests.cpp @@ -15,10 +15,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" - -#include "dbtests.h" +#include "mongo/pch.h" +#include "mongo/dbtests/dbtests.h" #include "mongo/util/stack_introspect.h" class MyClass { diff --git a/src/mongo/dbtests/threadedtests.cpp b/src/mongo/dbtests/threadedtests.cpp index dbb000b4def..b8f633707a2 100644 --- a/src/mongo/dbtests/threadedtests.cpp +++ b/src/mongo/dbtests/threadedtests.cpp @@ -17,21 +17,23 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "../server.h" -#include "../bson/util/atomic_int.h" -#include "../util/concurrency/mvar.h" -#include "../util/concurrency/thread_pool.h" -#include "../util/concurrency/list.h" -#include "../util/timer.h" -#include <boost/thread.hpp> +#include "mongo/pch.h" + #include <boost/bind.hpp> -#include "../db/d_concurrency.h" -#include "../util/concurrency/synchronization.h" -#include "../util/concurrency/qlock.h" -#include "dbtests.h" -#include "mongo/util/concurrency/ticketholder.h" +#include <boost/thread.hpp> + +#include "mongo/bson/util/atomic_int.h" +#include "mongo/db/d_concurrency.h" +#include "mongo/dbtests/dbtests.h" #include "mongo/platform/atomic_word.h" +#include "mongo/util/concurrency/mvar.h" +#include "mongo/util/concurrency/thread_pool.h" +#include "mongo/util/concurrency/list.h" +#include "mongo/util/timer.h" +#include "mongo/util/concurrency/synchronization.h" +#include "mongo/util/concurrency/qlock.h" +#include "mongo/util/concurrency/ticketholder.h" +#include "mongo/server.h" namespace mongo { void testNonGreedy(); diff --git a/src/mongo/dbtests/updatetests.cpp b/src/mongo/dbtests/updatetests.cpp index 45e1346b8f0..1fac08d2677 100644 --- a/src/mongo/dbtests/updatetests.cpp +++ b/src/mongo/dbtests/updatetests.cpp @@ -17,17 +17,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "mongo/client/dbclientcursor.h" +#include "mongo/pch.h" +#include "mongo/client/dbclientcursor.h" #include "mongo/db/db.h" #include "mongo/db/instance.h" #include "mongo/db/json.h" #include "mongo/db/lasterror.h" #include "mongo/db/ops/update.h" #include "mongo/db/ops/update_internal.h" - -#include "dbtests.h" +#include "mongo/dbtests/dbtests.h" namespace UpdateTests { diff --git a/src/mongo/pch.cpp b/src/mongo/pch.cpp index a81ff610d82..37fde21f1fa 100644 --- a/src/mongo/pch.cpp +++ b/src/mongo/pch.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "pch.h" +#include "mongo/pch.h" #if defined( __MSVC__ ) // should probably check VS version here diff --git a/src/mongo/s/balance.cpp b/src/mongo/s/balance.cpp index 03d4b17dcb0..c91df39543b 100644 --- a/src/mongo/s/balance.cpp +++ b/src/mongo/s/balance.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/s/balance.h" diff --git a/src/mongo/s/balancer_policy.cpp b/src/mongo/s/balancer_policy.cpp index e5edf340c1c..329b93396f6 100644 --- a/src/mongo/s/balancer_policy.cpp +++ b/src/mongo/s/balancer_policy.cpp @@ -15,14 +15,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" + +#include <algorithm> #include "mongo/s/balancer_policy.h" #include "mongo/s/config.h" #include "mongo/util/stringutils.h" #include "mongo/util/text.h" -#include <algorithm> namespace mongo { diff --git a/src/mongo/s/chunk.cpp b/src/mongo/s/chunk.cpp index 513ab618bea..05d59ea3511 100644 --- a/src/mongo/s/chunk.cpp +++ b/src/mongo/s/chunk.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/s/chunk.h" diff --git a/src/mongo/s/client_info.cpp b/src/mongo/s/client_info.cpp index 4d2f4a55c25..976c1d17298 100644 --- a/src/mongo/s/client_info.cpp +++ b/src/mongo/s/client_info.cpp @@ -16,29 +16,27 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" +#include "mongo/client/connpool.h" #include "mongo/db/auth/authorization_manager_global.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/authz_session_external_state_s.h" -#include "server.h" -#include "../util/scopeguard.h" -#include "../db/commands.h" -#include "../db/commands/server_status.h" -#include "../db/dbmessage.h" -#include "../db/stats/counters.h" -#include "../db/stats/timer_stats.h" - -#include "../client/connpool.h" - -#include "client_info.h" -#include "request.h" -#include "config.h" -#include "chunk.h" -#include "cursors.h" -#include "grid.h" -#include "s/writeback_listener.h" +#include "mongo/db/commands.h" +#include "mongo/db/commands/server_status.h" +#include "mongo/db/dbmessage.h" +#include "mongo/db/stats/counters.h" +#include "mongo/db/stats/timer_stats.h" +#include "mongo/s/client_info.h" +#include "mongo/s/config.h" +#include "mongo/s/chunk.h" +#include "mongo/s/cursors.h" +#include "mongo/s/grid.h" +#include "mongo/s/request.h" +#include "mongo/s/writeback_listener.h" +#include "mongo/server.h" #include "mongo/util/mongoutils/str.h" +#include "mongo/util/scopeguard.h" namespace mongo { diff --git a/src/mongo/s/commands_admin.cpp b/src/mongo/s/commands_admin.cpp index 1d91b12cd40..018d68bb534 100644 --- a/src/mongo/s/commands_admin.cpp +++ b/src/mongo/s/commands_admin.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/commands.h" diff --git a/src/mongo/s/commands_public.cpp b/src/mongo/s/commands_public.cpp index 508f36c65ad..0d8d29ee47a 100644 --- a/src/mongo/s/commands_public.cpp +++ b/src/mongo/s/commands_public.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/base/init.h" #include "mongo/client/connpool.h" diff --git a/src/mongo/s/config.cpp b/src/mongo/s/config.cpp index c811374233a..2e9af6fbbee 100644 --- a/src/mongo/s/config.cpp +++ b/src/mongo/s/config.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 "pcrecpp.h" diff --git a/src/mongo/s/d_migrate.cpp b/src/mongo/s/d_migrate.cpp index fe99668be1f..6fe72bd1c4b 100644 --- a/src/mongo/s/d_migrate.cpp +++ b/src/mongo/s/d_migrate.cpp @@ -22,7 +22,7 @@ mostly around shard management and checking */ -#include "pch.h" +#include "mongo/pch.h" #include <algorithm> #include <boost/thread/thread.hpp> diff --git a/src/mongo/s/d_split.cpp b/src/mongo/s/d_split.cpp index d28f3f5d90b..9fc62cecdf5 100644 --- a/src/mongo/s/d_split.cpp +++ b/src/mongo/s/d_split.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 <map> #include <string> diff --git a/src/mongo/s/d_writeback.cpp b/src/mongo/s/d_writeback.cpp index 1b08c25a81e..891aebded1f 100644 --- a/src/mongo/s/d_writeback.cpp +++ b/src/mongo/s/d_writeback.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/s/d_writeback.h" diff --git a/src/mongo/s/default_version.cpp b/src/mongo/s/default_version.cpp index 88a465acd53..4c2d2fa829b 100644 --- a/src/mongo/s/default_version.cpp +++ b/src/mongo/s/default_version.cpp @@ -16,9 +16,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" -#include "s/version_manager.h" +#include "mongo/s/version_manager.h" namespace mongo { diff --git a/src/mongo/s/grid.cpp b/src/mongo/s/grid.cpp index 15dd930ad0a..0edf918ce7f 100644 --- a/src/mongo/s/grid.cpp +++ b/src/mongo/s/grid.cpp @@ -16,7 +16,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" + +#include "mongo/s/grid.h" #include "pcrecpp.h" #include <iomanip> diff --git a/src/mongo/s/grid.h b/src/mongo/s/grid.h index cfdb9f3647b..db760f3cb93 100644 --- a/src/mongo/s/grid.h +++ b/src/mongo/s/grid.h @@ -20,8 +20,8 @@ #include <boost/date_time/posix_time/posix_time.hpp> -#include "../util/time_support.h" -#include "../util/concurrency/mutex.h" +#include "mongo/util/time_support.h" +#include "mongo/util/concurrency/mutex.h" #include "config.h" // DBConfigPtr diff --git a/src/mongo/s/interrupt_status_mongos.cpp b/src/mongo/s/interrupt_status_mongos.cpp index 68f54c47e3a..14c5ce29c8e 100644 --- a/src/mongo/s/interrupt_status_mongos.cpp +++ b/src/mongo/s/interrupt_status_mongos.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 "s/interrupt_status_mongos.h" +#include "mongo/s/interrupt_status_mongos.h" namespace mongo { diff --git a/src/mongo/s/interrupt_status_mongos.h b/src/mongo/s/interrupt_status_mongos.h index 08bc2e427d5..a3d9d8720a6 100644 --- a/src/mongo/s/interrupt_status_mongos.h +++ b/src/mongo/s/interrupt_status_mongos.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/s/request.cpp b/src/mongo/s/request.cpp index fe4aca2ce93..f1a1e418508 100644 --- a/src/mongo/s/request.cpp +++ b/src/mongo/s/request.cpp @@ -16,21 +16,20 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "server.h" - -#include "../db/commands.h" -#include "../db/dbmessage.h" -#include "../db/stats/counters.h" - -#include "../client/connpool.h" - -#include "request.h" -#include "config.h" -#include "chunk.h" -#include "cursors.h" -#include "grid.h" -#include "client_info.h" +#include "mongo/pch.h" + +#include "mongo/s/request.h" + +#include "mongo/client/connpool.h" +#include "mongo/db/commands.h" +#include "mongo/db/dbmessage.h" +#include "mongo/db/stats/counters.h" +#include "mongo/s/chunk.h" +#include "mongo/s/client_info.h" +#include "mongo/s/config.h" +#include "mongo/s/cursors.h" +#include "mongo/s/grid.h" +#include "mongo/s/server.h" namespace mongo { diff --git a/src/mongo/s/request.h b/src/mongo/s/request.h index 634cd999db3..795e95c94d0 100644 --- a/src/mongo/s/request.h +++ b/src/mongo/s/request.h @@ -19,9 +19,10 @@ #pragma once #include "mongo/pch.h" -#include "../util/net/message.h" -#include "../db/dbmessage.h" -#include "config.h" + +#include "mongo/db/dbmessage.h" +#include "mongo/s/config.h" +#include "mongo/util/net/message.h" namespace mongo { diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp index 217013f1194..5f22dd53f2a 100644 --- a/src/mongo/s/server.cpp +++ b/src/mongo/s/server.cpp @@ -16,7 +16,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" + +#include "mongo/s/server.h" #include <boost/thread/thread.hpp> @@ -41,7 +43,6 @@ #include "mongo/s/cursors.h" #include "mongo/s/grid.h" #include "mongo/s/request.h" -#include "mongo/s/server.h" #include "mongo/scripting/engine.h" #include "mongo/util/admin_access.h" #include "mongo/util/concurrency/task.h" diff --git a/src/mongo/s/server.h b/src/mongo/s/server.h index 18e91e266fd..a4f3c002982 100644 --- a/src/mongo/s/server.h +++ b/src/mongo/s/server.h @@ -17,8 +17,9 @@ */ #include <string> -#include "../util/net/message.h" -#include "../db/jsobj.h" + +#include "mongo/db/jsobj.h" +#include "mongo/util/net/message.h" namespace mongo { diff --git a/src/mongo/s/shard.cpp b/src/mongo/s/shard.cpp index 681cb932f6e..4400f934e6a 100644 --- a/src/mongo/s/shard.cpp +++ b/src/mongo/s/shard.cpp @@ -16,7 +16,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" + +#include "mongo/s/shard.h" #include <set> #include <string> @@ -34,7 +36,6 @@ #include "mongo/s/client_info.h" #include "mongo/s/config.h" #include "mongo/s/request.h" -#include "mongo/s/shard.h" #include "mongo/s/type_shard.h" #include "mongo/s/version_manager.h" diff --git a/src/mongo/s/shardconnection.cpp b/src/mongo/s/shardconnection.cpp index 437ff16390a..8f3ee303697 100644 --- a/src/mongo/s/shardconnection.cpp +++ b/src/mongo/s/shardconnection.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 <set> diff --git a/src/mongo/s/shardkey.cpp b/src/mongo/s/shardkey.cpp index b7f37e779e7..30365eb3695 100644 --- a/src/mongo/s/shardkey.cpp +++ b/src/mongo/s/shardkey.cpp @@ -16,12 +16,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "chunk.h" -#include "../db/jsobj.h" +#include "mongo/pch.h" + +#include "mongo/s/chunk.h" +#include "mongo/db/jsobj.h" #include "mongo/db/json.h" -#include "../util/startup_test.h" -#include "../util/timer.h" +#include "mongo/util/startup_test.h" +#include "mongo/util/timer.h" namespace mongo { diff --git a/src/mongo/s/strategy.cpp b/src/mongo/s/strategy.cpp index a52bb899b64..e95ca666b1e 100644 --- a/src/mongo/s/strategy.cpp +++ b/src/mongo/s/strategy.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/s/strategy.h" diff --git a/src/mongo/s/strategy_shard.cpp b/src/mongo/s/strategy_shard.cpp index 7df00c4b74e..36c3487fc08 100644 --- a/src/mongo/s/strategy_shard.cpp +++ b/src/mongo/s/strategy_shard.cpp @@ -16,7 +16,7 @@ // strategy_sharded.cpp -#include "pch.h" +#include "mongo/pch.h" #include "mongo/base/status.h" #include "mongo/bson/util/builder.h" diff --git a/src/mongo/s/strategy_single.cpp b/src/mongo/s/strategy_single.cpp index f068f6151e6..6d3599e3a40 100644 --- a/src/mongo/s/strategy_single.cpp +++ b/src/mongo/s/strategy_single.cpp @@ -16,7 +16,7 @@ // strategy_simple.cpp -#include "pch.h" +#include "mongo/pch.h" #include "mongo/client/connpool.h" #include "mongo/client/dbclientinterface.h" diff --git a/src/mongo/s/writeback_listener.cpp b/src/mongo/s/writeback_listener.cpp index b5a8b13257c..2c5acbb834e 100644 --- a/src/mongo/s/writeback_listener.cpp +++ b/src/mongo/s/writeback_listener.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 "writeback_listener.h" diff --git a/src/mongo/s/writeback_listener.h b/src/mongo/s/writeback_listener.h index 15f041a2cf5..eb3facddf41 100644 --- a/src/mongo/s/writeback_listener.h +++ b/src/mongo/s/writeback_listener.h @@ -20,11 +20,11 @@ #include "mongo/pch.h" +#include "mongo/client/connpool.h" +#include "mongo/db/client.h" #include "mongo/platform/unordered_map.h" #include "mongo/platform/unordered_set.h" -#include "../client/connpool.h" -#include "../util/background.h" -#include "../db/client.h" +#include "mongo/util/background.h" namespace mongo { diff --git a/src/mongo/scripting/bench.cpp b/src/mongo/scripting/bench.cpp index 74d2be2174d..bd8c5c32cdc 100644 --- a/src/mongo/scripting/bench.cpp +++ b/src/mongo/scripting/bench.cpp @@ -18,7 +18,7 @@ -#include "pch.h" +#include "mongo/pch.h" #include "mongo/scripting/bench.h" diff --git a/src/mongo/shell/shell_utils.cpp b/src/mongo/shell/shell_utils.cpp index 728afef9eaa..b04a064f381 100644 --- a/src/mongo/shell/shell_utils.cpp +++ b/src/mongo/shell/shell_utils.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "pch.h" +#include "mongo/pch.h" #include "mongo/shell/shell_utils.h" diff --git a/src/mongo/shell/shell_utils_extended.cpp b/src/mongo/shell/shell_utils_extended.cpp index 6c847cbd850..e262d380133 100644 --- a/src/mongo/shell/shell_utils_extended.cpp +++ b/src/mongo/shell/shell_utils_extended.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "pch.h" +#include "mongo/pch.h" #include <boost/filesystem/convenience.hpp> #include <fstream> diff --git a/src/mongo/tools/tool.h b/src/mongo/tools/tool.h index 3b6200ad080..e1f700341f8 100644 --- a/src/mongo/tools/tool.h +++ b/src/mongo/tools/tool.h @@ -18,16 +18,15 @@ #pragma once -#include <string> - #include <boost/program_options.hpp> +#include <string> #if defined(_WIN32) #include <io.h> #endif -#include "db/instance.h" -#include "db/matcher.h" +#include "mongo/db/instance.h" +#include "mongo/db/matcher.h" using std::string; diff --git a/src/mongo/util/alignedbuilder.cpp b/src/mongo/util/alignedbuilder.cpp index 89cdc9b7ccc..526d22fe2aa 100644 --- a/src/mongo/util/alignedbuilder.cpp +++ b/src/mongo/util/alignedbuilder.cpp @@ -16,8 +16,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "alignedbuilder.h" +#include "mongo/pch.h" + +#include "mongo/util/alignedbuilder.h" namespace mongo { diff --git a/src/mongo/util/assert_util.cpp b/src/mongo/util/assert_util.cpp index ffc6bca258e..e13c3f967f8 100644 --- a/src/mongo/util/assert_util.cpp +++ b/src/mongo/util/assert_util.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "pch.h" +#include "mongo/pch.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/util/base64.cpp b/src/mongo/util/base64.cpp index 41ddb1543e3..5f7cb22a01f 100644 --- a/src/mongo/util/base64.cpp +++ b/src/mongo/util/base64.cpp @@ -16,8 +16,9 @@ * limitations under the License. */ -#include "pch.h" -#include "base64.h" +#include "mongo/pch.h" + +#include "mongo/util/base64.h" namespace mongo { namespace base64 { diff --git a/src/mongo/util/concurrency/spin_lock.cpp b/src/mongo/util/concurrency/spin_lock.cpp index 23c5b7376fb..6e30a4cb00c 100644 --- a/src/mongo/util/concurrency/spin_lock.cpp +++ b/src/mongo/util/concurrency/spin_lock.cpp @@ -15,9 +15,12 @@ * limitations under the License. */ -#include "pch.h" // todo eliminate this include +#include "mongo/pch.h" // todo eliminate this include + +#include "mongo/util/concurrency/spin_lock.h" + #include <time.h> -#include "spin_lock.h" + namespace mongo { diff --git a/src/mongo/util/concurrency/thread_pool.cpp b/src/mongo/util/concurrency/thread_pool.cpp index 8c4bc8dfbd7..fd29d199659 100644 --- a/src/mongo/util/concurrency/thread_pool.cpp +++ b/src/mongo/util/concurrency/thread_pool.cpp @@ -16,12 +16,13 @@ * limitations under the License. */ -#include "pch.h" +#include "mongo/pch.h" + +#include "mongo/util/concurrency/thread_pool.h" #include <boost/thread/thread.hpp> -#include "thread_pool.h" -#include "mvar.h" +#include "mongo/util/concurrency/mvar.h" namespace mongo { namespace threadpool { diff --git a/src/mongo/util/debug_util.cpp b/src/mongo/util/debug_util.cpp index e217fe7e51d..816b0af4a2d 100644 --- a/src/mongo/util/debug_util.cpp +++ b/src/mongo/util/debug_util.cpp @@ -15,7 +15,8 @@ * limitations under the License. */ -#include "pch.h" +#include "mongo/pch.h" + #ifndef _WIN32 #include <signal.h> #endif diff --git a/src/mongo/util/intrusive_counter.cpp b/src/mongo/util/intrusive_counter.cpp index 594b26ba998..418664a233e 100644 --- a/src/mongo/util/intrusive_counter.cpp +++ b/src/mongo/util/intrusive_counter.cpp @@ -14,8 +14,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" +#include "mongo/pch.h" + #include "mongo/util/intrusive_counter.h" + #include "mongo/util/mongoutils/str.h" namespace mongo { diff --git a/src/mongo/util/lruishmap.h b/src/mongo/util/lruishmap.h index f60b257d2f3..5af41e98788 100644 --- a/src/mongo/util/lruishmap.h +++ b/src/mongo/util/lruishmap.h @@ -18,7 +18,7 @@ #pragma once #include "mongo/pch.h" -#include "../util/goodies.h" +#include "mongo/util/goodies.h" namespace mongo { diff --git a/src/mongo/util/md5main.cpp b/src/mongo/util/md5main.cpp index 107252aad63..e99de9b4156 100644 --- a/src/mongo/util/md5main.cpp +++ b/src/mongo/util/md5main.cpp @@ -40,12 +40,14 @@ 2002-04-13 lpd Splits off main program into a separate file, md5main.c. */ -#include "pch.h" -#include "md5.h" +#include "mongo/pch.h" + #include <math.h> #include <stdio.h> #include <string.h> +#include "md5.h" + /* * This file builds an executable that performs various functions related * to the MD5 library. Typical compilation: diff --git a/src/mongo/util/mmap_mm.cpp b/src/mongo/util/mmap_mm.cpp index a58aaaec040..4295b820c0e 100644 --- a/src/mongo/util/mmap_mm.cpp +++ b/src/mongo/util/mmap_mm.cpp @@ -15,8 +15,9 @@ * limitations under the License. */ -#include "pch.h" -#include "mmap.h" +#include "mongo/pch.h" + +#include "mongo/util/mmap.h" /* in memory (no file) version */ diff --git a/src/mongo/util/mmap_posix.cpp b/src/mongo/util/mmap_posix.cpp index 46f8c481ae3..c08e68acf01 100644 --- a/src/mongo/util/mmap_posix.cpp +++ b/src/mongo/util/mmap_posix.cpp @@ -15,17 +15,20 @@ * limitations under the License. */ -#include "pch.h" -#include "mmap.h" -#include "file_allocator.h" -#include "../db/d_concurrency.h" +#include "mongo/pch.h" + #include <errno.h> +#include <fcntl.h> #include <sys/mman.h> -#include <sys/types.h> #include <sys/stat.h> -#include <fcntl.h> -#include "../util/processinfo.h" -#include "mongoutils/str.h" +#include <sys/types.h> + +#include "mongo/db/d_concurrency.h" +#include "mongo/util/file_allocator.h" +#include "mongo/util/mmap.h" +#include "mongo/util/mongoutils/str.h" +#include "mongo/util/processinfo.h" + using namespace mongoutils; namespace mongo { diff --git a/src/mongo/util/net/message_server_asio.cpp b/src/mongo/util/net/message_server_asio.cpp index 52cf96d9578..f39cf3e3708 100644 --- a/src/mongo/util/net/message_server_asio.cpp +++ b/src/mongo/util/net/message_server_asio.cpp @@ -25,9 +25,9 @@ #include <iostream> #include <vector> -#include "message.h" -#include "message_server.h" -#include "../util/concurrency/mvar.h" +#include "mongo/util/concurrency/mvar.h" +#include "mongo/util/message.h" +#include "mongo/util/message_server.h" using namespace boost; using namespace boost::asio; diff --git a/src/mongo/util/password.cpp b/src/mongo/util/password.cpp index 18164c3aa0a..fc813a15115 100644 --- a/src/mongo/util/password.cpp +++ b/src/mongo/util/password.cpp @@ -14,8 +14,10 @@ * limitations under the License. */ -#include "pch.h" -#include "password.h" +#include "mongo/pch.h" + +#include "mongo/util/password.h" + #include <iostream> #ifndef _WIN32 diff --git a/src/mongo/util/processinfo_none.cpp b/src/mongo/util/processinfo_none.cpp index 77d223f7e03..ddeae9a3b4f 100644 --- a/src/mongo/util/processinfo_none.cpp +++ b/src/mongo/util/processinfo_none.cpp @@ -15,10 +15,12 @@ * limitations under the License. */ -#include "pch.h" -#include "processinfo.h" +#include "mongo/pch.h" #include <iostream> + +#include "mongo/util/processinfo.h" + using namespace std; namespace mongo { diff --git a/src/mongo/util/processinfo_win32.cpp b/src/mongo/util/processinfo_win32.cpp index 54a731d5114..136f4688e43 100644 --- a/src/mongo/util/processinfo_win32.cpp +++ b/src/mongo/util/processinfo_win32.cpp @@ -15,11 +15,13 @@ * limitations under the License. */ -#include "pch.h" -#include "processinfo.h" +#include "mongo/pch.h" + #include <iostream> #include <psapi.h> +#include "mongo/util/processinfo.h" + using namespace std; namespace mongo { diff --git a/src/mongo/util/progress_meter.cpp b/src/mongo/util/progress_meter.cpp index 360657f4a8e..6d2b2c7e7f5 100644 --- a/src/mongo/util/progress_meter.cpp +++ b/src/mongo/util/progress_meter.cpp @@ -15,9 +15,11 @@ * limitations under the License. */ -#include "pch.h" // needed for log.h -#include "progress_meter.h" -#include "log.h" +#include "mongo/pch.h" // needed for log.h + +#include "mongo/util/progress_meter.h" + +#include "mongo/util/log.h" using namespace std; diff --git a/src/mongo/util/stringutils.cpp b/src/mongo/util/stringutils.cpp index 53872d26712..857dac9d4c4 100644 --- a/src/mongo/util/stringutils.cpp +++ b/src/mongo/util/stringutils.cpp @@ -15,9 +15,9 @@ * limitations under the License. */ -#include "pch.h" +#include "mongo/pch.h" -#include "stringutils.h" +#include "mongo/util/stringutils.h" namespace mongo { diff --git a/src/mongo/util/systeminfo_linux2.cpp b/src/mongo/util/systeminfo_linux2.cpp index 8c8cbc7bb19..01851c180c4 100755 --- a/src/mongo/util/systeminfo_linux2.cpp +++ b/src/mongo/util/systeminfo_linux2.cpp @@ -14,11 +14,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "util/systeminfo.h" +#include "mongo/pch.h" #include <unistd.h> +#include "mongo/util/systeminfo.h" + namespace mongo { size_t SystemInfo::getPhysicalRam() { diff --git a/src/mongo/util/systeminfo_none.cpp b/src/mongo/util/systeminfo_none.cpp index 7f76d627b84..187063c29be 100755 --- a/src/mongo/util/systeminfo_none.cpp +++ b/src/mongo/util/systeminfo_none.cpp @@ -14,8 +14,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "util/systeminfo.h" +#include "mongo/pch.h" + +#include "mongo/util/systeminfo.h" namespace mongo { diff --git a/src/mongo/util/systeminfo_win32.cpp b/src/mongo/util/systeminfo_win32.cpp index 470ca32d4bf..9b781668c57 100755 --- a/src/mongo/util/systeminfo_win32.cpp +++ b/src/mongo/util/systeminfo_win32.cpp @@ -14,11 +14,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pch.h" -#include "util/systeminfo.h" +#include "mongo/pch.h" #include <windows.h> +#include "mongo/util/systeminfo.h" + namespace mongo { size_t SystemInfo::getPhysicalRam() { diff --git a/src/mongo/util/touch_pages.cpp b/src/mongo/util/touch_pages.cpp index d5d17900957..c2e7c4f4b36 100644 --- a/src/mongo/util/touch_pages.cpp +++ b/src/mongo/util/touch_pages.cpp @@ -14,7 +14,7 @@ */ -#include "pch.h" +#include "mongo/pch.h" #include "mongo/util/touch_pages.h" diff --git a/src/mongo/util/trace.cpp b/src/mongo/util/trace.cpp index 806f1fbd1e2..846ce2c216e 100755 --- a/src/mongo/util/trace.cpp +++ b/src/mongo/util/trace.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "util/trace.h" +#include "mongo/util/trace.h" namespace mongo { diff --git a/src/mongo/util/trace.h b/src/mongo/util/trace.h index 60cc4c9263f..f0a8393ac88 100755 --- a/src/mongo/util/trace.h +++ b/src/mongo/util/trace.h @@ -19,7 +19,7 @@ #include "mongo/pch.h" #include <boost/unordered_map.hpp> -#include "util/concurrency/rwlock.h" +#include "mongo/util/concurrency/rwlock.h" namespace mongo { diff --git a/src/mongo/util/util.cpp b/src/mongo/util/util.cpp index da29c1f320f..937ada5b2c2 100644 --- a/src/mongo/util/util.cpp +++ b/src/mongo/util/util.cpp @@ -15,17 +15,18 @@ * limitations under the License. */ +#include "mongo/pch.h" + #include <iomanip> -#include "pch.h" -#include "goodies.h" +#include "mongo/platform/atomic_word.h" +#include "mongo/util/file_allocator.h" +#include "mongo/util/goodies.h" +#include "mongo/util/mongoutils/str.h" #include "mongo/util/stacktrace.h" #include "mongo/util/startup_test.h" -#include "file_allocator.h" -#include "time_support.h" -#include "mongoutils/str.h" -#include "timer.h" -#include "platform/atomic_word.h" +#include "mongo/util/time_support.h" +#include "mongo/util/timer.h" namespace mongo { diff --git a/src/mongo/util/winutil.h b/src/mongo/util/winutil.h index b69b69a630d..b9e8bd02a7e 100644 --- a/src/mongo/util/winutil.h +++ b/src/mongo/util/winutil.h @@ -16,7 +16,7 @@ // * along with this program. If not, see <http://www.gnu.org/licenses/>. // */ // -// #include "pch.h" +// #include "mongo/pch.h" #pragma once |