[JAVA-289]: driver does not allow doc sizes matching the server limit, for both insert and find

Author: agirbal

src/main/com/mongodb/Bytes.java

@@ -48,8 +48,12 @@ public class Bytes extends BSON {
 
     /** Little-endian */
     public static final ByteOrder ORDER = ByteOrder.LITTLE_ENDIAN;
-    
-    static final int MAX_OBJECT_SIZE = 1024 * 1024 * 4;
+
+    /** this size is used to prevent insertion of objects that are too large for db */
+    static final int MAX_OBJECT_SIZE = 1024 * 1024 * 32;
+
+    /** target size of an insert batch */
+    static final int BATCH_INSERT_SIZE = 1024 * 1024 * 16;
 
     static final int CONNECTIONS_PER_HOST = Integer.parseInt( System.getProperty( "MONGO.POOLSIZE" , "10" ) );
 

src/main/com/mongodb/DBApiLayer.java

@@ -220,10 +220,13 @@ protected WriteResult insert(DBObject[] arr, boolean shouldApply , com.mongodb.W
                 for ( ; cur<arr.length; cur++ ){
                     DBObject o = arr[cur];
                     int sz = om.putObject( o );
+                    // server is better suited to decide on object size
+                    // indeed driver may be talking to dbs with different limits
+                    // also max size is tough to catch on updates, so here it's just an extra check
                     if ( sz > Bytes.MAX_OBJECT_SIZE )
                         throw new IllegalArgumentException( "object too big: " + sz );
 
-                    if ( om.size() > ( 4 * 1024 * 1024 ) ){
+                    if ( om.size() > Bytes.BATCH_INSERT_SIZE ){
                         cur++;
                         break;
                     }

src/main/com/mongodb/util/JSON.java

@@ -155,7 +155,7 @@ public static void serialize( Object o , StringBuilder buf ){
             return;
 	}
 
-        if (o instanceof byte[]) {
+        if (o instanceof byte[] || o instanceof Binary) {
             buf.append("<Binary Data>");
             return;
         }

src/main/org/bson/BSONDecoder.java

@@ -429,7 +429,8 @@ String readCStr()
         String readUTF8String()
             throws IOException {
             int size = readInt();
-            if ( size <= 0 || size > ( 3 * 1024 * 1024 ) )
+            // this is just protection in case it's corrupted, to avoid huge strings
+            if ( size <= 0 || size > ( 32 * 1024 * 1024 ) )
                 throw new BSONException( "bad string size: " + size );
 
             if ( size < _inputBuffer.length / 2 ){

src/test/com/mongodb/JavaClientTest.java

@@ -534,13 +534,15 @@ public void testObjectIdCompat2(){
 
     @Test
     public void testLargeBulkInsert(){
+        // max size should be obtained from server
+        int maxObjSize = 16 * 1024 * 1024;
         DBCollection c = _db.getCollection( "largebulk" );
         c.drop();
         String s = "asdasdasd";
         while ( s.length() < 10000 )
             s += s;
         List<DBObject> l = new ArrayList<DBObject>();
-        final int num = 3 * ( Bytes.MAX_OBJECT_SIZE / s.length() );
+        final int num = 3 * ( maxObjSize / s.length() );
 
         for ( int i=0; i<num; i++ ){
             l.add( BasicDBObjectBuilder.start()
@@ -553,7 +555,7 @@ public void testLargeBulkInsert(){
         assertEquals( num , c.find().count() );
 
         s = l.toString();
-        assertTrue( s.length() > Bytes.MAX_OBJECT_SIZE );
+        assertTrue( s.length() > maxObjSize );
 
         boolean worked = false;
         try {