merged mongo-java-driver master

scotthernandez · scotthernandez · commit 2a56f1838ada · 2010-05-30T21:38:42.000-07:00
diff --git a/build.xml b/build.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <project name="MongoDB Java Driver" default="compile" basedir=".">
 
-  <property name="version" value="2.0rc3"/>
+  <property name="version" value="2.0rc4"/>
   <property name="targetdir" location="target"/>
   <property name="testdir" location="${targetdir}/test"/>
 
@@ -158,15 +158,31 @@
            debug="on" >
       <classpath refid="classpath"/>
     </javac>
-    
+
     <java classname="QuickTour" >
       <classpath refid="classpath"/>
     </java>
 
     <java classname="QuickTourAdmin" >
       <classpath refid="classpath"/>
     </java>
-    
+
+  </target>
+
+  <target name="publish">
+    <exec dir="." executable="python">
+      <arg value="mavenPush.py"/>
+      <arg value="${version}"/>
+      <arg value="/ebs/maven/"/>
+    </exec>
+  </target>
+
+  <target name="publish-local">
+    <exec dir="." executable="python">
+      <arg value="mavenPush.py"/>
+      <arg value="${version}"/>
+      <arg value="~/.m2/repository/"/>
+    </exec>
   </target>
 
 </project>
diff --git a/mavenPush.py b/mavenPush.py
@@ -8,11 +8,17 @@
 import subprocess
 
 if len( sys.argv ) == 1:
-    raise Exception( "need version number for now" )
+    print "Usage: mavenPush.py VERSION [PUBDIR]"
+    print "VERSION - version you want to publish"
+    print "PUBDIR - directory to publish to. default = /ebs/maven/"
+    sys.exit()
 
 version = sys.argv[1]
 
-root = "/ebs/maven/"
+if len( sys.argv ) > 2:
+    root = os.path.expanduser( sys.argv[2] )
+else:
+    root = "/ebs/maven/"
 
 p = subprocess.Popen( [ "/usr/bin/ant" , "clean" ] , stdout=subprocess.PIPE ).communicate()
 p = subprocess.Popen( [ "/usr/bin/ant" , "alljars" ] , stdout=subprocess.PIPE ).communicate()
diff --git a/src/main/com/mongodb/DBApiLayer.java b/src/main/com/mongodb/DBApiLayer.java
@@ -25,6 +25,7 @@
 import org.bson.types.*;
 
 import com.mongodb.util.*;
+
 /** Database API
  * This cannot be directly instantiated, but the functions are available
  * through instances of Mongo.
diff --git a/src/main/com/mongodb/DBPortPool.java b/src/main/com/mongodb/DBPortPool.java
@@ -69,15 +69,21 @@ void close(){
     // ----
     
     public static class NoMoreConnection extends MongoInternalException {
-	NoMoreConnection(){
-	    super( "No more DB Connections" );
+	NoMoreConnection( String msg ){
+	    super( msg );
 	}
     }
     
-    public static class ConnectionWaitTimeOut extends MongoInternalException {
-      ConnectionWaitTimeOut(int timeout) {
-        super("Connection wait timeout after " + timeout + " ms");
-      }
+    public static class SemaphoresOut extends NoMoreConnection {
+        SemaphoresOut(){
+            super( "Out of semaphores to get db connection" );
+        }
+    }
+
+    public static class ConnectionWaitTimeOut extends NoMoreConnection {
+        ConnectionWaitTimeOut(int timeout) {
+            super("Connection wait timeout after " + timeout + " ms");
+        }
     }
 
     // ----
@@ -96,7 +102,7 @@ protected long memSize( DBPort p ){
     public DBPort get(){
 	DBPort port = null;
 	if ( ! _waitingSem.tryAcquire() )
-	    throw new NoMoreConnection();
+	    throw new SemaphoresOut();
 
 	try {
 	    port = get( _options.maxWaitTime );
diff --git a/src/main/com/mongodb/DBTCPConnector.java b/src/main/com/mongodb/DBTCPConnector.java
@@ -176,21 +176,10 @@ public Response call( DB db , DBCollection coll , OutMessage m , int retries )
 
         port.checkAuth( db );
         
+        Response res = null;
         try {
-            Response res = port.call( m , coll );
+            res = port.call( m , coll );
             mp.done( port );
-            ServerError err = res.getError();
-
-            if ( err != null && err.isNotMasterError() ){
-                _pickCurrent();
-                if ( retries <= 0 ){
-                    throw new MongoException( "not talking to master and retries used up" );
-                }
-                
-                return call( db , coll , m , retries -1 );
-            }
-            
-            return res;
         }
         catch ( IOException ioe ){
             mp.error( ioe );
@@ -199,13 +188,22 @@ public Response call( DB db , DBCollection coll , OutMessage m , int retries )
             }
             throw new MongoException.Network( "can't call something" , ioe );
         }
-        catch ( MongoException me ){
-            throw me;
-        }
         catch ( RuntimeException re ){
             mp.error( re );
             throw re;
         }
+
+        ServerError err = res.getError();
+        
+        if ( err != null && err.isNotMasterError() ){
+            _pickCurrent();
+            if ( retries <= 0 ){
+                throw new MongoException( "not talking to master and retries used up" );
+            }
+            return call( db , coll , m , retries -1 );
+        }
+        
+        return res;
     }
 
     public ServerAddress getAddress(){
diff --git a/src/main/com/mongodb/Mongo.java b/src/main/com/mongodb/Mongo.java
@@ -20,6 +20,7 @@
 
 import java.net.*;
 import java.util.*;
+import java.util.concurrent.*;
 
 /**
  * A database connection with internal pooling.
@@ -165,16 +166,11 @@ public DB getDB( String dbname ){
         if ( db != null )
             return db;
         
-        synchronized ( _dbs ){
-            db = _dbs.get( dbname );
-            if ( db != null )
-                return db;
-            
-            db = new DBApiLayer( dbname , _connector );
-
-            _dbs.put( dbname , db );
-            return db;
-        }
+        db = new DBApiLayer( dbname , _connector );
+        DB temp = _dbs.putIfAbsent( dbname , db );
+        if ( temp != null )
+            return temp;
+        return db;
     }
     
     public List<String> getDatabaseNames()
@@ -250,5 +246,5 @@ public void close(){
     final List<ServerAddress> _addrs;
     final MongoOptions _options;
     final DBTCPConnector _connector;
-    final Map<String,DB> _dbs = new HashMap<String,DB>();
+    final ConcurrentMap<String,DB> _dbs = new ConcurrentHashMap<String,DB>();
 }
