longer names but no homonyms

Author: Alberto Lerner

db/query.cpp

@@ -629,8 +629,8 @@ namespace mongo {
             _oldN(0),
             _nYields(),
             _nChunkSkips(),
-            _chunkManager( shardingState.needChunkManager(pq.ns()) ? 
-                           shardingState.getChunkManager(pq.ns()) : ShardChunkManagerPtr() ),
+            _chunkManager( shardingState.needShardChunkManager(pq.ns()) ? 
+                           shardingState.getShardChunkManager(pq.ns()) : ShardChunkManagerPtr() ),
             _inMemSort(false),
             _capped(false),
             _saveClientCursor(false),

s/d_logic.h

@@ -52,8 +52,8 @@ namespace mongo {
 
         void appendInfo( BSONObjBuilder& b );
 
-        bool needChunkManager( const string& ns ) const;
-        ShardChunkManagerPtr getChunkManager( const string& ns );
+        bool needShardChunkManager( const string& ns ) const;
+        ShardChunkManagerPtr getShardChunkManager( const string& ns );
 
         bool inCriticalMigrateSection();
     private:

s/d_state.cpp

@@ -167,7 +167,7 @@ namespace mongo {
 
     }
 
-    bool ShardingState::needChunkManager( const string& ns ) const {
+    bool ShardingState::needShardChunkManager( const string& ns ) const {
         if ( ! _enabled )
             return false;
 
@@ -177,7 +177,7 @@ namespace mongo {
         return true;
     }
 
-    ShardChunkManagerPtr ShardingState::getChunkManager( const string& ns ){
+    ShardChunkManagerPtr ShardingState::getShardChunkManager( const string& ns ){
         ConfigVersion version;
         { 
             // check cache
@@ -459,7 +459,7 @@ namespace mongo {
 
             {
                 dbtemprelease unlock;
-                shardingState.getChunkManager( ns );
+                shardingState.getShardChunkManager( ns );
             }
 
             return true;