more cleaning

30 files changed, 56 insertions, 50 deletions

diff --git a/SConstruct b/SConstruct
index 4b0ef8c135a..ef21bff4443 100644
--- a/SConstruct
+++ b/SConstruct
@@ -352,7 +352,7 @@ if has_option( "asio" ):
     coreServerFiles += [ "util/message_server_asio.cpp" ]
 
 # mongod files - also files used in tools. present in dbtests, but not in mongos and not in client libs.
-serverOnlyFiles = Split( "db/key.cpp db/btreebuilder.cpp util/logfile.cpp util/alignedbuilder.cpp db/mongommf.cpp db/dur.cpp db/durop.cpp db/dur_writetodatafiles.cpp db/dur_preplogbuffer.cpp db/dur_commitjob.cpp db/dur_recover.cpp db/dur_journal.cpp db/query.cpp db/introspect.cpp db/btree.cpp db/clientcursor.cpp db/tests.cpp db/repl.cpp db/repl/rs.cpp db/repl/consensus.cpp db/repl/rs_initiate.cpp db/repl/replset_commands.cpp db/repl/manager.cpp db/repl/health.cpp db/repl/heartbeat.cpp db/repl/rs_config.cpp db/repl/rs_rollback.cpp db/repl/rs_sync.cpp db/repl/rs_initialsync.cpp db/oplog.cpp db/repl_block.cpp db/btreecursor.cpp db/cloner.cpp db/namespace.cpp db/cap.cpp db/matcher_covered.cpp db/dbeval.cpp db/restapi.cpp db/dbhelpers.cpp db/instance.cpp db/client.cpp db/database.cpp db/pdfile.cpp db/record.cpp db/cursor.cpp db/security_commands.cpp db/security.cpp db/queryoptimizer.cpp db/queryoptimizercursor.cpp db/extsort.cpp db/cmdline.cpp" )
+serverOnlyFiles = Split( "db/key.cpp db/btreebuilder.cpp util/logfile.cpp util/alignedbuilder.cpp db/mongommf.cpp db/dur.cpp db/durop.cpp db/dur_writetodatafiles.cpp db/dur_preplogbuffer.cpp db/dur_commitjob.cpp db/dur_recover.cpp db/dur_journal.cpp db/introspect.cpp db/btree.cpp db/clientcursor.cpp db/tests.cpp db/repl.cpp db/repl/rs.cpp db/repl/consensus.cpp db/repl/rs_initiate.cpp db/repl/replset_commands.cpp db/repl/manager.cpp db/repl/health.cpp db/repl/heartbeat.cpp db/repl/rs_config.cpp db/repl/rs_rollback.cpp db/repl/rs_sync.cpp db/repl/rs_initialsync.cpp db/oplog.cpp db/repl_block.cpp db/btreecursor.cpp db/cloner.cpp db/namespace.cpp db/cap.cpp db/matcher_covered.cpp db/dbeval.cpp db/restapi.cpp db/dbhelpers.cpp db/instance.cpp db/client.cpp db/database.cpp db/pdfile.cpp db/record.cpp db/cursor.cpp db/security_commands.cpp db/security.cpp db/queryoptimizer.cpp db/queryoptimizercursor.cpp db/extsort.cpp db/cmdline.cpp" )
 
 serverOnlyFiles += [ "db/index.cpp" ] + Glob( "db/geo/*.cpp" ) + Glob( "db/ops/*.cpp" )
 
diff --git a/db/cap.cpp b/db/cap.cpp
index 7ef89a994e5..a8be2383115 100644
--- a/db/cap.cpp
+++ b/db/cap.cpp
@@ -26,8 +26,8 @@
 #include "btree.h"
 #include <algorithm>
 #include <list>
-#include "query.h"
 #include "json.h"
+#include "clientcursor.h"
 
 /*
  capped collection layout
diff --git a/db/clientcursor.cpp b/db/clientcursor.cpp
index 01c4eb9192e..00da0fdd386 100644
--- a/db/clientcursor.cpp
+++ b/db/clientcursor.cpp
@@ -23,7 +23,7 @@
 */
 
 #include "pch.h"
-#include "query.h"
+#include "clientcursor.h"
 #include "introspect.h"
 #include <time.h>
 #include "db.h"
diff --git a/db/cloner.cpp b/db/cloner.cpp
index 8db6f7f5622..2a46ea22cb4 100644
--- a/db/cloner.cpp
+++ b/db/cloner.cpp
@@ -22,7 +22,7 @@
 #include "../client/dbclient.h"
 #include "../bson/util/builder.h"
 #include "jsobj.h"
