JAVA-613: Added numDocuments property to InUseConnectionInfo to provide more info for batch inserts

Author: jyemin

src/main/com/mongodb/DBPort.java

@@ -110,8 +110,8 @@ private synchronized Response go(OutMessage msg, DBCollection coll, boolean forc
             throw new IllegalStateException( "_out shouldn't be null" );
 
         try {
-            _activeState = new ActiveState(msg);
             msg.prepare();
+            _activeState = new ActiveState(msg);
             msg.pipe( _out );
 
             if ( _pool != null )

src/main/com/mongodb/InUseConnectionInfo.java

@@ -28,13 +28,15 @@ public class InUseConnectionInfo {
             opCode = null;
             query = null;
             threadName = null;
+            numDocuments = 0;
         }
         else {
             durationMS = (System.nanoTime() - activeState.startTime) / 1000000;
             namespace = activeState.outMessage.getNamespace();
             opCode = activeState.outMessage.getOpCode();
             query = activeState.outMessage.getQuery() != null ? activeState.outMessage.getQuery().toString() : null;
             threadName = activeState.threadName;
+            numDocuments = activeState.outMessage.getNumDocuments();
         }
         localPort = port.getLocalPort();
     }
@@ -63,10 +65,15 @@ public String getThreadName() {
         return threadName;
     }
 
+    public int getNumDocuments() {
+        return numDocuments;
+    }
+
     private final String namespace;
     private final OutMessage.OpCode opCode;
     private final String query;
     private final int localPort;
     private final long durationMS;
     private final String threadName;
+    private final int numDocuments;
 }

src/main/com/mongodb/OutMessage.java

@@ -257,13 +257,18 @@ String getNamespace() {
         return _collection != null ? _collection.getFullName() : null;
     }
 
+    synchronized int getNumDocuments() {
+        return _numDocuments;
+    }
+
     @Override
-    public int putObject(BSONObject o) {
+    public synchronized int putObject(BSONObject o) {
         // check max size
         int objectSize = _encoder.writeObject(_buf, o);
         if (objectSize > Math.max(_mongo.getConnector().getMaxBsonObjectSize(), Bytes.MAX_OBJECT_SIZE)) {
             throw new MongoInternalException("DBObject of size " + objectSize + " is over Max BSON size " + _mongo.getMaxBsonObjectSize());
         }
+        _numDocuments++;
         return objectSize;
     }
 
@@ -275,4 +280,5 @@ public int putObject(BSONObject o) {
     private final int _queryOptions;
     private final DBObject _query;
     private final DBEncoder _encoder;
+    private int _numDocuments;
 }

src/main/com/mongodb/tools/ConnectionPoolStat.java

@@ -148,19 +148,20 @@ private static void printUsage() {
         System.out.println("  -n [ --rowcount ] arg  number of times to print stats (0 for indefinite)");
         System.out.println();
         System.out.println("Fields");
-        System.out.println("  objectName                   - name of the JMX bean for this connection pool");
-        System.out.println("  host                         - host of the mongod/mongos server");
-        System.out.println("  port                         - port of the mongod/mongos server");
-        System.out.println("  size                         - max # of connections allowed");
-        System.out.println("  total                        - # of connections allocated");
-        System.out.println("  inUse                        - # of connections in use");
-        System.out.println("  inUseConnections             - list of all in use connections");
-        System.out.println("  inUseConnections.namespace   - namespace on which connection is operating");
-        System.out.println("  inUseConnections.opCode      - operation connection is executing");
-        System.out.println("  inUseConnections.query       - query the connection is executing (for query/update/remove)");
-        System.out.println("  inUseConnections.threadName  - name of thread on which connection is executing");
-        System.out.println("  inUseConnections.durationMS  - duration that the operation has been executing so far");
-        System.out.println("  inUseConnections.localPort   - local port of the connection");
+        System.out.println("  objectName                     - name of the JMX bean for this connection pool");
+        System.out.println("  host                           - host of the mongod/mongos server");
+        System.out.println("  port                           - port of the mongod/mongos server");
+        System.out.println("  size                           - max # of connections allowed");
+        System.out.println("  total                          - # of connections allocated");
+        System.out.println("  inUse                          - # of connections in use");
+        System.out.println("  inUseConnections               - list of all in use connections");
+        System.out.println("  inUseConnections.namespace     - namespace on which connection is operating");
+        System.out.println("  inUseConnections.opCode        - operation connection is executing");
+        System.out.println("  inUseConnections.query         - query the connection is executing (for query/update/remove)");
+        System.out.println("  inUseConnections.numDocuments  - # of documents in the message (mostly relevant for batch inserts)");
+        System.out.println("  inUseConnections.threadName    - name of thread on which connection is executing");
+        System.out.println("  inUseConnections.durationMS    - duration that the operation has been executing so far");
+        System.out.println("  inUseConnections.localPort     - local port of the connection");
     }
 
     private void print(PrintWriter pw) throws JMException, IOException {
@@ -197,6 +198,7 @@ private void printInUseConnections(final ObjectName objectName, final PrintWrite
             printCompositeDataAttribute("namespace", compositeData, pw);
             printCompositeDataAttribute("opCode", compositeData, pw);
             printCompositeDataAttribute("query", compositeData, pw, StringType.JSON);
+            printCompositeDataAttribute("numDocuments", compositeData, pw);
             printCompositeDataAttribute("threadName", compositeData, pw);
             printCompositeDataAttribute("durationMS", compositeData, pw);
             printCompositeDataAttribute("localPort", compositeData, pw, Position.LAST);