Merge branches 'master' and 'master' of github.com:mongodb/mongo-java-driver

Conflicts:
	src/main/com/mongodb/DBCursor.java

Author: scotthernandez

src/main/com/mongodb/DBCursor.java

@@ -24,7 +24,7 @@
 
 
 /** An iterator over database results.
- * Doing a <code>find()</code> query on a collection returns a 
+ * Doing a <code>find()</code> query on a collection returns a
  * <code>DBCursor</code> thus
  *
  * <blockquote><pre>
@@ -34,13 +34,13 @@
  * </pre></blockquote>
  *
  * <p><b>Warning:</b> Calling <code>toArray</code> or <code>length</code> on
- * a DBCursor will irrevocably turn it into an array.  This 
+ * a DBCursor will irrevocably turn it into an array.  This
  * means that, if the cursor was iterating over ten million results
  * (which it was lazily fetching from the database), suddenly there will
  * be a ten-million element array in memory.  Before converting to an array,
- * make sure that there are a reasonable number of results using 
+ * make sure that there are a reasonable number of results using
  * <code>skip()</code> and <code>limit()</code>.
- * <p>For example, to get an array of the 1000-1100th elements of a cursor, use 
+ * <p>For example, to get an array of the 1000-1100th elements of a cursor, use
  *
  * <blockquote><pre>
  * List<DBObject> obj = collection.find( query ).skip( 1000 ).limit( 100 ).toArray();
@@ -72,7 +72,7 @@ static enum CursorType { ITERATOR , ARRAY };
 
     /**
      * Creates a copy of an existing database cursor.
-     * The new cursor is an iterator, even if the original 
+     * The new cursor is an iterator, even if the original
      * was an array.
      *
      * @return the new cursor
@@ -86,6 +86,8 @@ public DBCursor copy() {
         c._skip = _skip;
         c._options = _options;
         c._batchSize = _batchSize;
+        c._snapshot = _snapshot;
+        c._explain = _explain;
         if ( _specialFields != null )
             c._specialFields = new BasicDBObject( _specialFields.toMap() );
         return c;
@@ -162,9 +164,9 @@ public DBCursor hint( String indexName ){
     }
 
     /**
-     * Use snapshot mode for the query. Snapshot mode assures no duplicates are 
-     * returned, or objects missed, which were present at both the start and end 
-     * of the query's execution (if an object is new during the query, or deleted 
+     * Use snapshot mode for the query. Snapshot mode assures no duplicates are
+     * returned, or objects missed, which were present at both the start and end
+     * of the query's execution (if an object is new during the query, or deleted
      * during the query, it may or may not be returned, even with snapshot mode).
      * Note that short query responses (less than 1MB) are always effectively snapshotted.
      * Currently, snapshot mode may not be used with sorting or explicit hints.
@@ -223,14 +225,14 @@ else if (n < 0)
     /**
      * Limits the number of elements returned in one batch.
      * A cursor typically fetches a batch of result objects and store them locally.
-     * 
+     *
      * If <tt>batchSize</tt> is positive, it represents the size of each batch of objects retrieved.
      * It can be adjusted to optimize performance and limit data transfer.
-     * 
+     *
      * If <tt>batchSize</tt> is negative, it will limit of number objects returned, that fit within the max batch size limit (usually 4MB), and cursor will be closed.
      * For example if <tt>batchSize</tt> is -10, then the server will return a maximum of 10 documents and as many as can fit in 4MB, then close the cursor.
      * Note that this feature is different from limit() in that documents must fit within a maximum size, and it removes the need to send a request to close the cursor server-side.
-     * 
+     *
      * The batch size can be changed even after a cursor is iterated, in which case the setting will apply on the next batch retrieval.
      *
      * @param n the number of elements to return in a batch
@@ -240,7 +242,7 @@ public DBCursor batchSize( int n ){
         // check for special case, used to have server bug with 1
         if ( n == 1 )
             n = 2;
-        
+
         if ( _it != null ) {
         	if (_it instanceof DBApiLayer.Result)
         		((DBApiLayer.Result)_it).setBatchSize(n);
@@ -270,18 +272,18 @@ public DBCursor skip( int n ){
     public long getCursorId() {
     	if ( _it instanceof Result )
             return ((Result)_it).getCursorId();
-    	
+
     	return 0;
     }
-    
+
     /**
      * kills the current cursor on the server.
      */
     public void close() {
     	if ( _it instanceof Result )
             ((Result)_it).close();
     }