-#include "query.h"
+#include "ops/query.h"
 #include "commands.h"
 #include "db.h"
 #include "instance.h"
diff --git a/db/db.cpp b/db/db.cpp
index 1d4236eccdc..3fc98d71966 100644
--- a/db/db.cpp
+++ b/db/db.cpp
@@ -18,7 +18,6 @@
 
 #include "pch.h"
 #include "db.h"
-#include "query.h"
 #include "introspect.h"
 #include "repl.h"
 #include "../util/unittest.h"
diff --git a/db/dbcommands.cpp b/db/dbcommands.cpp
index 7baeb88d2fc..8085f1b632b 100644
--- a/db/dbcommands.cpp
+++ b/db/dbcommands.cpp
@@ -21,7 +21,7 @@
 */
 
 #include "pch.h"
-#include "query.h"
+#include "ops/query.h"
 #include "pdfile.h"
 #include "jsobj.h"
 #include "../bson/util/builder.h"
diff --git a/db/dbcommands_generic.cpp b/db/dbcommands_generic.cpp
index 8f76cc49657..d9aed133233 100644
--- a/db/dbcommands_generic.cpp
+++ b/db/dbcommands_generic.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "pch.h"
-#include "query.h"
+#include "ops/query.h"
 #include "pdfile.h"
 #include "jsobj.h"
 #include "../bson/util/builder.h"
diff --git a/db/dbeval.cpp b/db/dbeval.cpp
index 5a0671296e6..3a53200a49f 100644
--- a/db/dbeval.cpp
+++ b/db/dbeval.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "pch.h"
-#include "query.h"
+#include "ops/query.h"
 #include "pdfile.h"
 #include "jsobj.h"
 #include "../bson/util/builder.h"
diff --git a/db/dbhelpers.cpp b/db/dbhelpers.cpp
index 168ac420fd7..96498384ae7 100644
--- a/db/dbhelpers.cpp
+++ b/db/dbhelpers.cpp
@@ -19,7 +19,6 @@
 #include "pch.h"
 #include "db.h"
 #include "dbhelpers.h"
-#include "query.h"
 #include "json.h"
 #include "queryoptimizer.h"
 #include "btree.h"
diff --git a/db/indexkey.cpp b/db/indexkey.cpp
index abf028d2573..cc2cd43daf5 100644
--- a/db/indexkey.cpp
+++ b/db/indexkey.cpp
@@ -20,7 +20,7 @@
 #include "namespace-inl.h"
 #include "index.h"
 #include "btree.h"
