Merge remote-tracking branch 'origin/master'

Author: breinero-zz

src/main/com/mongodb/DB.java

@@ -150,7 +150,7 @@ public CommandResult command( DBObject cmd, DBEncoder encoder ) throws MongoExce
 
     public CommandResult command( DBObject cmd , int options, DBEncoder encoder )
             throws MongoException {
-        return command(cmd, options, getReadPreference(), encoder);
+        return command(cmd, options, null, encoder);
     }
 
     public CommandResult command( DBObject cmd , int options, ReadPreference readPrefs )
@@ -295,8 +295,7 @@ public Set<String> getCollectionNames()
         if (namespaces == null)
             throw new RuntimeException("this is impossible");
 
-        // TODO - Is ReadPreference OK for collection Names?
-        Iterator<DBObject> i = namespaces.__find(new BasicDBObject(), null, 0, 0, 0, getOptions(), null, null);
+        Iterator<DBObject> i = namespaces.__find(new BasicDBObject(), null, 0, 0, 0, getOptions(), getReadPreference(), null);
         if (i == null)
             return new HashSet<String>();
 

src/main/com/mongodb/DBCollection.java

@@ -378,12 +378,43 @@ public DBObject findAndModify(DBObject query, DBObject fields, DBObject sort, bo
             throw new MongoException("FindAndModify: Remove cannot be mixed with the Update, or returnNew params!");
 
         CommandResult res = this._db.command( cmd );
-        if (res.ok() || res.getErrorMessage().equals( "No matching object found" ))
-            return (DBObject) res.get( "value" );
+        if (res.ok() || res.getErrorMessage().equals( "No matching object found" )) {
+            return replaceWithObjectClass((DBObject) res.get( "value" ));
+        }
         res.throwOnError();
         return null;
     }
 
+    /**
+     * Doesn't yet handle internal classes properly, so this method only does something if object class is set but
+     * no internal classes are set.
+     *
+     * @param oldObj  the original value from the command result
+     * @return replaced object if necessary, or oldObj
+     */
+    private DBObject replaceWithObjectClass(DBObject oldObj) {
+        if (oldObj == null || getObjectClass() == null &  _internalClass.isEmpty()) {
+            return oldObj;
+        }
+
+        DBObject newObj = instantiateObjectClassInstance();
+
+        for (String key : oldObj.keySet()) {
+            newObj.put(key, oldObj.get(key));
+        }
+        return newObj;
+    }
+
+    private DBObject instantiateObjectClassInstance() {
+        try {
+            return (DBObject) getObjectClass().newInstance();
+        } catch (InstantiationException e) {
+            throw new MongoInternalException("can't create instance of type " + getObjectClass(), e);
+        } catch (IllegalAccessException e) {
+            throw new MongoInternalException("can't create instance of type " + getObjectClass(), e);
+        }
+    }
+
 
     /**
      * calls {@link DBCollection#findAndModify(com.mongodb.DBObject, com.mongodb.DBObject, com.mongodb.DBObject, boolean, com.mongodb.DBObject, boolean, boolean)}

src/main/com/mongodb/DBTCPConnector.java

@@ -123,16 +123,12 @@ void _checkClosed(){
             throw new IllegalStateException( "this Mongo has been closed" );
     }
 
-    WriteResult _checkWriteError( DB db , MyPort mp , DBPort port , WriteConcern concern )
+    WriteResult _checkWriteError( DB db, DBPort port , WriteConcern concern )
         throws MongoException, IOException {
-        CommandResult e = null;
-        e = port.runCommand( db , concern.getCommand() );
-
-        if ( ! e.hasErr() )
-            return new WriteResult( e , concern );
+        CommandResult e = port.runCommand( db , concern.getCommand() );
 
         e.throwOnError();
-        return null;
+        return new WriteResult( e , concern );
     }
 
     @Override
@@ -155,7 +151,7 @@ public WriteResult say( DB db , OutMessage m , WriteConcern concern , ServerAddr
             port.checkAuth( db );
             port.say( m );
             if ( concern.callGetLastError() ){
-                return _checkWriteError( db , mp , port , concern );
+                return _checkWriteError( db , port , concern );
             }
             else {
                 return new WriteResult( db , port , concern );
@@ -503,7 +499,7 @@ public String debugString(){
             buf.append( "replica set : " ).append( _allHosts );
         } else {
             ServerAddress master = getAddress();
-            buf.append( master ).append( " " ).append( master != null ? master._addr : null );
+            buf.append( master ).append( " " ).append( master != null ? master.getSocketAddress() : null );
         }
 
         return buf.toString();

src/main/com/mongodb/OutMessage.java

@@ -120,9 +120,10 @@ byte[] toByteArray(){
     }
 
     void doneWithMessage(){
-        if ( _buffer != null && _mongo != null )
+        if ( _buffer != null && _mongo != null ) {
             _buffer.reset();
             _mongo._bufferPool.done( _buffer );
+        }
 
         _buffer = null;
         _mongo = null;

src/main/com/mongodb/ReplicaSetStatus.java

@@ -490,7 +490,7 @@ static class UpdatableNode {
 
         private void updateAddr() {
             try {
-                if (_addr.updateInetAddr()) {
+                if (_addr.updateInetAddress()) {
                     // address changed, need to use new ports
                     _port = new DBPort(_addr, null, _mongoOptions);
                     _mongo.getConnector().updatePortPool(_addr);
@@ -704,9 +704,8 @@ public long getNextResolveTime() {
         public synchronized void updateAll(){
             HashSet<UpdatableNode> seenNodes = new HashSet<UpdatableNode>();
 
-            // make a copy of _all, since UpdatableNode.update can add to it
-            for (UpdatableNode node : new ArrayList<UpdatableNode>(_all)) {
-                node.update(seenNodes);
+            for (int i = 0; i < _all.size(); i++) {
+                _all.get(i).update(seenNodes);
             }
 
             if (seenNodes.size() > 0) {

src/main/com/mongodb/ServerAddress.java

@@ -21,8 +21,6 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * mongo server address
@@ -72,8 +70,7 @@ public ServerAddress( String host , int port )
 
         _host = host;
         _port = port;
-        _all = _getAddress( _host );
-        _addr = new InetSocketAddress( _all[0] , _port );
+        updateInetAddress();
     }
 
     /**
@@ -98,41 +95,11 @@ public ServerAddress( InetAddress addr , int port ){
      * @param addr inet socket address containing hostname and port
      */
     public ServerAddress( InetSocketAddress addr ){
-        _addr = addr;
-        _host = _addr.getHostName();
-        _port = _addr.getPort();
-        _all = null;
+        _address = addr;
+        _host = _address.getHostName();
+        _port = _address.getPort();
     }
 
