diff options
Diffstat (limited to 'src/mongo/s/d_logic.h')
| -rw-r--r-- | src/mongo/s/d_logic.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/mongo/s/d_logic.h b/src/mongo/s/d_logic.h index 57e54e6025a..0c437c423f5 100644 --- a/src/mongo/s/d_logic.h +++ b/src/mongo/s/d_logic.h @@ -30,8 +30,6 @@ namespace mongo { class Database; class DiskLoc; - typedef ChunkVersion ConfigVersion; - // -------------- // --- global state --- // -------------- @@ -61,8 +59,8 @@ namespace mongo { // versioning support bool hasVersion( const string& ns ); - bool hasVersion( const string& ns , ConfigVersion& version ); - const ConfigVersion getVersion( const string& ns ) const; + bool hasVersion( const string& ns , ChunkVersion& version ); + const ChunkVersion getVersion( const string& ns ) const; /** * Uninstalls the manager for a given collection. This should be used when the collection is dropped. @@ -89,7 +87,7 @@ namespace mongo { * @param version (IN) the client believe this collection is on and (OUT) the version the manager is actually in * @return true if the access can be allowed at the provided version */ - bool trySetVersion( const string& ns , ConfigVersion& version ); + bool trySetVersion( const string& ns , ChunkVersion& version ); void appendInfo( BSONObjBuilder& b ); @@ -183,8 +181,8 @@ namespace mongo { bool hasID() const { return _id.isSet(); } void setID( const OID& id ); - const ConfigVersion getVersion( const string& ns ) const; - void setVersion( const string& ns , const ConfigVersion& version ); + const ChunkVersion getVersion( const string& ns ) const; + void setVersion( const string& ns , const ChunkVersion& version ); static ShardedConnectionInfo* get( bool create ); static void reset(); @@ -202,7 +200,7 @@ namespace mongo { OID _id; bool _forceVersionOk; // if this is true, then chunk version #s aren't check, and all ops are allowed - typedef map<string,ConfigVersion> NSVersionMap; + typedef map<string,ChunkVersion> NSVersionMap; NSVersionMap _versions; static boost::thread_specific_ptr<ShardedConnectionInfo> _tl; @@ -238,7 +236,10 @@ namespace mongo { * @return true if the current threads shard version is ok, or not in sharded version * Also returns an error message and the Config/ChunkVersions causing conflicts */ - bool shardVersionOk( const string& ns , string& errmsg, ConfigVersion& received, ConfigVersion& wanted ); + bool shardVersionOk( const string& ns, + string& errmsg, + ChunkVersion& received, + ChunkVersion& wanted ); /** * @return true if we took care of the message and nothing else should be done |