JAVA-390: Make it possible to override the bson decoder, not just the callback

JAVA-391: add a new BSON decoder and bson object type that uses a lazy approach like C++ code

Author: agirbal

src/main/com/mongodb/DBCollection.java

@@ -1269,6 +1269,14 @@ public void resetOptions(){
     public int getOptions(){
         return _options.get();
     }
+
+    public void setDBDecoderFactory(DBDecoderFactory dbDecoderFactory) {
+        this.dbDecoderFactory = dbDecoderFactory;
+    }
+
+    public DBDecoderFactory getDBDecoderFactory() {
+        return dbDecoderFactory;
+    }
 
     final DB _db;
 
@@ -1284,4 +1292,6 @@ public int getOptions(){
     private ReflectionDBObject.JavaWrapper _wrapper = null;
 
     final private Set<String> _createdIndexes = new HashSet<String>();
+    
+    private DBDecoderFactory dbDecoderFactory;
 }

src/main/com/mongodb/DBDecoder.java

@@ -0,0 +1,31 @@
+/**
+ *      Copyright (C) 2008 10gen Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package com.mongodb;
+
+import java.io.IOException;
+import java.io.InputStream;
+import org.bson.BSONDecoder;
+
+/**
+ *
+ */
+public interface DBDecoder extends BSONDecoder {
+    public DBCallback getDBCallback(DBCollection collection);
+    
+    public DBObject decode( byte[] b, DBCollection collection );
+
+    public DBObject decode( InputStream in, DBCollection collection ) throws IOException;
+}

src/main/com/mongodb/DBDecoderFactory.java

@@ -0,0 +1,25 @@
+/**
+ *      Copyright (C) 2008 10gen Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package com.mongodb;
+
+/**
+ *
+ */
+public interface DBDecoderFactory {
+
+    public DBDecoder create( );
+    
+}

src/main/com/mongodb/DBPort.java

@@ -58,6 +58,7 @@ public DBPort( ServerAddress addr ){
         _hashCode = _addr.hashCode();
 
         _logger = Logger.getLogger( _rootLogger.getName() + "." + addr.toString() );
+        _decoder = _options.dbDecoderFactory.create();
     }
 
     Response call( OutMessage msg , DBCollection coll )
@@ -107,7 +108,13 @@ private synchronized Response go( OutMessage msg , DBCollection coll , boolean f
                 return null;
 
             _processingResponse = true;
-            return new Response( _sa , coll , _in , _decoder);
+            DBDecoder decoder = _decoder;
+            if (coll.getDBDecoderFactory() != null) {
+                // custom decoder for this collection, use it
+                // here we have to create a new decoder per call, pool would be nicer
+                decoder = coll.getDBDecoderFactory().create();
+            }
+            return new Response( _sa , coll , _in , decoder);
         }
         catch ( IOException ioe ){
             close();
@@ -305,7 +312,7 @@ public DBPortPool getPool() {
     final DBPortPool _pool;
     final MongoOptions _options;
     final Logger _logger;
-    final BSONDecoder _decoder = new BSONDecoder();
+    final DBDecoder _decoder;
 
     private Socket _socket;
     private InputStream _in;

src/main/com/mongodb/DefaultDBDecoder.java

@@ -0,0 +1,61 @@
+/**
+ *      Copyright (C) 2008 10gen Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package com.mongodb;
+
+import java.io.IOException;
+import java.io.InputStream;
+import org.bson.BSONCallback;
+import org.bson.BSONObject;
+import org.bson.BasicBSONDecoder;
+
+/**
+ *
+ * @author antoine
+ */
+public class DefaultDBDecoder extends BasicBSONDecoder implements DBDecoder {
+
+    static class DefaultFactory implements DBDecoderFactory {
+        @Override
+        public DBDecoder create( ){
+            return new DefaultDBDecoder( );
+        }
+    }
+
+    public static DBDecoderFactory FACTORY = new DefaultFactory();
+
+    public DefaultDBDecoder( ){
+    }
+        
+    public DBCallback getDBCallback(DBCollection collection) {
+        // brand new callback every time
+        return new DefaultDBCallback(collection);
+    }
+
+    public DBObject decode(byte[] b, DBCollection collection) {
+        DBCallback cbk = getDBCallback(collection);
+        cbk.reset();
+        decode(b, cbk);
+        return (DBObject) cbk.get();
+    }
+
+    public DBObject decode(InputStream in,  DBCollection collection) throws IOException {
+        DBCallback cbk = getDBCallback(collection);
+        cbk.reset();
+        decode(in, cbk);
+        return (DBObject) cbk.get();
+    }
+
+}

src/main/com/mongodb/LazyDBCallback.java

@@ -0,0 +1,30 @@
+/**
+ *      Copyright (C) 2008 10gen Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package com.mongodb;
+
+import org.bson.LazyBSONCallback;
+
+/**
+ *
+ */
+public class LazyDBCallback extends LazyBSONCallback implements DBCallback {
+
+    @Override
+    public Object createObject(byte[] data, int offset) {
+        return new LazyDBObject(data, offset, this);
+    }
+    
+}

src/main/com/mongodb/LazyDBDecoder.java

@@ -0,0 +1,58 @@
+/**
+ *      Copyright (C) 2008 10gen Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package com.mongodb;
+
+import java.io.IOException;
+import java.io.InputStream;
+import org.bson.LazyBSONDecoder;
+
+/**
+ *
+ */
+public class LazyDBDecoder extends LazyBSONDecoder implements DBDecoder {
+    static class LazyDBDecoderFactory implements DBDecoderFactory {
+        @Override
+        public DBDecoder create( ){
+            return new LazyDBDecoder();
+        }
+    }
+
+    public static DBDecoderFactory FACTORY = new LazyDBDecoderFactory();
+
+    public LazyDBDecoder( ){
+    }
+        
+    public DBCallback getDBCallback(DBCollection collection) {
+        // callback doesnt do anything special, unique per decoder
+        return _callback;
+    }
+
+    public DBObject decode(byte[] b, DBCollection collection) {
+        DBCallback cbk = getDBCallback(collection);
+        cbk.reset();
+        decode(b, cbk);
+        return (DBObject) cbk.get();
+    }
+
+    public DBObject decode(InputStream in,  DBCollection collection) throws IOException {
+        DBCallback cbk = getDBCallback(collection);
+        cbk.reset();
+        decode(in, cbk);
+        return (DBObject) cbk.get();
+    }
+
+    DBCallback _callback = new LazyDBCallback();
+}

src/main/com/mongodb/LazyDBObject.java

@@ -0,0 +1,37 @@
+/**
+ *      Copyright (C) 2008 10gen Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package com.mongodb;
+
+import org.bson.LazyBSONCallback;
+import org.bson.LazyBSONObject;
+
+public class LazyDBObject extends LazyBSONObject implements DBObject {
+
+    public void markAsPartialObject() {
+    }
+
+    public boolean isPartialObject() {
+        return false;
+    }
+    
+    public LazyDBObject(byte[] data, LazyBSONCallback cbk) {
+        this(data, 0, cbk);
+    }
+
+    public LazyDBObject(byte[] data, int offset, LazyBSONCallback cbk) {
+        super(data, offset, cbk);
+    }
+}

src/main/com/mongodb/MongoOptions.java

@@ -41,7 +41,7 @@ public void reset(){
         w = 0;
         wtimeout = 0;
         fsync = false;
-        dbCallbackFactory = DefaultDBCallback.FACTORY;
+        dbDecoderFactory = DefaultDBDecoder.FACTORY;
     }
 
     /**
@@ -126,7 +126,7 @@ else if (safe)
      * Override the DBCallback factory. Default is for the standard Mongo Java
      * driver configuration.
      */
-    public DBCallbackFactory dbCallbackFactory;
+    public DBDecoderFactory dbDecoderFactory;
 
     /**
      * If <b>true</b> the driver sends a getLastError command after

src/main/com/mongodb/Response.java

@@ -26,7 +26,7 @@
 
 class Response {
 
-    Response( ServerAddress addr , DBCollection collection ,  InputStream in, BSONDecoder decoder)
+    Response( ServerAddress addr , DBCollection collection ,  InputStream in, DBDecoder decoder)
         throws IOException {
 
         _host = addr;
@@ -54,16 +54,12 @@ class Response {
         else
             _objects = new ArrayList<DBObject>( _num );
 
-        DBCallback c = collection.getDB().getMongo().getMongoOptions().dbCallbackFactory.create( collection );
-
         for ( int i=0; i < _num; i++ ){
             if ( user._toGo < 5 )
                 throw new IOException( "should have more objects, but only " + user._toGo + " bytes left" );
-            c.reset();
-            decoder.decode( user , c );
-
             // TODO: By moving to generics, you can remove these casts (and requirement to impl DBOBject).
-            _objects.add( (DBObject)c.get() );
+
+            _objects.add( decoder.decode( user, collection ) );
         }
 
         if ( user._toGo != 0 )