-    // --------
-    // pairing
-    // --------
-
-    /**
-     * Determines if the database at this address is paired.
-     * @return if this address connects to a set of paired databases
-     */
-    boolean isPaired(){
-        return _all != null && _all.length > 1;
-    }
-
-    /**
-     * If this is the address of a paired database, returns addresses for
-     * all of the databases with which it is paired.
-     * @return the addresses
-     * @throws RuntimeException if this address is not one of a paired database
-     */
-    List<ServerAddress> explode(){
-        if ( _all == null || _all.length <= 1 )
-            throw new RuntimeException( "not replica set mode.  num addresses : " + ((_all == null) ? 0 : _all.length) );
-        
-        List<ServerAddress> s = new ArrayList<ServerAddress>();
-        for ( int i=0; i<_all.length; i++ ){
-            s.add( new ServerAddress( _all[i] , _port ) );
-        }
-        return s;
-    }
-
     // --------
     // equality, etc...
     // --------
@@ -165,7 +132,7 @@ public boolean equals( Object other ){
                 a._host.equals( _host );
         }
         if ( other instanceof InetSocketAddress ){
-            return _addr.equals( other );
+            return _address.equals( other );
         }
         return false;
     }
@@ -177,62 +144,51 @@ public int hashCode(){
 
     /**
      * Gets the hostname
-     * @return
+     * @return hostname
      */
     public String getHost(){
         return _host;
     }
 
     /**
      * Gets the port number
-     * @return
+     * @return port
      */
     public int getPort(){
         return _port;
     }
 
     /**
      * Gets the underlying socket address
-     * @return
+     * @return socket address
      */
     public InetSocketAddress getSocketAddress(){
-        return _addr;
+        return _address;
     }
 
     @Override
     public String toString(){
-        return _host + ":" + _port;
+        return _address.toString();
     }
 
     final String _host;
     final int _port;
-    InetSocketAddress _addr;
-    InetAddress[] _all;
+    volatile InetSocketAddress _address;
 
     // --------
     // static helpers
     // --------
 
-    private static InetAddress[] _getAddress( String host )
-        throws UnknownHostException {
-
-        if ( host.toLowerCase().equals("localhost") ){
-            return new InetAddress[] { InetAddress.getLocalHost()};
-        }
-        
-        return InetAddress.getAllByName( host );
-    }
-    
     /**
-     * Returns the default database host: db_ip environment variable, or "127.0.0.1"
-     * @return
+     * Returns the default database host: "127.0.0.1"
+     * @return IP address of default host.
      */
     public static String defaultHost(){
         return "127.0.0.1";
     }
 
-    /** Returns the default database port: db_port environment variable, or 27017 as a default
-     * @return
+    /** Returns the default database port: 27017
+     * @return the default port
      */
     public static int defaultPort(){
         return DBPort.PORT;
@@ -243,13 +199,9 @@ public static int defaultPort(){
      * @return true if host resolved to a new IP that is different from old one, false otherwise
      * @throws UnknownHostException
      */
-    boolean updateInetAddr() throws UnknownHostException {
-        InetSocketAddress oldaddr = _addr;
-        _all = _getAddress( _host );
-        _addr = new InetSocketAddress( _all[0] , _port );
-        if (!_addr.equals(oldaddr))
-            return true;
-        return false;
+    boolean updateInetAddress() throws UnknownHostException {
+        InetSocketAddress oldAddress = _address;
+        _address = new InetSocketAddress( InetAddress.getByName(_host) , _port );
+        return !_address.equals(oldAddress);
     }
-    
 }

src/main/com/mongodb/gridfs/GridFSDBFile.java

@@ -64,7 +64,7 @@ public long writeTo( String filename ) throws IOException {
      * @throws IOException
      */
     public long writeTo( File f ) throws IOException {
-    	
+        
     	FileOutputStream out = null;
     	try{
     		out = new FileOutputStream( f );
@@ -138,6 +138,7 @@ public int read(){
         public int read(byte[] b){
             return read( b , 0 , b.length );
         }
+
         public int read(byte[] b, int off, int len){
 
             if ( _data == null || _offset >= _data.length ){
@@ -166,35 +167,29 @@ public long skip(long numBytesToSkip) throws IOException {
                 //Don't count those extra bytes to skip in with the return value
                 return 0;
 
-            if (_offset + numBytesToSkip <= _chunkSize) {
-                //We're skipping over bytes in the current chunk, adjust the offset accordingly
-                _offset += numBytesToSkip;
-                if (_data == null && _currentChunkIdx < _numChunks)
-                    _data = getChunk(_currentChunkIdx);
-
-                return numBytesToSkip;
+            // offset in the whole file
+            long offsetInFile = 0;
+            if (_currentChunkIdx >= 0)
+                offsetInFile = _currentChunkIdx * _chunkSize + _offset;
+            if (numBytesToSkip + offsetInFile >= _length) {
+                _currentChunkIdx = _numChunks;
+                _data = null;
+                return _length - offsetInFile;
             }
 
-            //We skipping over the remainder of this chunk, could do this less recursively...
-            ++_currentChunkIdx;
-            long skippedBytes = 0;
-            if (_currentChunkIdx < _numChunks)
-                skippedBytes = _chunkSize - _offset;
-            else
-                skippedBytes = _lastChunkSize;
-
-            _offset = 0;
-            _data = null;
+            int temp = _currentChunkIdx;
+            _currentChunkIdx = (int)((numBytesToSkip + offsetInFile) / _chunkSize);
+            if (temp != _currentChunkIdx)
+                _data = getChunk(_currentChunkIdx);
+            _offset = (int)((numBytesToSkip + offsetInFile) % _chunkSize);
 
-            return skippedBytes + skip(numBytesToSkip - skippedBytes);
+            return numBytesToSkip;
         }
 
         final int _numChunks;
-        //Math trick to ensure the _lastChunkSize is between 1 and _chunkSize
-        final long _lastChunkSize = ((_length - 1) % _chunkSize) + 1;
 
         int _currentChunkIdx = -1;
-        int _offset;
+        int _offset = 0;
         byte[] _data = null;
     }
 

src/main/com/mongodb/gridfs/GridFSInputFile.java

@@ -138,20 +138,21 @@ public void setContentType( String ct ) {
 
     /**
      * Set the chunk size. This must be called before saving any data.
-     * @param _chunkSize
+     * @param chunkSize The size in bytes.
      */
-    public void setChunkSize(long _chunkSize) {
+    public void setChunkSize(long chunkSize) {
         if (_outputStream != null || _savedChunks)
             return;
-        this._chunkSize = _chunkSize;
+        _chunkSize = chunkSize;
+        _buffer = new byte[(int) _chunkSize];
     }
 
     /**
      * calls {@link GridFSInputFile#save(long)} with the existing chunk size
      */
     @Override
     public void save() {
-        save( _chunkSize);
+        save( _chunkSize );
     }
 
     /**