diff options
Diffstat (limited to 'src/mongo/db/storage')
-rw-r--r-- | src/mongo/db/storage/mmap_v1/btree/btree_interface.h | 2 | ||||
-rw-r--r-- | src/mongo/db/storage/mmap_v1/btree/btree_logic.h | 30 | ||||
-rw-r--r-- | src/mongo/db/storage/mmap_v1/btree/btree_test_help.h | 2 | ||||
-rw-r--r-- | src/mongo/db/storage/mmap_v1/data_file_sync.h | 2 | ||||
-rw-r--r-- | src/mongo/db/storage/mmap_v1/extent.h | 2 | ||||
-rw-r--r-- | src/mongo/db/storage/record_store_test_docwriter.h | 4 | ||||
-rw-r--r-- | src/mongo/db/storage/record_store_test_updaterecord.h | 2 | ||||
-rw-r--r-- | src/mongo/db/storage/record_store_test_validate.h | 14 | ||||
-rw-r--r-- | src/mongo/db/storage/rocks/rocks_record_store.h | 4 | ||||
-rw-r--r-- | src/mongo/db/storage/sorted_data_interface.h | 8 | ||||
-rw-r--r-- | src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h | 8 |
11 files changed, 39 insertions, 39 deletions
diff --git a/src/mongo/db/storage/mmap_v1/btree/btree_interface.h b/src/mongo/db/storage/mmap_v1/btree/btree_interface.h index 2cc92060e0c..cb2cdd21125 100644 --- a/src/mongo/db/storage/mmap_v1/btree/btree_interface.h +++ b/src/mongo/db/storage/mmap_v1/btree/btree_interface.h @@ -45,6 +45,6 @@ namespace mongo { RecordStore* recordStore, SavedCursorRegistry* cursorRegistry, const Ordering& ordering, - const string& indexName, + const std::string& indexName, int version); } // namespace mongo diff --git a/src/mongo/db/storage/mmap_v1/btree/btree_logic.h b/src/mongo/db/storage/mmap_v1/btree/btree_logic.h index c175b4efe0c..942f2b41365 100644 --- a/src/mongo/db/storage/mmap_v1/btree/btree_logic.h +++ b/src/mongo/db/storage/mmap_v1/btree/btree_logic.h @@ -79,7 +79,7 @@ namespace mongo { RecordStore* store, SavedCursorRegistry* cursors, const Ordering& ordering, - const string& indexName) + const std::string& indexName) : _headManager(head), _recordStore(store), _cursorRegistry(cursors), @@ -120,7 +120,7 @@ namespace mongo { DiskLoc _rightLeafLoc; // DiskLoc of right-most (highest) leaf bucket. bool _dupsAllowed; - auto_ptr<KeyDataOwnedType> _keyLast; + std::auto_ptr<KeyDataOwnedType> _keyLast; // Not owned. OperationContext* _txn; @@ -199,8 +199,8 @@ namespace mongo { const BSONObj& keyBegin, int keyBeginLen, bool afterKey, - const vector<const BSONElement*>& keyEnd, - const vector<bool>& keyEndInclusive, + const std::vector<const BSONElement*>& keyEnd, + const std::vector<bool>& keyEndInclusive, int direction) const; void advanceTo(OperationContext*, @@ -209,8 +209,8 @@ namespace mongo { const BSONObj &keyBegin, int keyBeginLen, bool afterKey, - const vector<const BSONElement*>& keyEnd, - const vector<bool>& keyEndInclusive, + const std::vector<const BSONElement*>& keyEnd, + const std::vector<bool>& keyEndInclusive, int direction) const; void restorePosition(OperationContext* txn, @@ -351,10 +351,10 @@ namespace mongo { const BSONObj& keyBegin, int keyBeginLen, bool afterKey, - const vector<const BSONElement*>& keyEnd, - const vector<bool>& keyEndInclusive, + const std::vector<const BSONElement*>& keyEnd, + const std::vector<bool>& keyEndInclusive, int direction, - pair<DiskLoc, int>& bestParent) const; + std::pair<DiskLoc, int>& bestParent) const; Status _find(OperationContext* txn, BucketType* bucket, @@ -370,13 +370,13 @@ namespace mongo { const BSONObj& keyBegin, int keyBeginLen, bool afterKey, - const vector<const BSONElement*>& keyEnd, - const vector<bool>& keyEndInclusive, + const std::vector<const BSONElement*>& keyEnd, + const std::vector<bool>& keyEndInclusive, const Ordering& order, int direction, DiskLoc* thisLocInOut, int* keyOfsInOut, - pair<DiskLoc, int>& bestParent) const; + std::pair<DiskLoc, int>& bestParent) const; void advanceToImpl(OperationContext* txn, DiskLoc* thisLocInOut, @@ -384,8 +384,8 @@ namespace mongo { const BSONObj &keyBegin, int keyBeginLen, bool afterKey, - const vector<const BSONElement*>& keyEnd, - const vector<bool>& keyEndInclusive, + const std::vector<const BSONElement*>& keyEnd, + const std::vector<bool>& keyEndInclusive, int direction) const; bool wouldCreateDup(OperationContext* txn, @@ -597,7 +597,7 @@ namespace mongo { Ordering _ordering; - string _indexName; + std::string _indexName; }; } // namespace mongo diff --git a/src/mongo/db/storage/mmap_v1/btree/btree_test_help.h b/src/mongo/db/storage/mmap_v1/btree/btree_test_help.h index 5e5d0df250b..b282e72d827 100644 --- a/src/mongo/db/storage/mmap_v1/btree/btree_test_help.h +++ b/src/mongo/db/storage/mmap_v1/btree/btree_test_help.h @@ -145,7 +145,7 @@ namespace mongo { bool isPresent(const BSONObj& key, int direction) const; - static string expectedKey(const char* spec); + static std::string expectedKey(const char* spec); OperationContext* _txn; BtreeLogicTestHelper<OnDiskFormat>* _helper; diff --git a/src/mongo/db/storage/mmap_v1/data_file_sync.h b/src/mongo/db/storage/mmap_v1/data_file_sync.h index 07341a8bb92..a92f55b64f8 100644 --- a/src/mongo/db/storage/mmap_v1/data_file_sync.h +++ b/src/mongo/db/storage/mmap_v1/data_file_sync.h @@ -41,7 +41,7 @@ namespace mongo { DataFileSync(); virtual bool includeByDefault() const { return true; } - virtual string name() const { return "DataFileSync"; } + virtual std::string name() const { return "DataFileSync"; } void run(); diff --git a/src/mongo/db/storage/mmap_v1/extent.h b/src/mongo/db/storage/mmap_v1/extent.h index e8ede6fe559..a25d34c49e0 100644 --- a/src/mongo/db/storage/mmap_v1/extent.h +++ b/src/mongo/db/storage/mmap_v1/extent.h @@ -71,7 +71,7 @@ namespace mongo { BSONObj dump() const; - void dump(iostream& s) const; + void dump(std::iostream& s) const; bool isOk() const { return magic == extentSignature; } void assertOk() const { verify(isOk()); } diff --git a/src/mongo/db/storage/record_store_test_docwriter.h b/src/mongo/db/storage/record_store_test_docwriter.h index 14e741c48d8..e026e942f9b 100644 --- a/src/mongo/db/storage/record_store_test_docwriter.h +++ b/src/mongo/db/storage/record_store_test_docwriter.h @@ -39,7 +39,7 @@ namespace { class StringDocWriter : public DocWriter { public: - StringDocWriter( const string &data, bool padding ) + StringDocWriter( const std::string &data, bool padding ) : _data( data ), _padding( padding ) { } @@ -54,7 +54,7 @@ namespace { bool addPadding() const { return _padding; } private: - string _data; + std::string _data; bool _padding; }; diff --git a/src/mongo/db/storage/record_store_test_updaterecord.h b/src/mongo/db/storage/record_store_test_updaterecord.h index 479ac9f7748..4ff21ae0e1c 100644 --- a/src/mongo/db/storage/record_store_test_updaterecord.h +++ b/src/mongo/db/storage/record_store_test_updaterecord.h @@ -65,7 +65,7 @@ namespace { private: OperationContext *_txn; RecordId _loc; - string _data; + std::string _data; int nCalls; // to verify that recordStoreGoingToMove() gets called once }; diff --git a/src/mongo/db/storage/record_store_test_validate.h b/src/mongo/db/storage/record_store_test_validate.h index d403800dc84..6682649f5da 100644 --- a/src/mongo/db/storage/record_store_test_validate.h +++ b/src/mongo/db/storage/record_store_test_validate.h @@ -48,14 +48,14 @@ namespace { public: ValidateAdaptorSpy() { } - ValidateAdaptorSpy( const set<string> &remain ) + ValidateAdaptorSpy( const std::set<std::string> &remain ) : _remain( remain ) { } ~ValidateAdaptorSpy() { } Status validate( const RecordData &recordData, size_t *dataSize ) { - string s( recordData.data() ); + std::string s( recordData.data() ); ASSERT( 1 == _remain.erase( s ) ); *dataSize = recordData.size(); @@ -65,7 +65,7 @@ namespace { bool allValidated() { return _remain.empty(); } private: - set<string> _remain; // initially contains all inserted records + std::set<std::string> _remain; // initially contains all inserted records }; class ValidateTest : public mongo::unittest::Test { @@ -81,7 +81,7 @@ namespace { RecordStore& getRecordStore() { return *_rs; } - const set<string>& getInsertedRecords() { return _remain; } + const std::set<std::string>& getInsertedRecords() { return _remain; } void setUp() { { @@ -93,9 +93,9 @@ namespace { for ( int i = 0; i < nToInsert; i++ ) { boost::scoped_ptr<OperationContext> opCtx( newOperationContext() ); { - stringstream ss; + std::stringstream ss; ss << "record " << i; - string data = ss.str(); + std::string data = ss.str(); ASSERT( _remain.insert( data ).second ); WriteUnitOfWork uow( opCtx.get() ); @@ -117,7 +117,7 @@ namespace { private: boost::scoped_ptr<HarnessHelper> _harnessHelper; boost::scoped_ptr<RecordStore> _rs; - set<string> _remain; + std::set<std::string> _remain; }; } // namespace diff --git a/src/mongo/db/storage/rocks/rocks_record_store.h b/src/mongo/db/storage/rocks/rocks_record_store.h index ebf06ee0ca0..ca7ad11eb3b 100644 --- a/src/mongo/db/storage/rocks/rocks_record_store.h +++ b/src/mongo/db/storage/rocks/rocks_record_store.h @@ -263,7 +263,7 @@ namespace mongo { std::atomic<long long> _dataSize; std::atomic<long long> _numRecords; - const string _dataSizeKey; - const string _numRecordsKey; + const std::string _dataSizeKey; + const std::string _numRecordsKey; }; } diff --git a/src/mongo/db/storage/sorted_data_interface.h b/src/mongo/db/storage/sorted_data_interface.h index 69fda5671a4..98bac8e5136 100644 --- a/src/mongo/db/storage/sorted_data_interface.h +++ b/src/mongo/db/storage/sorted_data_interface.h @@ -233,8 +233,8 @@ namespace mongo { virtual void advanceTo(const BSONObj &keyPrefix, int prefixLen, bool prefixExclusive, - const vector<const BSONElement*>& keySuffix, - const vector<bool>& suffixInclusive) = 0; + const std::vector<const BSONElement*>& keySuffix, + const std::vector<bool>& suffixInclusive) = 0; /** * Position 'this' forward (reverse) cursor either at the first @@ -286,8 +286,8 @@ namespace mongo { virtual void customLocate(const BSONObj& keyPrefix, int prefixLen, bool prefixExclusive, - const vector<const BSONElement*>& keySuffix, - const vector<bool>& suffixInclusive) = 0; + const std::vector<const BSONElement*>& keySuffix, + const std::vector<bool>& suffixInclusive) = 0; /** * Return the key associated with the current position of 'this' cursor. diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h index 4d2e0561aba..845d226478a 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h @@ -125,7 +125,7 @@ namespace mongo { bool _hasUri(WT_SESSION* session, const std::string& uri) const; - string _uri( const StringData& ident ) const; + std::string _uri( const StringData& ident ) const; bool _drop( const StringData& ident ); WT_CONNECTION* _conn; @@ -134,14 +134,14 @@ namespace mongo { std::string _path; bool _durable; - string _rsOptions; - string _indexOptions; + std::string _rsOptions; + std::string _indexOptions; std::set<std::string> _identToDrop; mutable boost::mutex _identToDropMutex; boost::scoped_ptr<WiredTigerSizeStorer> _sizeStorer; - string _sizeStorerUri; + std::string _sizeStorerUri; mutable ElapsedTracker _sizeStorerSyncTracker; }; |