-    
+
     /**
      * makes this query ok to run on a slave node
      * @return
@@ -329,15 +331,15 @@ private void _check()
         throws MongoException {
         if ( _it != null )
             return;
-        
+
         if ( _collection != null && _query != null ){
 
             _lookForHints();
 
             DBObject foo = _query;
             if ( hasSpecialQueryFields() ){
                 foo = _specialFields == null ? new BasicDBObject() : _specialFields;
-                
+
                 _addToQueryObject( foo , "query" , _query , true );
                 _addToQueryObject( foo , "orderby" , _orderBy , false );
                 if(_hint != null)
@@ -359,12 +361,12 @@ private void _check()
             _fake = true;
         }
     }
-    
+
     /**
      * if there is a hint to use, use it
      */
     private void _lookForHints(){
-        
+
         if ( _hint != null ) // if someone set a hint, then don't do this
             return;
 
@@ -374,7 +376,7 @@ private void _lookForHints(){
         Set<String> mykeys = _query.keySet();
 
         for ( DBObject o : _collection._hintFields ){
-            
+
             Set<String> hintKeys = o.keySet();
 
             if ( ! mykeys.containsAll( hintKeys ) )
@@ -394,25 +396,25 @@ boolean hasSpecialQueryFields(){
 
         if ( _hint != null || _hintDBObj != null || _snapshot )
             return true;
-        
+
         return _explain;
     }
 
     void _addToQueryObject( DBObject query , String field , DBObject thing , boolean sendEmpty ){
         if ( thing == null )
             return;
-        
+
         if ( ! sendEmpty && thing.keySet().size() == 0 )
             return;
-    
+
         _addToQueryObject( query , field , thing );
     }
 
     void _addToQueryObject( DBObject query , String field , Object thing ){
 
         if ( thing == null )
             return;
-        
+
         query.put( field , thing );
     }
 
@@ -478,7 +480,7 @@ public List<Integer> getSizes(){
 
         throw new IllegalArgumentException("_it not a real result" );
     }
-    
+
     private boolean _hasNext()
         throws MongoException {
         _check();
@@ -508,7 +510,7 @@ public boolean hasNext() throws MongoException {
         _checkType( CursorType.ITERATOR );
         return _hasNext();
     }
-    
+
     /**
      * Returns the object the cursor is at and moves the cursor ahead by one.
      * @return the next element
@@ -545,7 +547,7 @@ void _fill( int n )
             _next();
     }
 
-    /** 
+    /**
      * pulls back all items into an array and returns the number of objects.
      * Note: this can be resource intensive
      * @see #count()
@@ -569,7 +571,7 @@ public List<DBObject> toArray()
         throws MongoException {
         return toArray( Integer.MAX_VALUE );
     }
-    
+
     /**
      * Converts this cursor to an array.
      * @param max the maximum number of objects to return
@@ -582,7 +584,7 @@ public List<DBObject> toArray( int max )
         _fill( max );
         return _all;
     }
-    
+
     /**
      * for testing only!
      * Iterates cursor and counts objects
@@ -605,13 +607,13 @@ public int itcount(){
      * @return the number of objects
      * @throws MongoException
      */
-    public int count() 
+    public int count()
         throws MongoException {
         if ( _collection == null )
             throw new IllegalArgumentException( "why is _collection null" );
         if ( _collection._db == null )
             throw new IllegalArgumentException( "why is _collection._db null" );
-        
+
         return (int)_collection.getCount(this._query, this._keysWanted);
     }
 
@@ -622,25 +624,25 @@ public int count()
      * @return the number of objects
      * @throws MongoException
      */
-    public int size() 
+    public int size()
         throws MongoException {
         if ( _collection == null )
             throw new IllegalArgumentException( "why is _collection null" );
         if ( _collection._db == null )
             throw new IllegalArgumentException( "why is _collection._db null" );
-        
+
         return (int)_collection.getCount(this._query, this._keysWanted, this._limit, this._skip );
     }
 
-    
+
     /**
      * gets the fields to be returned
      * @return
      */
     public DBObject getKeysWanted(){
         return _keysWanted;
     }
-    
+
     /**
      * gets the query
      * @return
@@ -697,7 +699,7 @@ public String toString() {
     private final DBCollection _collection;
     private final DBObject _query;
     private final DBObject _keysWanted;
-    
+
     private DBObject _orderBy = null;
     private String _hint = null;
     private DBObject _hintDBObj = null;

src/main/com/mongodb/DBTCPConnector.java

@@ -19,6 +19,7 @@
 package com.mongodb;
 
 import java.io.IOException;
+import java.net.SocketTimeoutException;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -204,7 +205,8 @@ public Response call( DB db , DBCollection coll , OutMessage m , ServerAddress h
         }
         catch ( IOException ioe ){
             mp.error( port , ioe );
-            retry = _error( ioe, slaveOk ) && ! coll._name.equals( "$cmd" ) && retries > 0;
+            retry = retries > 0 && !coll._name.equals( "$cmd" )
+                    && !(ioe instanceof SocketTimeoutException) && _error( ioe, slaveOk );
             if ( !retry ){
                 throw new MongoException.Network( "can't call something" , ioe );
             }
@@ -277,11 +279,11 @@ public String getConnectPoint(){
 
     boolean _error( Throwable t, boolean slaveOk )
         throws MongoException {
-        if ( _allHosts != null ){
-            _logger.log( Level.WARNING , "replica set mode, switching master" , t );
+        if ( _rsStatus.hasServerUp() ){
+            // the replset has at least 1 server up, try to see if should switch master
             checkMaster( true , !slaveOk );
         }
-        return true;
+        return _rsStatus.hasServerUp();
     }
 
     class MyPort {
@@ -346,7 +348,7 @@ void done( DBPort p ){
         void error( DBPort p , Exception e ){
             p.close();
             _requestPort = null;
-            _logger.log( Level.SEVERE , "MyPort.error called" , e );            
+//            _logger.log( Level.SEVERE , "MyPort.error called" , e );
         }
 
         void requestEnsureConnection(){
@@ -437,7 +439,12 @@ void testMaster()
     }
 
     private boolean _set( ServerAddress addr ){
-        _masterPortPool = _portHolder.get( addr );
+        DBPortPool newPool = _portHolder.get( addr );
+        if (newPool == _masterPortPool)
+            return false;
+
+        _logger.log(Level.WARNING, "Master switching from " + (_masterPortPool != null ? _masterPortPool.getServerAddress() : "null") + " to " + addr);
+        _masterPortPool = newPool;
         return true;
     }
 
@@ -455,11 +462,18 @@ public String debugString(){
 
     public void close(){
         _closed = true;
-        if ( _portHolder != null )
+        if ( _portHolder != null ) {
             _portHolder.close();
-        if ( _rsStatus != null )
+            _portHolder = null;
+        }
+        if ( _rsStatus != null ) {
             _rsStatus.close();
-        _myPort = null;
+            _rsStatus = null;
+        }
+
+        // below this will remove the myport for this thread only
+        // client using thread pool in web framework may need to call close() from all threads
+        _myPort.remove();
     }
 
     /**
@@ -500,7 +514,7 @@ public int getMaxBsonObjectSize() {
     private DBPortPool _masterPortPool;
     private DBPortPool.Holder _portHolder;
     private final List<ServerAddress> _allHosts;
-    private final ReplicaSetStatus _rsStatus;
+    private ReplicaSetStatus _rsStatus;
     private boolean _closed = false;
     private int maxBsonObjectSize = 0;