added readpreference to calls

Author: Steve Briskin

src/main/com/mongodb/DBCollection.java

@@ -862,45 +862,82 @@ public long count(DBObject query){
     /**
      *  calls {@link DBCollection#getCount(com.mongodb.DBObject, com.mongodb.DBObject)} with an empty query and null fields.
      *  @return number of documents that match query
-     * @throws MongoException
+     *  @throws MongoException
      */
     public long getCount(){
         return getCount(new BasicDBObject(), null);
     }
+    
+    /**
+     *  calls {@link DBCollection#getCount(com.mongodb.DBObject, com.mongodb.DBObject, com.mongodb.ReadPreference)} with empty query and null fields.
+     *  @param readPrefs ReadPreferences for this command
+     *  @return number of documents that match query
+     *  @throws MongoException
+     */
+    public long getCount(ReadPreference readPrefs){
+        return getCount(new BasicDBObject(), null, readPrefs);
+    }
 
     /**
      *  calls {@link DBCollection#getCount(com.mongodb.DBObject, com.mongodb.DBObject)} with null fields.
      *  @param query query to match
      *  @return
-     * @throws MongoException
+     *  @throws MongoException
      */ 
     public long getCount(DBObject query){
         return getCount(query, null);
     }
 
+    
     /**
      *  calls {@link DBCollection#getCount(com.mongodb.DBObject, com.mongodb.DBObject, long, long)} with limit=0 and skip=0
      *  @param query query to match
      *  @param fields fields to return
      *  @return
-     * @throws MongoException
+     *  @throws MongoException
      */
     public long getCount(DBObject query, DBObject fields){
         return getCount( query , fields , 0 , 0 );
     }
+    
+    /**
+     *  calls {@link DBCollection#getCount(com.mongodb.DBObject, com.mongodb.DBObject, long, long, com.mongodb.ReadPreference)} with limit=0 and skip=0
+     *  @param query query to match
+     *  @param fields fields to return
+     *  @param readPrefs ReadPreferences for this command
+     *  @return
+     *  @throws MongoException
+     */
+    public long getCount(DBObject query, DBObject fields, ReadPreference readPrefs){
+        return getCount( query , fields , 0 , 0, readPrefs );
+    }
 
+    /**
+     *  calls {@link DBCollection#getCount(com.mongodb.DBObject, com.mongodb.DBObject, long, long, com.mongodb.ReadPreference)} with the DBCollection's ReadPreference
+     *  @param query query to match
+     *  @param fields fields to return
+     *  @param limit limit the count to this value
+     *  @param skip skip number of entries to skip
+     *  @return
+     *  @throws MongoException
+     */
+    public long getCount(DBObject query, DBObject fields, long limit, long skip){
+    	return getCount(query, fields, limit, skip, getReadPreference());
+    }
+    
     /**
      *  Returns the number of documents in the collection
      *  that match the specified query
      *
      *  @param query query to select documents to count
      *  @param fields fields to return
      *  @param limit limit the count to this value
-     * @param skip number of entries to skip
-     * @return number of documents that match query and fields
-     * @throws MongoException
+     *  @param skip number of entries to skip
+     *  @param readPrefs ReadPreferences for this command
+     *  @return number of documents that match query and fields
+     *  @throws MongoException
      */
-    public long getCount(DBObject query, DBObject fields, long limit, long skip ){
+    public long getCount(DBObject query, DBObject fields, long limit, long skip, ReadPreference readPrefs ){
 
         BasicDBObject cmd = new BasicDBObject();
         cmd.put("count", getName());
@@ -914,8 +951,7 @@ public long getCount(DBObject query, DBObject fields, long limit, long skip ){
         if ( skip > 0 )
             cmd.put( "skip" , skip );
 
-        CommandResult res = _db.command(cmd,getOptions(),getReadPreference());
-
+        CommandResult res = _db.command(cmd,getOptions(),readPrefs);
         if ( ! res.ok() ){
             String errmsg = res.getErrorMessage();
 
@@ -930,6 +966,10 @@ public long getCount(DBObject query, DBObject fields, long limit, long skip ){
 
         return res.getLong("n");
     }
+    
+    CommandResult command(DBObject cmd, int options, ReadPreference readPrefs){
+    	return _db.command(cmd,getOptions(),readPrefs);
+    }
 
     /**
      * Calls {@link DBCollection#rename(java.lang.String, boolean)} with dropTarget=false
@@ -973,8 +1013,8 @@ public DBCollection rename( String newName, boolean dropTarget ){
      */
     public DBObject group( DBObject key , DBObject cond , DBObject initial , String reduce ){
         return group( key , cond , initial , reduce , null );
-    }
-
+    }    
+    
     /**
      * Applies a group operation
      * @param key - { a : true }
@@ -990,6 +1030,23 @@ public DBObject group( DBObject key , DBObject cond , DBObject initial , String
         GroupCommand cmd = new GroupCommand(this, key, cond, initial, reduce, finalize);
         return group( cmd );
     }
+    
+    /**
+     * Applies a group operation
+     * @param key - { a : true }
+     * @param cond - optional condition on query
+     * @param reduce javascript reduce function
+     * @param initial initial value for first match on a key
+     * @param finalize An optional function that can operate on the result(s) of the reduce function.
+     * @param readPrefs ReadPreferences for this command
+     * @return
+     * @throws MongoException
+     * @see <a href="http://www.mongodb.org/display/DOCS/Aggregation">http://www.mongodb.org/display/DOCS/Aggregation</a>
+     */
+    public DBObject group( DBObject key , DBObject cond , DBObject initial , String reduce , String finalize, ReadPreference readPrefs ){
+        GroupCommand cmd = new GroupCommand(this, key, cond, initial, reduce, finalize);
+        return group( cmd, readPrefs );
+    }
 
     /**
      * Applies a group operation
@@ -999,12 +1056,23 @@ public DBObject group( DBObject key , DBObject cond , DBObject initial , String
      * @see <a href="http://www.mongodb.org/display/DOCS/Aggregation">http://www.mongodb.org/display/DOCS/Aggregation</a>
      */
     public DBObject group( GroupCommand cmd ) {
-        CommandResult res =  _db.command( cmd.toDBObject(), getOptions(), getReadPreference() );
+        return group(cmd, getReadPreference());
+    }
+
+    /**
+     * Applies a group operation
+     * @param cmd the group command
+     * @param readPrefs ReadPreferences for this command
+     * @return
+     * @throws MongoException
+     * @see <a href="http://www.mongodb.org/display/DOCS/Aggregation">http://www.mongodb.org/display/DOCS/Aggregation</a>
+     */
+    public DBObject group( GroupCommand cmd, ReadPreference readPrefs ) {
+        CommandResult res =  _db.command( cmd.toDBObject(), getOptions(), readPrefs );
         res.throwOnError();
         return (DBObject)res.get( "retval" );
     }
 
-
     /**
      * @deprecated prefer the {@link DBCollection#group(com.mongodb.GroupCommand)} which is more standard
      * Applies a group operation
@@ -1030,6 +1098,17 @@ public DBObject group( DBObject args ){
     public List distinct( String key ){
         return distinct( key , new BasicDBObject() );
     }
+    
+    /**
+     * find distinct values for a key
+     * @param key
+     * @param readPrefs
+     * @return
+     * @throws MongoException
+     */
+    public List distinct( String key, ReadPreference readPrefs ){
+        return distinct( key , new BasicDBObject(), readPrefs );
+    }
 
     /**
      * find distinct values for a key
@@ -1039,17 +1118,29 @@ public List distinct( String key ){
      * @throws MongoException
      */
 	public List distinct( String key , DBObject query ){
+        return distinct(key, query, getReadPreference());
+    }
+
+    /**
+     * find distinct values for a key
+     * @param key
+     * @param query query to match
+     * @param readPrefs
+     * @return
+     * @throws MongoException
+     */
+	public List distinct( String key , DBObject query, ReadPreference readPrefs ){
         DBObject c = BasicDBObjectBuilder.start()
             .add( "distinct" , getName() )
             .add( "key" , key )
             .add( "query" , query )
             .get();
 
-        CommandResult res = _db.command( c, getOptions(), getReadPreference() );
+        CommandResult res = _db.command( c, getOptions(), readPrefs );
         res.throwOnError();
         return (List)(res.get( "values" ));
     }
-
+	
     /**
      * performs a map reduce operation
      * Runs the command in REPLACE output mode (saves to named collection)

src/main/com/mongodb/DBCursor.java

@@ -578,7 +578,7 @@ public int count() {
         if ( _collection._db == null )
             throw new IllegalArgumentException( "why is _collection._db null" );
 
-        return (int)_collection.getCount(this._query, this._keysWanted);
+        return (int)_collection.getCount(this._query, this._keysWanted, getReadPreference());
     }
 
     /**
@@ -594,7 +594,7 @@ public int size() {
         if ( _collection._db == null )
             throw new IllegalArgumentException( "why is _collection._db null" );
 
-        return (int)_collection.getCount(this._query, this._keysWanted, this._limit, this._skip );
+        return (int)_collection.getCount(this._query, this._keysWanted, this._limit, this._skip, getReadPreference() );
     }