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

erh · erh · commit 857b6b55439d · 2010-11-30T10:46:28.000-05:00
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ http://jira.mongodb.org/browse/JAVA
 * Dave Brosius         dbrosius@mebigfatguy.com
 * Scott Hernandez      scotthernandez@hotmail.com
 * Hans Meiser          hmeiser@example.com
-* Benedikt Waldvogel   benedikt.waldvogel@pangora.com
+* Benedikt Waldvogel   mail@bwaldvogel.de
 * William Shulman      william.shulman@gmail.com
 * Daniel Spilker       mail@daniel-spilker.com
 * Kyle Banker          kylebanker@gmail.com
diff --git a/src/main/com/mongodb/DB.java b/src/main/com/mongodb/DB.java
@@ -88,14 +88,15 @@ public final DBCollection createCollection( String name, DBObject o ){
     public DBCollection getCollectionFromString( String s ){
         DBCollection foo = null;
         
-        while ( s.contains( "." ) ){
-            int idx = s.indexOf( "." );
+        int idx = s.indexOf( "." );
+        while ( idx >= 0 ){
             String b = s.substring( 0 , idx );
             s = s.substring( idx + 1 );
             if ( foo == null )
                 foo = getCollection( b );
             else
                 foo = foo.getCollection( b );
+            idx = s.indexOf( "." );
         }
 
         if ( foo != null )
@@ -184,7 +185,7 @@ public Set<String> getCollectionNames()
         if (namespaces == null)
             throw new RuntimeException("this is impossible");
 
-        Iterator<DBObject> i = namespaces.__find(new BasicDBObject(), null, 0, 0, 0);
+        Iterator<DBObject> i = namespaces.__find(new BasicDBObject(), null, 0, 0, getOptions());
         if (i == null)
             return new HashSet<String>();
 
diff --git a/src/main/com/mongodb/DBApiLayer.java b/src/main/com/mongodb/DBApiLayer.java
@@ -325,7 +325,7 @@ public void createIndex( final DBObject keys, final DBObject options )
                 full.put( k , options.get( k ) );
             full.put( "key" , keys );
 
-            DBApiLayer.this.doGetCollection( "system.indexes" ).insert( new DBObject[]{ full } , false , getWriteConcern() );
+            DBApiLayer.this.doGetCollection( "system.indexes" ).insert( new DBObject[]{ full } , false , WriteConcern.SAFE );
         }
 
         final String _fullNameSpace;
diff --git a/src/main/com/mongodb/DBCollection.java b/src/main/com/mongodb/DBCollection.java
@@ -215,7 +215,7 @@ Iterator<DBObject> __find( DBObject ref , DBObject fields , int numToSkip , int
         return __find( ref , fields , numToSkip , batchSize , getOptions() );
     }
 
-    public abstract void createIndex( DBObject keys , DBObject options ) throws MongoException ;
+    public abstract void createIndex( DBObject keys , DBObject options ) throws MongoException;
 
 
     // ------
diff --git a/src/main/com/mongodb/DBCursor.java b/src/main/com/mongodb/DBCursor.java
@@ -262,6 +262,18 @@ public DBCursor addOption( int option ){
         return this;
     }
 
+    public void setOptions( int options ){
+        _options = options;
+    }
+
+    public void resetOptions(){
+        _options = 0;
+    }
+
+    public int getOptions(){
+        return _options;
+    }
+
     // ----  internal stuff ------
 
     private void _check()
@@ -388,7 +400,6 @@ private DBObject _next()
         }
 
         if ( _cursorType == CursorType.ARRAY ){
-            _nums.add( String.valueOf( _all.size() ) );
             _all.add( _cur );
         }
 
@@ -605,6 +616,4 @@ public DBObject getQuery(){
     private int _num = 0;
 
     private final ArrayList<DBObject> _all = new ArrayList<DBObject>();
-    private final List<String> _nums = new ArrayList<String>();
-
 }
diff --git a/src/main/com/mongodb/DBPortPool.java b/src/main/com/mongodb/DBPortPool.java
@@ -145,7 +145,7 @@ protected long memSize( DBPort p ){
     }
 
     protected int pick( int iThink , boolean couldCreate ){
-        final int id = Thread.currentThread().hashCode();
+        final int id = System.identityHashCode(Thread.currentThread());
         final int s = _availSafe.size();
         for ( int i=0; i<s; i++ ){
             DBPort p = _availSafe.get(i);
@@ -173,7 +173,7 @@ public DBPort get(){
 	if ( port == null )
 	    throw new ConnectionWaitTimeOut( _options.maxWaitTime );
 	
-        port._lastThread = Thread.currentThread().hashCode();
+        port._lastThread = System.identityHashCode(Thread.currentThread());
 	return port;
     }
 
@@ -217,7 +217,7 @@ public void cleanup( DBPort p ){
     }
 
     public boolean ok( DBPort t ){
-        return _addr.equals( t._addr );
+        return _addr.getSocketAddress().equals( t._addr );
     }
     
     protected DBPort createNew(){
diff --git a/src/main/com/mongodb/Mongo.java b/src/main/com/mongodb/Mongo.java
@@ -34,7 +34,8 @@
  * <blockquote><pre>
  * Mongo mongo1 = new Mongo( "127.0.0.1" );
  * Mongo mongo2 = new Mongo( "127.0.0.1", 27017 );
- * Mongo mongo3 = new Mongo( new DBAddress( "127.0.0.1:27017", "test" ) )
+ * Mongo mongo3 = new Mongo( new DBAddress( "127.0.0.1", 27017, "test" ) );
+ * Mongo mongo4 = new Mongo( new ServerAddress( "127.0.0.1") );
  * </pre></blockquote>
  *
  * Mongo instances have connection pooling built in - see the requestStart
@@ -66,6 +67,31 @@
  * Once the slave becomes master, the driver will begin using that connection
  * as the master connection and the exceptions will stop being thrown.
  * </p>
+ *
+ * <h3>Connecting to a Replica Set</h3>
+ * <p>
+ * You can connect to a 
+ * <a href="http://www.mongodb.org/display/DOCS/Replica+Sets">replica set</a>
+ * using the Java driver by passing several a list if ServerAddress to the
+ * Mongo constructor.
+ * For example:
+ * </p>
+ * <blockquote><pre>
+ * List<ServerAddress> addrs = new ArrayList<ServerAddress>();
+ * addrs.add( new ServerAddress( "localhost" , 27017 ) );
+ * addrs.add( new ServerAddress( "localhost" , 27018 ) );
+ * addrs.add( new ServerAddress( "localhost" , 27019 ) );
+ *
+ * Mongo mongo = new Mongo( addrs );
+ * </pre></blockquote>
+ *
+ * <p>
+ * By default, all read and write operations will be made on the master.
+ * But it's possible to read from the slave(s) by using slaveOk:
+ * </p>
+ * <blockquote><pre>
+ * mongo.slaveOk();
+ * </pre></blockquote>
  */
 public class Mongo {
 
diff --git a/src/main/com/mongodb/RawDBObject.java b/src/main/com/mongodb/RawDBObject.java
@@ -58,7 +58,7 @@ public Map toMap() {
         Iterator i = this.keySet().iterator();
         while (i.hasNext()) {
             Object s = i.next();
-            m.put(s, this.get(s+""));
+            m.put(s, this.get(String.valueOf(s)));
         }
         return m;
     }
diff --git a/src/main/com/mongodb/ReplicaSetStatus.java b/src/main/com/mongodb/ReplicaSetStatus.java
@@ -141,7 +141,7 @@ synchronized void update(){
                 Throwable root = e;
                 if ( e.getCause() != null )
                     root = e.getCause();
-                _logger.log( Level.WARNING , "node down: " + _addr + " " + root );
+                _logger.log( Level.FINE , "node down: " + _addr + " " + root );
                 _ok = false;
             }
             catch ( Exception e ){
diff --git a/src/main/com/mongodb/ServerAddress.java b/src/main/com/mongodb/ServerAddress.java
@@ -93,7 +93,7 @@ boolean isPaired(){
      */
     List<ServerAddress> explode(){
         if ( _all == null || _all.length <= 1 )
-            throw new RuntimeException( "not replica set mode.  num addresses : " + _all.length );
+            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++ ){
diff --git a/src/main/com/mongodb/WriteConcern.java b/src/main/com/mongodb/WriteConcern.java
@@ -44,20 +44,19 @@
  */
 public class WriteConcern {
 
-	/** No exceptions are raised, even for network issues */
+    /** No exceptions are raised, even for network issues */
     public final static WriteConcern NONE = new WriteConcern(-1);
-	/** Exceptions are raised for network issues, but not server errors */
-    public final static WriteConcern NORMAL = new WriteConcern(0);
 
-	/** Exceptions are raised for network issues, and server errors; waits on a server for the write operation */
+    /** Exceptions are raised for network issues, but not server errors */
+    public final static WriteConcern NORMAL = new WriteConcern(0);
+    
+    /** Exceptions are raised for network issues, and server errors; waits on a server for the write operation */
     public final static WriteConcern SAFE = new WriteConcern(1);
-
-    @Deprecated /** use SAFE */
-    public final static WriteConcern STRICT = SAFE;
-
-	/** Exceptions are raised for network issues, and server errors and the write operation waits for the server to flush the data to disk*/
+    
+    /** Exceptions are raised for network issues, and server errors and the write operation waits for the server to flush the data to disk*/
     public final static WriteConcern FSYNC_SAFE = new WriteConcern(true);
-	/** Exceptions are raised for network issues, and server errors; waits for at least 2 servers for the write operation*/
+
+    /** Exceptions are raised for network issues, and server errors; waits for at least 2 servers for the write operation*/
     public final static WriteConcern REPLICAS_SAFE = new WriteConcern(2);
     
     // map of the constants from above for use by fromString
@@ -90,37 +89,37 @@ public static WriteConcern valueOf(String name) {
     public WriteConcern(){
         this(0);
     }
-
-	/** <p>Specifies the number of servers to wait for on the write operation, and exception raising behavior </p>
-	 *	<p> w represents # of servers:
-	 * 		<ul>
-	 * 			<li>{@code w=-1} None, no checking is done</li>
-	 * 			<li>{@code w=0} None, network socket errors raised</li>
-	 * 			<li>{@code w=1} Checks server for errors as well as network socket errors raised</li>
-	 * 			<li>{@code w>1} Checks servers (w) for errors as well as network socket errors raised</li>
-	 * 		</ul>
-	 * 	</p>
-	 * 
-	 **/
+    
+    /** <p>Specifies the number of servers to wait for on the write operation, and exception raising behavior </p>
+     *	<p> w represents # of servers:
+     * 		<ul>
+     * 			<li>{@code w=-1} None, no checking is done</li>
+     * 			<li>{@code w=0} None, network socket errors raised</li>
+     * 			<li>{@code w=1} Checks server for errors as well as network socket errors raised</li>
+     * 			<li>{@code w>1} Checks servers (w) for errors as well as network socket errors raised</li>
+     * 		</ul>
+     * 	</p>
+     * 
+     **/
     public WriteConcern( int w ){
         this( w , 0 , false );
     }
-
-	/** <p>Specifies the number of servers to wait for on the write operation, and the amount of time (ms) to wait.</p>
-	 *	<p> Note: w should be > 1 </p>
-	 * 
-	 **/
+    
+    /** <p>Specifies the number of servers to wait for on the write operation, and the amount of time (ms) to wait.</p>
+     *	<p> Note: w should be > 1 </p>
+     * 
+     **/
     public WriteConcern( int w , int wtimeout ){
         this( w , wtimeout , false );
     }
 
     public WriteConcern( boolean fsync ){
         this( 1 , 0 , fsync);
     }
-
-	/** <p>Specifies the number of servers to wait for on the write operation, and the amount of time (ms) to wait.</p>
-	 *	<p> Note: w should be > 1 </p>
-	 **/
+    
+    /** <p>Specifies the number of servers to wait for on the write operation, and the amount of time (ms) to wait.</p>
+     *	<p> Note: w should be > 1 </p>
+     **/
     public WriteConcern( int w , int wtimeout , boolean fsync ){
         _w = w;
         _wtimeout = wtimeout;
diff --git a/src/main/org/bson/io/OutputBuffer.java b/src/main/org/bson/io/OutputBuffer.java
@@ -82,7 +82,6 @@ public String md5(){
         }        
         md5.reset();
 
-        final StringBuilder buf = new StringBuilder();
         try {
             pipe( new OutputStream(){
                     public void write( byte[] b , int off , int len ){
diff --git a/src/test/com/mongodb/DBAddressTest.java b/src/test/com/mongodb/DBAddressTest.java
@@ -66,6 +66,15 @@ public void testBasics()
 
         assertEquals( false , new ServerAddress( "localhost:9999" ).isPaired() );
     }
+
+    @Test
+    public void testCons3()
+        throws UnknownHostException {
+        DBAddress a = new DBAddress( "9.9.9.9:9999" , "abc" );
+        assertEquals( "9.9.9.9" , a.getHost() );
+        assertEquals( 9999 , a.getPort() );
+        assertEquals( "abc" , a.getDBName() );
+    }
     
     public static void main( String args[] ) {
         (new DBAddressTest()).runConsole();
diff --git a/src/test/com/mongodb/DBCollectionTest.java b/src/test/com/mongodb/DBCollectionTest.java
@@ -160,6 +160,30 @@ public void testEnsureIndex(){
         assertEquals( Boolean.TRUE , c.getIndexInfo().get(1).get( "unique" ) );
     }
 
+    @Test
+    public void testIndexExceptions(){
+        DBCollection c = _db.getCollection( "indexExceptions" );
+        c.drop();
+
+        c.insert( new BasicDBObject( "x" , 1 ) );
+        c.insert( new BasicDBObject( "x" , 1 ) );
+        
+        c.ensureIndex( new BasicDBObject( "y" , 1 ) );
+        c.resetIndexCache();
+        c.ensureIndex( new BasicDBObject( "y" , 1 ) ); // make sure this doesn't throw
+        c.resetIndexCache();
+        
+        Exception failed = null;
+        try {
+            c.ensureIndex( new BasicDBObject( "x" , 1 ) , new BasicDBObject( "unique" , true ) );
+        }
+        catch ( MongoException.DuplicateKey e ){
+            failed = e;
+        }
+        assertNotNull( failed );
+
+    }
+
 
     final DB _db;
 
diff --git a/src/test/com/mongodb/DBCursorTest.java b/src/test/com/mongodb/DBCursorTest.java
@@ -66,6 +66,20 @@ public void testSnapshot() {
         assertEquals( 50 , c.find().snapshot().limit(50).toArray().size() );
     }
 
+    @Test(groups = {"basic"})
+    public void testOptions() {
+        DBCollection c = _db.getCollection("test");
+        DBCursor dbCursor = c.find();
+
+        assertEquals(0, dbCursor.getOptions());
+        dbCursor.setOptions(Bytes.QUERYOPTION_TAILABLE);
+        assertEquals(Bytes.QUERYOPTION_TAILABLE, dbCursor.getOptions());
+        dbCursor.addOption(Bytes.QUERYOPTION_SLAVEOK);
+        assertEquals(Bytes.QUERYOPTION_TAILABLE | Bytes.QUERYOPTION_SLAVEOK, dbCursor.getOptions());
+        dbCursor.resetOptions();
+        assertEquals(0, dbCursor.getOptions());
+    }
+
     @Test
     public void testBig(){
         DBCollection c = _db.getCollection("big1");
diff --git a/src/test/com/mongodb/JavaClientTest.java b/src/test/com/mongodb/JavaClientTest.java
@@ -307,7 +307,7 @@ public void testTimestamp()
     public void testStrictWriteSetInCollection(){
         DBCollection c = _db.getCollection( "write1" );
         c.drop();
-        c.setWriteConcern( WriteConcern.STRICT );
+        c.setWriteConcern( WriteConcern.SAFE);
         c.insert( new BasicDBObject( "_id" , 1 ) );
         boolean gotError = false;
         try {
@@ -328,7 +328,7 @@ public void testStrictWriteSetInMethod(){
         c.insert( new BasicDBObject( "_id" , 1 ));
         boolean gotError = false;
         try {
-            c.insert( new BasicDBObject( "_id" , 1 ) , WriteConcern.STRICT);
+            c.insert( new BasicDBObject( "_id" , 1 ) , WriteConcern.SAFE);
         }
         catch ( MongoException.DuplicateKey e ){
             gotError = true;
@@ -603,7 +603,7 @@ public void testWriteResult(){
         assertEquals( 1 , res.getN() );
         assertTrue( res.isLazy() );
 
-        c.setWriteConcern( WriteConcern.STRICT );
+        c.setWriteConcern( WriteConcern.SAFE);
         res = c.update( new BasicDBObject( "_id" , 1 ) , new BasicDBObject( "$inc" , new BasicDBObject( "x" , 1 ) ) );
         assertEquals( 1 , res.getN() );
         assertFalse( res.isLazy() );
@@ -619,7 +619,7 @@ public void testWriteResultMethodLevelWriteConcern(){
         assertEquals( 1 , res.getN() );
         assertTrue( res.isLazy() );
 
-        res = c.update( new BasicDBObject( "_id" , 1 ) , new BasicDBObject( "$inc" , new BasicDBObject( "x" , 1 ) ) , false , false , WriteConcern.STRICT );
+        res = c.update( new BasicDBObject( "_id" , 1 ) , new BasicDBObject( "$inc" , new BasicDBObject( "x" , 1 ) ) , false , false , WriteConcern.SAFE);
         assertEquals( 1 , res.getN() );
         assertFalse( res.isLazy() );
     }

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ public void createIndex( final DBObject keys, final DBObject options )`
`325`	`325`	`full.put( k , options.get( k ) );`
`326`	`326`	`full.put( "key" , keys );`
`327`	`327`
`328`		`- DBApiLayer.this.doGetCollection( "system.indexes" ).insert( new DBObject[]{ full } , false , getWriteConcern() );`
	`328`	`+ DBApiLayer.this.doGetCollection( "system.indexes" ).insert( new DBObject[]{ full } , false , WriteConcern.SAFE );`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`final String _fullNameSpace;`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ Iterator<DBObject> __find( DBObject ref , DBObject fields , int numToSkip , int`
`215`	`215`	`return __find( ref , fields , numToSkip , batchSize , getOptions() );`
`216`	`216`	`}`
`217`	`217`
`218`		`- public abstract void createIndex( DBObject keys , DBObject options ) throws MongoException ;`
	`218`	`+ public abstract void createIndex( DBObject keys , DBObject options ) throws MongoException;`
`219`	`219`
`220`	`220`
`221`	`221`	`// ------`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ protected long memSize( DBPort p ){`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`protected int pick( int iThink , boolean couldCreate ){`
`148`		`- final int id = Thread.currentThread().hashCode();`
	`148`	`+ final int id = System.identityHashCode(Thread.currentThread());`
`149`	`149`	`final int s = _availSafe.size();`
`150`	`150`	`for ( int i=0; i<s; i++ ){`
`151`	`151`	`DBPort p = _availSafe.get(i);`
`@@ -173,7 +173,7 @@ public DBPort get(){`
`173`	`173`	`if ( port == null )`
`174`	`174`	`throw new ConnectionWaitTimeOut( _options.maxWaitTime );`
`175`	`175`
`176`		`- port._lastThread = Thread.currentThread().hashCode();`
	`176`	`+ port._lastThread = System.identityHashCode(Thread.currentThread());`
`177`	`177`	`return port;`
`178`	`178`	`}`
`179`	`179`
`@@ -217,7 +217,7 @@ public void cleanup( DBPort p ){`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`public boolean ok( DBPort t ){`
`220`		`- return _addr.equals( t._addr );`
	`220`	`+ return _addr.getSocketAddress().equals( t._addr );`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`protected DBPort createNew(){`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public Map toMap() {`
`58`	`58`	`Iterator i = this.keySet().iterator();`
`59`	`59`	`while (i.hasNext()) {`
`60`	`60`	`Object s = i.next();`
`61`		`- m.put(s, this.get(s+""));`
	`61`	`+ m.put(s, this.get(String.valueOf(s)));`
`62`	`62`	`}`
`63`	`63`	`return m;`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ synchronized void update(){`
`141`	`141`	`Throwable root = e;`
`142`	`142`	`if ( e.getCause() != null )`
`143`	`143`	`root = e.getCause();`
`144`		`- _logger.log( Level.WARNING , "node down: " + _addr + " " + root );`
	`144`	`+ _logger.log( Level.FINE , "node down: " + _addr + " " + root );`
`145`	`145`	`_ok = false;`
`146`	`146`	`}`
`147`	`147`	`catch ( Exception e ){`