[JAVA-251]: some renaming and convenience added to map reduce

Author: agirbal

src/main/com/mongodb/DBCollection.java

@@ -978,9 +978,10 @@ public MapReduceOutput mapReduce( String map , String reduce , String outputTarg
      * @throws MongoException
      */
     public MapReduceOutput mapReduce( MapReduceCommand command ) throws MongoException{
-        CommandResult res = _db.command( command.toDBObject() );
+        DBObject cmd = command.toDBObject();
+        CommandResult res = _db.command( cmd );
         res.throwOnError();
-        return new MapReduceOutput( this , res );
+        return new MapReduceOutput( this , cmd, res );
     }
 
     /**
@@ -996,7 +997,7 @@ public MapReduceOutput mapReduce( DBObject command ) throws MongoException{
             throw new IllegalArgumentException( "need mapreduce arg" );
         CommandResult res = _db.command( command );
         res.throwOnError();
-        return new MapReduceOutput( this , res );
+        return new MapReduceOutput( this , command, res );
     }
 
     /**

src/main/com/mongodb/MapReduceCommand.java

@@ -19,13 +19,19 @@
 
 public class MapReduceCommand {
 
-    static enum OutputType {
-        STANDARD, MERGE, REDUCE, INLINE
+    /**
+     * INLINE - Return results inline, no result is written to the DB server
+     * REPLACE - Save the job output to a collection, replacing its previous content
+     * MERGE - Merge the job output with the existing contents of outputTarget collection
+     * REDUCE - Reduce the job output with the existing contents of outputTarget collection
+     */
+    public static enum OutputType {
+        REPLACE, MERGE, REDUCE, INLINE
     };
 
     /**
      * Represents the command for a map reduce operation
-     * Runs the command in STANDARD output to a named collection
+     * Runs the command in REPLACE output type to a named collection
      * 
      * @param input
      *            the collection to read from
@@ -46,7 +52,7 @@ static enum OutputType {
         _map = map;
         _reduce = reduce;
         _outputTarget = outputTarget;
-        _outputType = OutputType.STANDARD;
+        _outputType = OutputType.REPLACE;
         _query = query;
     }
 
@@ -164,10 +170,6 @@ public String getOutputTarget(){
 
     /**
      * Gets the OutputType for this instance.
-     * INLINE - Return results inline
-     * STANDARD - Save the job output to outputTarget
-     * MERGE - Merge the job output with the existing contents of outputTarget
-     * REDUCE - Reduce the job output with the existing contents of outputTarget
      * @return The outputType.
      */
     public OutputType getOutputType(){
@@ -273,7 +275,7 @@ DBObject toDBObject() {
             case INLINE: 
                 builder.add("out", new BasicDBObject("inline", 1));
                 break;
-            case STANDARD: 
+            case REPLACE:
                 builder.add("out", _outputTarget);
                 break;
             case MERGE: 

src/main/com/mongodb/MapReduceOutput.java

@@ -8,8 +8,9 @@
  */
 public class MapReduceOutput {
 
-    MapReduceOutput( DBCollection from , BasicDBObject raw ){
+    MapReduceOutput( DBCollection from , DBObject cmd, BasicDBObject raw ){
         _raw = raw;
+        _cmd = cmd;
 
         if ( raw.containsKey( "results" ) ) {
             _coll = null;
@@ -52,6 +53,10 @@ public BasicDBObject getRaw(){
         return _raw;
     }
 
+    public DBObject getCommand() {
+        return _cmd;
+    }
+
     public String toString(){
         return _raw.toString();
     }
@@ -62,4 +67,5 @@ public String toString(){
     final Iterable<DBObject> _resultSet;
     final DBCollection _coll;
     final BasicDBObject _counts;
+    final DBObject _cmd;
 }