[JAVA-273: many db commands (stats, list db, group, etc) should succeed if slaveOk=true and at least one server is up]

Author: agirbal

src/main/com/mongodb/DB.java

@@ -80,20 +80,21 @@ public final DBCollection getCollection( String name ){
     /**
      * Creates a collection with a given name and options.
      * If the collection does not exist, a new collection is created.
+     * Note that if the options parameter is null, the creation will be deferred to when the collection is written to.
      * Possible options:
      * <dl>
      * <dt>capped</dt><dd><i>boolean</i>: if the collection is capped</dd>
      * <dt>size</dt><dd><i>int</i>: collection size (in bytes)</dd>
      * <dt>max</dt><dd><i>int</i>: max number of documents</dd>
      * </dl>
      * @param name the name of the collection to return
-     * @param o options
+     * @param options options
      * @return the collection
      */
-    public final DBCollection createCollection( String name, DBObject o ){
-        if ( o != null ){
+    public final DBCollection createCollection( String name, DBObject options ){
+        if ( options != null ){
             DBObject createCmd = new BasicDBObject("create", name);
-            createCmd.putAll(o);
+            createCmd.putAll(options);
             CommandResult result = command(createCmd);
             result.throwOnError();
         }
@@ -173,6 +174,20 @@ public CommandResult command( String cmd )
         return command( new BasicDBObject( cmd , Boolean.TRUE ) );
     }
 
+    /**
+     * Executes a database command.
+     * This method constructs a simple dbobject and calls {@link DB#command(com.mongodb.DBObject, int)  }
+     * @see <a href="http://mongodb.onconfluence.com/display/DOCS/List+of+Database+Commands">List of Commands</a>
+     * @param cmd command to execute
+     * @param options query options to use
+     * @return result of command from the database
+     * @throws MongoException
+     */
+    public CommandResult command( String cmd, int options  )
+        throws MongoException {
+        return command( new BasicDBObject( cmd , Boolean.TRUE ), options );
+    }
+
     /**
      * evaluates a function on the database.
      * This is useful if you need to touch a lot of data lightly, in which case network transfer could be a bottleneck.
@@ -495,13 +510,13 @@ static DBObject _authCommand( String nonce , String username , byte[] hash ){
     }
 
     private CommandResult _doauth( String username , byte[] hash ){
-        CommandResult res = command(new BasicDBObject("getnonce", 1));
+        CommandResult res = command(new BasicDBObject("getnonce", 1), getOptions());
         if ( ! res.ok() ){
             throw new MongoException(res);
         }
 
         DBObject cmd = _authCommand( res.getString( "nonce" ) , username , hash );
-        return command(cmd);
+        return command(cmd, getOptions());
     }
 
     /**

src/main/com/mongodb/DBCollection.java

@@ -857,7 +857,7 @@ 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() );
+        CommandResult res =  _db.command( cmd.toDBObject(), getOptions() );
         res.throwOnError();
         return (DBObject)res.get( "retval" );
     }
@@ -875,7 +875,7 @@ public DBObject group( GroupCommand cmd ) {
     public DBObject group( DBObject args )
         throws MongoException {
         args.put( "ns" , getName() );  
-        CommandResult res =  _db.command( new BasicDBObject( "group" , args ) );
+        CommandResult res =  _db.command( new BasicDBObject( "group" , args ), getOptions() );
         res.throwOnError();
         return (DBObject)res.get( "retval" );
     }
@@ -902,7 +902,7 @@ public List distinct( String key , DBObject query ){
             .add( "query" , query )
             .get();
 
-        CommandResult res = _db.command( c );
+        CommandResult res = _db.command( c, getOptions() );
         res.throwOnError();
         return (List)(res.get( "values" ));
     }
@@ -965,7 +965,12 @@ public MapReduceOutput mapReduce( String map , String reduce , String outputTarg
      */
     public MapReduceOutput mapReduce( MapReduceCommand command ) throws MongoException{
         DBObject cmd = command.toDBObject();
-        CommandResult res = _db.command( cmd );
+        // if type in inline, then query options like slaveOk is fine
+        CommandResult res = null;
+        if (command.getOutputType() == MapReduceCommand.OutputType.INLINE)
+            res = _db.command( cmd, getOptions() );
+        else
+            res = _db.command( cmd );
         res.throwOnError();
         return new MapReduceOutput( this , cmd, res );
     }
@@ -1032,7 +1037,7 @@ public void dropIndex( String name )
      * @return
      */
     public CommandResult getStats() {
-        return(getDB().command(new BasicDBObject("collstats", getName())));
+        return getDB().command(new BasicDBObject("collstats", getName()), getOptions());
     }
 
     /**

src/main/com/mongodb/Mongo.java

@@ -307,7 +307,16 @@ public DB getDB( String dbname ){
             return temp;
         return db;
     }
-    
+
+    /**
+     * gets a collection of DBs used by the driver since this Mongo instance was created.
+     * This may include DBs that exist in the client but not yet on the server.
+     * @return
+     */
+    public Collection<DB> getUsedDatabases(){
+        return _dbs.values();
+    }
+
     /**
      * gets a list of all database names present on the server
      * @return
@@ -320,7 +329,7 @@ public List<String> getDatabaseNames()
         cmd.put("listDatabases", 1);
 
 
-        BasicDBObject res = (BasicDBObject)getDB( "admin" ).command(cmd);
+        BasicDBObject res = (BasicDBObject)getDB( "admin" ).command(cmd, getOptions());
 
         if (res.getInt("ok" , 0 ) != 1 )
             throw new MongoException( "error listing databases : " + res );