diff options
Diffstat (limited to 'src/mongo/db/exec')
36 files changed, 107 insertions, 1 deletions
diff --git a/src/mongo/db/exec/and_hash.cpp b/src/mongo/db/exec/and_hash.cpp index 8c8ef9e2980..10271666d47 100644 --- a/src/mongo/db/exec/and_hash.cpp +++ b/src/mongo/db/exec/and_hash.cpp @@ -46,6 +46,7 @@ namespace { namespace mongo { using std::auto_ptr; + using std::vector; const size_t AndHashStage::kLookAheadWorks = 10; diff --git a/src/mongo/db/exec/and_sorted.cpp b/src/mongo/db/exec/and_sorted.cpp index 362a12fdbab..5641f52a048 100644 --- a/src/mongo/db/exec/and_sorted.cpp +++ b/src/mongo/db/exec/and_sorted.cpp @@ -36,6 +36,10 @@ namespace mongo { + using std::auto_ptr; + using std::numeric_limits; + using std::vector; + // static const char* AndSortedStage::kStageType = "AND_SORTED"; diff --git a/src/mongo/db/exec/cached_plan.cpp b/src/mongo/db/exec/cached_plan.cpp index 1996fab826a..f4e026f740c 100644 --- a/src/mongo/db/exec/cached_plan.cpp +++ b/src/mongo/db/exec/cached_plan.cpp @@ -41,6 +41,9 @@ namespace mongo { + using std::auto_ptr; + using std::vector; + // static const char* CachedPlanStage::kStageType = "CACHED_PLAN"; diff --git a/src/mongo/db/exec/collection_scan.cpp b/src/mongo/db/exec/collection_scan.cpp index 088fa9fab75..ac708ca13b7 100644 --- a/src/mongo/db/exec/collection_scan.cpp +++ b/src/mongo/db/exec/collection_scan.cpp @@ -44,6 +44,9 @@ namespace mongo { + using std::auto_ptr; + using std::vector; + // static const char* CollectionScan::kStageType = "COLLSCAN"; diff --git a/src/mongo/db/exec/count.cpp b/src/mongo/db/exec/count.cpp index cc31f30898b..a6bd76382d4 100644 --- a/src/mongo/db/exec/count.cpp +++ b/src/mongo/db/exec/count.cpp @@ -36,6 +36,9 @@ namespace mongo { + using std::auto_ptr; + using std::vector; + // static const char* CountStage::kStageType = "COUNT"; diff --git a/src/mongo/db/exec/count_scan.cpp b/src/mongo/db/exec/count_scan.cpp index 00fa2da47e9..355534fe29b 100644 --- a/src/mongo/db/exec/count_scan.cpp +++ b/src/mongo/db/exec/count_scan.cpp @@ -34,6 +34,9 @@ namespace mongo { + using std::auto_ptr; + using std::vector; + // static const char* CountScan::kStageType = "COUNT_SCAN"; diff --git a/src/mongo/db/exec/delete.cpp b/src/mongo/db/exec/delete.cpp index 085ba16c10b..232edd27416 100644 --- a/src/mongo/db/exec/delete.cpp +++ b/src/mongo/db/exec/delete.cpp @@ -41,6 +41,9 @@ namespace mongo { + using std::auto_ptr; + using std::vector; + // static const char* DeleteStage::kStageType = "DELETE"; diff --git a/src/mongo/db/exec/distinct_scan.cpp b/src/mongo/db/exec/distinct_scan.cpp index 93fefed5c16..a0b4e4e0271 100644 --- a/src/mongo/db/exec/distinct_scan.cpp +++ b/src/mongo/db/exec/distinct_scan.cpp @@ -37,6 +37,9 @@ namespace mongo { + using std::auto_ptr; + using std::vector; + // static const char* DistinctScan::kStageType = "DISTINCT"; diff --git a/src/mongo/db/exec/eof.cpp b/src/mongo/db/exec/eof.cpp index c21e6cf6668..3b9b3528b2f 100644 --- a/src/mongo/db/exec/eof.cpp +++ b/src/mongo/db/exec/eof.cpp @@ -34,6 +34,8 @@ namespace mongo { + using std::vector; + // static const char* EOFStage::kStageType = "EOF"; diff --git a/src/mongo/db/exec/fetch.cpp b/src/mongo/db/exec/fetch.cpp index f6e0dd7094b..ac0cb291ab7 100644 --- a/src/mongo/db/exec/fetch.cpp +++ b/src/mongo/db/exec/fetch.cpp @@ -38,6 +38,9 @@ namespace mongo { + using std::auto_ptr; + using std::vector; + // static const char* FetchStage::kStageType = "FETCH"; diff --git a/src/mongo/db/exec/geo_near.cpp b/src/mongo/db/exec/geo_near.cpp index 29ed167bd2d..f45fa051d08 100644 --- a/src/mongo/db/exec/geo_near.cpp +++ b/src/mongo/db/exec/geo_near.cpp @@ -1,3 +1,4 @@ + /** * Copyright (C) 2014 10gen Inc. * @@ -52,6 +53,8 @@ namespace mongo { using boost::scoped_ptr; + using std::abs; + using std::auto_ptr; // // Shared GeoNear search functionality diff --git a/src/mongo/db/exec/group.cpp b/src/mongo/db/exec/group.cpp index 1a7d5b174ac..c6f8c1267b7 100644 --- a/src/mongo/db/exec/group.cpp +++ b/src/mongo/db/exec/group.cpp @@ -38,6 +38,9 @@ namespace mongo { + using std::auto_ptr; + using std::vector; + namespace { // Helper function that extracts the group key from a BSONObj. diff --git a/src/mongo/db/exec/idhack.cpp b/src/mongo/db/exec/idhack.cpp index f3d97f16527..ff3e02b6187 100644 --- a/src/mongo/db/exec/idhack.cpp +++ b/src/mongo/db/exec/idhack.cpp @@ -41,6 +41,9 @@ namespace mongo { + using std::auto_ptr; + using std::vector; + // static const char* IDHackStage::kStageType = "IDHACK"; diff --git a/src/mongo/db/exec/index_scan.cpp b/src/mongo/db/exec/index_scan.cpp index 2a8ab64305b..4bcfaecd115 100644 --- a/src/mongo/db/exec/index_scan.cpp +++ b/src/mongo/db/exec/index_scan.cpp @@ -51,6 +51,9 @@ namespace { namespace mongo { + using std::auto_ptr; + using std::vector; + // static const char* IndexScan::kStageType = "IXSCAN"; diff --git a/src/mongo/db/exec/keep_mutations.cpp b/src/mongo/db/exec/keep_mutations.cpp index c35793c4300..adc1c69e5a4 100644 --- a/src/mongo/db/exec/keep_mutations.cpp +++ b/src/mongo/db/exec/keep_mutations.cpp @@ -33,6 +33,9 @@ namespace mongo { + using std::auto_ptr; + using std::vector; + // static const char* KeepMutationsStage::kStageType = "KEEP_MUTATIONS"; diff --git a/src/mongo/db/exec/limit.cpp b/src/mongo/db/exec/limit.cpp index 0d0dfcb596a..a098206f8db 100644 --- a/src/mongo/db/exec/limit.cpp +++ b/src/mongo/db/exec/limit.cpp @@ -34,6 +34,9 @@ namespace mongo { + using std::auto_ptr; + using std::vector; + // static const char* LimitStage::kStageType = "LIMIT"; diff --git a/src/mongo/db/exec/merge_sort.cpp b/src/mongo/db/exec/merge_sort.cpp index f6e0e735a08..aaf0b9ac962 100644 --- a/src/mongo/db/exec/merge_sort.cpp +++ b/src/mongo/db/exec/merge_sort.cpp @@ -35,6 +35,11 @@ namespace mongo { + using std::auto_ptr; + using std::list; + using std::string; + using std::vector; + // static const char* MergeSortStage::kStageType = "SORT_MERGE"; diff --git a/src/mongo/db/exec/multi_iterator.cpp b/src/mongo/db/exec/multi_iterator.cpp index 676f64f7e92..20f2c3a734b 100644 --- a/src/mongo/db/exec/multi_iterator.cpp +++ b/src/mongo/db/exec/multi_iterator.cpp @@ -35,6 +35,8 @@ namespace mongo { + using std::vector; + MultiIteratorStage::MultiIteratorStage(OperationContext* txn, WorkingSet* ws, Collection* collection) diff --git a/src/mongo/db/exec/multi_plan.cpp b/src/mongo/db/exec/multi_plan.cpp index 1cd5ead1ca0..384469a137b 100644 --- a/src/mongo/db/exec/multi_plan.cpp +++ b/src/mongo/db/exec/multi_plan.cpp @@ -51,6 +51,11 @@ namespace mongo { + using std::auto_ptr; + using std::endl; + using std::list; + using std::vector; + // static const char* MultiPlanStage::kStageType = "MULTI_PLAN"; diff --git a/src/mongo/db/exec/near.cpp b/src/mongo/db/exec/near.cpp index 9c0e8d43ec6..cb10955e4ec 100644 --- a/src/mongo/db/exec/near.cpp +++ b/src/mongo/db/exec/near.cpp @@ -36,6 +36,8 @@ namespace mongo { + using std::vector; + NearStage::NearStage(OperationContext* txn, WorkingSet* workingSet, Collection* collection, @@ -234,7 +236,7 @@ namespace mongo { // Store the member's RecordId, if available, for quick invalidation if (nextMember->hasLoc()) { - _nextIntervalSeen.insert(make_pair(nextMember->loc, nextMemberID)); + _nextIntervalSeen.insert(std::make_pair(nextMember->loc, nextMemberID)); } if (!distanceStatus.isOK()) { diff --git a/src/mongo/db/exec/oplogstart.cpp b/src/mongo/db/exec/oplogstart.cpp index 1edc3bc2b94..5d4a3296f92 100644 --- a/src/mongo/db/exec/oplogstart.cpp +++ b/src/mongo/db/exec/oplogstart.cpp @@ -34,6 +34,8 @@ namespace mongo { + using std::vector; + // Does not take ownership. OplogStart::OplogStart(OperationContext* txn, const Collection* collection, diff --git a/src/mongo/db/exec/or.cpp b/src/mongo/db/exec/or.cpp index 91364d9807e..b9c1c8f3170 100644 --- a/src/mongo/db/exec/or.cpp +++ b/src/mongo/db/exec/or.cpp @@ -35,6 +35,9 @@ namespace mongo { + using std::auto_ptr; + using std::vector; + // static const char* OrStage::kStageType = "OR"; diff --git a/src/mongo/db/exec/pipeline_proxy.cpp b/src/mongo/db/exec/pipeline_proxy.cpp index ca97e7a962b..5369429cd07 100644 --- a/src/mongo/db/exec/pipeline_proxy.cpp +++ b/src/mongo/db/exec/pipeline_proxy.cpp @@ -39,6 +39,7 @@ namespace mongo { using boost::intrusive_ptr; using boost::shared_ptr; + using std::vector; PipelineProxyStage::PipelineProxyStage(intrusive_ptr<Pipeline> pipeline, const boost::shared_ptr<PlanExecutor>& child, diff --git a/src/mongo/db/exec/projection.cpp b/src/mongo/db/exec/projection.cpp index 9d13644f1a7..8043c1546a0 100644 --- a/src/mongo/db/exec/projection.cpp +++ b/src/mongo/db/exec/projection.cpp @@ -41,6 +41,10 @@ namespace mongo { + using std::auto_ptr; + using std::endl; + using std::vector; + static const char* kIdField = "_id"; // static diff --git a/src/mongo/db/exec/projection_exec.cpp b/src/mongo/db/exec/projection_exec.cpp index 6a66ccfa1ee..8ae16dc515d 100644 --- a/src/mongo/db/exec/projection_exec.cpp +++ b/src/mongo/db/exec/projection_exec.cpp @@ -36,6 +36,9 @@ namespace mongo { + using std::max; + using std::string; + ProjectionExec::ProjectionExec() : _include(true), _special(false), diff --git a/src/mongo/db/exec/queued_data_stage.cpp b/src/mongo/db/exec/queued_data_stage.cpp index 3d3ab327601..1e40b87d21a 100644 --- a/src/mongo/db/exec/queued_data_stage.cpp +++ b/src/mongo/db/exec/queued_data_stage.cpp @@ -33,6 +33,9 @@ namespace mongo { + using std::auto_ptr; + using std::vector; + const char* QueuedDataStage::kStageType = "QUEUED_DATA"; QueuedDataStage::QueuedDataStage(WorkingSet* ws) diff --git a/src/mongo/db/exec/queued_data_stage_test.cpp b/src/mongo/db/exec/queued_data_stage_test.cpp index 98d74ce894c..26bc5962a8a 100644 --- a/src/mongo/db/exec/queued_data_stage_test.cpp +++ b/src/mongo/db/exec/queued_data_stage_test.cpp @@ -38,6 +38,8 @@ using namespace mongo; namespace { + using std::auto_ptr; + // // Basic test that we get out valid stats objects. // diff --git a/src/mongo/db/exec/shard_filter.cpp b/src/mongo/db/exec/shard_filter.cpp index d5344af6dc2..60d31990be0 100644 --- a/src/mongo/db/exec/shard_filter.cpp +++ b/src/mongo/db/exec/shard_filter.cpp @@ -38,6 +38,9 @@ namespace mongo { + using std::auto_ptr; + using std::vector; + // static const char* ShardFilterStage::kStageType = "SHARDING_FILTER"; diff --git a/src/mongo/db/exec/skip.cpp b/src/mongo/db/exec/skip.cpp index 34d4e07c9f3..f20f4a90935 100644 --- a/src/mongo/db/exec/skip.cpp +++ b/src/mongo/db/exec/skip.cpp @@ -33,6 +33,9 @@ namespace mongo { + using std::auto_ptr; + using std::vector; + // static const char* SkipStage::kStageType = "SKIP"; diff --git a/src/mongo/db/exec/sort.cpp b/src/mongo/db/exec/sort.cpp index aaa2b852206..3ccafbdb318 100644 --- a/src/mongo/db/exec/sort.cpp +++ b/src/mongo/db/exec/sort.cpp @@ -43,6 +43,8 @@ namespace mongo { + using std::auto_ptr; + using std::endl; using std::vector; // static diff --git a/src/mongo/db/exec/stagedebug_cmd.cpp b/src/mongo/db/exec/stagedebug_cmd.cpp index fb0ea1619d4..d93a4637a41 100644 --- a/src/mongo/db/exec/stagedebug_cmd.cpp +++ b/src/mongo/db/exec/stagedebug_cmd.cpp @@ -51,6 +51,10 @@ namespace mongo { + using std::auto_ptr; + using std::string; + using std::vector; + /** * A command for manually constructing a query tree and running it. * diff --git a/src/mongo/db/exec/subplan.cpp b/src/mongo/db/exec/subplan.cpp index e436fe8e01a..ec155e3bdb8 100644 --- a/src/mongo/db/exec/subplan.cpp +++ b/src/mongo/db/exec/subplan.cpp @@ -43,6 +43,10 @@ namespace mongo { + using std::auto_ptr; + using std::endl; + using std::vector; + // static const char* SubplanStage::kStageType = "SUBPLAN"; diff --git a/src/mongo/db/exec/text.cpp b/src/mongo/db/exec/text.cpp index 95053c8c8da..ee1c733f955 100644 --- a/src/mongo/db/exec/text.cpp +++ b/src/mongo/db/exec/text.cpp @@ -39,6 +39,10 @@ namespace mongo { + using std::auto_ptr; + using std::string; + using std::vector; + // static const char* TextStage::kStageType = "TEXT"; diff --git a/src/mongo/db/exec/update.cpp b/src/mongo/db/exec/update.cpp index 016fe231ecd..96f23972ffe 100644 --- a/src/mongo/db/exec/update.cpp +++ b/src/mongo/db/exec/update.cpp @@ -44,6 +44,10 @@ namespace mongo { + using std::auto_ptr; + using std::string; + using std::vector; + namespace mb = mutablebson; namespace { diff --git a/src/mongo/db/exec/working_set.cpp b/src/mongo/db/exec/working_set.cpp index 6fd3a37a0b6..c35b39d7c94 100644 --- a/src/mongo/db/exec/working_set.cpp +++ b/src/mongo/db/exec/working_set.cpp @@ -33,6 +33,8 @@ namespace mongo { + using std::string; + WorkingSet::MemberHolder::MemberHolder() : member(NULL) { } WorkingSet::MemberHolder::~MemberHolder() {} diff --git a/src/mongo/db/exec/working_set_test.cpp b/src/mongo/db/exec/working_set_test.cpp index 120e74a89ab..c2c7f88a474 100644 --- a/src/mongo/db/exec/working_set_test.cpp +++ b/src/mongo/db/exec/working_set_test.cpp @@ -42,6 +42,8 @@ using namespace mongo; namespace { + using std::string; + class WorkingSetFixture : public mongo::unittest::Test { protected: void setUp() { |