-#include "query.h"
+#include "ops/query.h"
 #include "background.h"
 
 namespace mongo {
diff --git a/db/instance.cpp b/db/instance.cpp
index 44e7a38d3c6..49873611f32 100644
--- a/db/instance.cpp
+++ b/db/instance.cpp
@@ -19,7 +19,6 @@
 
 #include "pch.h"
 #include "db.h"
-#include "query.h"
 #include "introspect.h"
 #include "repl.h"
 #include "dbmessage.h"
@@ -41,6 +40,7 @@
 #include "dur_recover.h"
 #include "ops/update.h"
 #include "ops/delete.h"
+#include "ops/query.h"
 
 namespace mongo {
 
diff --git a/db/namespace.cpp b/db/namespace.cpp
index 050cd0a56b3..927f56b6e7b 100644
--- a/db/namespace.cpp
+++ b/db/namespace.cpp
@@ -25,10 +25,11 @@
 #include "btree.h"
 #include <algorithm>
 #include <list>
-#include "query.h"
 #include "queryutil.h"
 #include "json.h"
 #include "ops/delete.h"
+#include "ops/query.h"
+
 
 namespace mongo {
 
diff --git a/db/oplog.cpp b/db/oplog.cpp
index 01afb6b134b..7286fd9053c 100644
--- a/db/oplog.cpp
+++ b/db/oplog.cpp
@@ -28,6 +28,7 @@
 #include "queryoptimizer.h"
 #include "ops/update.h"
 #include "ops/delete.h"
+#include "ops/query.h"
 
 namespace mongo {
 
diff --git a/db/query.cpp b/db/ops/query.cpp
index b1f0a57d924..9a333838090 100644
--- a/db/query.cpp
+++ b/db/ops/query.cpp
@@ -16,26 +16,26 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "pch.h"
+#include "../../pch.h"
 #include "query.h"
-#include "pdfile.h"
-#include "jsobjmanipulator.h"
-#include "../bson/util/builder.h"
+#include "../pdfile.h"
+#include "../jsobjmanipulator.h"
+#include "../../bson/util/builder.h"
 #include <time.h>
-#include "introspect.h"
-#include "btree.h"
-#include "../util/lruishmap.h"
-#include "json.h"
-#include "repl.h"
-#include "replutil.h"
-#include "scanandorder.h"
-#include "security.h"
-#include "curop-inl.h"
-#include "commands.h"
-#include "queryoptimizer.h"
-#include "lasterror.h"
-#include "../s/d_logic.h"
-#include "repl_block.h"
+#include "../introspect.h"
+#include "../btree.h"
+#include "../../util/lruishmap.h"
+#include "../json.h"
+#include "../repl.h"
+#include "../replutil.h"
+#include "../scanandorder.h"
+#include "../security.h"
+#include "../curop-inl.h"
+#include "../commands.h"
+#include "../queryoptimizer.h"
+#include "../lasterror.h"
+#include "../../s/d_logic.h"
+#include "../repl_block.h"
 
 namespace mongo {
 
diff --git a/db/query.h b/db/ops/query.h
index 72804c56189..e2fab267179 100644
--- a/db/query.h
+++ b/db/ops/query.h
@@ -18,15 +18,15 @@
 
 #pragma once
 
-#include "../pch.h"
-#include "../util/message.h"
-#include "dbmessage.h"
-#include "jsobj.h"
-#include "diskloc.h"
-#include "projection.h"
+#include "../../pch.h"
+#include "../../util/message.h"
+#include "../dbmessage.h"
+#include "../jsobj.h"
+#include "../diskloc.h"
+#include "../projection.h"
 
 // struct QueryOptions, QueryResult, QueryResultFlags in:
-#include "../client/dbclient.h"
+#include "../../client/dbclient.h"
 
 namespace mongo {
 
@@ -250,4 +250,4 @@ namespace mongo {
 
 } // namespace mongo
 
-#include "clientcursor.h"
+
diff --git a/db/ops/update.cpp b/db/ops/update.cpp
index 09cdd2daa04..69c6ea36045 100644
--- a/db/ops/update.cpp
+++ b/db/ops/update.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "pch.h"
-#include "../query.h"
+#include "query.h"
 #include "../pdfile.h"
 #include "../jsobjmanipulator.h"
 #include "../queryoptimizer.h"
diff --git a/db/ops/update.h b/db/ops/update.h
index 1dbe9d38374..289613bb3f4 100644
--- a/db/ops/update.h
+++ b/db/ops/update.h
@@ -44,6 +44,7 @@ namespace mongo {
     };
 
 
+    class RemoveSaver;
 
     /* returns true if an existing object was updated, false if no existing object was found.
        multi - update multiple objects - mostly useful with things like $set
diff --git a/db/pdfile.cpp b/db/pdfile.cpp
index d49b5de2cab..6ec084b6fec 100644
--- a/db/pdfile.cpp
+++ b/db/pdfile.cpp
@@ -44,6 +44,7 @@ _ disallow system* manipulations from the database.
 #include "background.h"
 #include "compact.h"
 #include "ops/delete.h"
+#include "instance.h"
 
 namespace mongo {
 
diff --git a/db/repl.cpp b/db/repl.cpp
index a3e81c90785..3b812210b04 100644
--- a/db/repl.cpp
+++ b/db/repl.cpp
@@ -40,7 +40,7 @@
 #include "../client/dbclient.h"
 #include "../client/connpool.h"
 #include "pdfile.h"
-#include "query.h"
+#include "ops/query.h"
 #include "db.h"
 #include "commands.h"
 #include "security.h"
diff --git a/db/repl.h b/db/repl.h
index ed388b21a36..bf09d720673 100644
--- a/db/repl.h
+++ b/db/repl.h
@@ -30,7 +30,6 @@
 #include "pdfile.h"
 #include "db.h"
 #include "dbhelpers.h"
-#include "query.h"
 #include "../client/dbclient.h"
 #include "../util/optime.h"
 #include "oplog.h"
diff --git a/db/repl/rs_rollback.cpp b/db/repl/rs_rollback.cpp
index c9289416574..67d6cc26f07 100644
--- a/db/repl/rs_rollback.cpp
+++ b/db/repl/rs_rollback.cpp
@@ -20,7 +20,7 @@
 #include "../../client/dbclient.h"
 #include "rs.h"
 #include "../repl.h"
-#include "../query.h"
+#include "../ops/query.h"
 #include "../cloner.h"
 #include "../ops/update.h"
 #include "../ops/delete.h"
diff --git a/db/replutil.h b/db/replutil.h
index e804480aa87..f2bea232081 100644
--- a/db/replutil.h
+++ b/db/replutil.h
@@ -23,6 +23,7 @@
 #include "repl.h"
 #include "cmdline.h"
 #include "repl/rs.h"
+#include "ops/query.h"
 
 namespace mongo {
 
diff --git a/dbtests/directclienttests.cpp b/dbtests/directclienttests.cpp
index 2833a12c173..5b3bde70889 100644
--- a/dbtests/directclienttests.cpp
+++ b/dbtests/directclienttests.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "pch.h"
-#include "../db/query.h"
+#include "../db/ops/query.h"
 #include "../db/db.h"
 #include "../db/instance.h"
 #include "../db/json.h"
diff --git a/dbtests/perf/perftest.cpp b/dbtests/perf/perftest.cpp
index 88d6965e75f..b6219f7f5d9 100644
--- a/dbtests/perf/perftest.cpp
+++ b/dbtests/perf/perftest.cpp
@@ -21,7 +21,7 @@
 
 #include "../../client/dbclient.h"
 #include "../../db/instance.h"
-#include "../../db/query.h"
+#include "../../db/ops/query.h"
 #include "../../db/queryoptimizer.h"
 #include "../../util/file_allocator.h"
 
diff --git a/dbtests/perftests.cpp b/dbtests/perftests.cpp
index edf4e3e5c51..0f221be9869 100644
--- a/dbtests/perftests.cpp
+++ b/dbtests/perftests.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "pch.h"
-#include "../db/query.h"
+#include "../db/ops/query.h"
 #include "../db/db.h"
 #include "../db/instance.h"
 #include "../db/json.h"
diff --git a/dbtests/queryoptimizertests.cpp b/dbtests/queryoptimizertests.cpp
index e04c03e60f1..bd597572d52 100644
--- a/dbtests/queryoptimizertests.cpp
+++ b/dbtests/queryoptimizertests.cpp
@@ -21,7 +21,7 @@
 #include "../db/queryoptimizer.h"
 #include "../db/querypattern.h"
 #include "../db/instance.h"
-#include "../db/query.h"
+#include "../db/ops/query.h"
 #include "../db/ops/delete.h"
 #include "dbtests.h"
 
diff --git a/dbtests/querytests.cpp b/dbtests/querytests.cpp
index 27a208d6a78..a50eadfcd31 100644
--- a/dbtests/querytests.cpp
+++ b/dbtests/querytests.cpp
@@ -18,7 +18,9 @@
  */
 
 #include "pch.h"
-#include "../db/query.h"
+#include "../db/ops/query.h"
+#include "../db/dbhelpers.h"
+#include "../db/clientcursor.h"
 
 #include "../db/instance.h"
 #include "../db/json.h"
diff --git a/dbtests/updatetests.cpp b/dbtests/updatetests.cpp
index 4f52b49fb4b..81cc3dc116c 100644
--- a/dbtests/updatetests.cpp
+++ b/dbtests/updatetests.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "pch.h"
-#include "../db/query.h"
+#include "../db/ops/query.h"
 
 #include "../db/db.h"
 #include "../db/instance.h"
diff --git a/s/d_logic.cpp b/s/d_logic.cpp
index 2ff1b78f603..721810f6afa 100644
--- a/s/d_logic.cpp
+++ b/s/d_logic.cpp
@@ -29,7 +29,7 @@
 #include "../db/commands.h"
 #include "../db/jsobj.h"
 #include "../db/dbmessage.h"
-#include "../db/query.h"
+#include "../db/ops/query.h"
 
 #include "../client/connpool.h"
 
diff --git a/shell/mongo_vstudio.cpp b/shell/mongo_vstudio.cpp
index 0c18a281df0..58a0435253d 100644
--- a/shell/mongo_vstudio.cpp
+++ b/shell/mongo_vstudio.cpp
@@ -676,7 +676,9 @@ const StringData _jscode_raw_utils =
 "\"jstests/killop.js\",\n" 
 "\"jstests/run_program1.js\",\n" 
 "\"jstests/notablescan.js\",\n" 
-"\"jstests/drop2.js\"] );\n" 
+"\"jstests/drop2.js\",\n" 
+"\"jstests/dropdb_race.js\",\n" 
+"\"jstests/bench_test1.js\"] );\n" 
 "\n" 
 "// some tests can't be run in parallel with each other\n" 
 "var serialTestsArr = [ \"jstests/fsync.js\",\n"