JAVA-952, JAVA-978: Check query failure bit for OP_QUERY and OP_GET_MORE responses.

jyemin · jyemin · commit fd4b20f0cf5f · 2013-09-30T17:24:50.000-04:00
diff --git a/src/main/com/mongodb/DBApiLayer.java b/src/main/com/mongodb/DBApiLayer.java
@@ -183,6 +183,16 @@ CommandResult doAuthenticate(MongoCredential credentials) {
         return _connector.authenticate(credentials);
     }
 
+    private static void throwOnQueryFailure(final Response res, final long cursor) {
+        if ((res._flags & Bytes.RESULTFLAG_ERRSET) > 0) {
+            BSONObject errorDocument = res.get(0);
+            throw new MongoException(ServerError.getCode(errorDocument), ServerError.getMsg(errorDocument, null));
+        }
+        else if ((res._flags & Bytes.RESULTFLAG_CURSORNOTFOUND) > 0) {
+            throw new MongoException.CursorNotFound(cursor, res.serverUsed());
+        }
+    }
+
     class MyCollection extends DBCollection {
         MyCollection( String name ){
             super( DBApiLayer.this , name );
@@ -290,12 +300,7 @@ Iterator<DBObject> __find( DBObject ref , DBObject fields , int numToSkip , int
 
             Response res = _connector.call( _db , this , query , null , 2, readPref, decoder );
 
-            if ( res.size() == 1 ){
-                BSONObject foo = res.get(0);
-                MongoException e = MongoException.parse( foo );
-                if ( e != null && ! _name.equals( "$cmd" ) )
-                    throw e;
-            }
+            throwOnQueryFailure(res, 0);
 
             return new Result( this , res , batchSize, limit , options, decoder );
         }
@@ -362,9 +367,7 @@ class Result implements Iterator<DBObject> {
         }
 
         private void init( Response res ){
-            if ( ( res._flags & Bytes.RESULTFLAG_CURSORNOTFOUND ) > 0 ){
-                throw new MongoException.CursorNotFound(_curResult.cursor(), res.serverUsed());
-            }
+            throwOnQueryFailure(res, _curResult == null ? 0 : _curResult._cursor);
 
             _totalBytes += res._len;
             _curResult = res;
diff --git a/src/test/com/mongodb/DBApiLayerTest.java b/src/test/com/mongodb/DBApiLayerTest.java
@@ -54,4 +54,17 @@ public void testCursorNotFoundException() {
             assertEquals(cursor.getCursorId(), e.getCursorId());
         }
     }
+
+    @Test
+    public void testQueryFailureException() {
+        DBCollection collection = db.getCollection("testQueryFailureException");
+        collection.insert(new BasicDBObject("loc", new double[]{0, 0}));
+        try {
+            collection.findOne(new BasicDBObject("loc", new BasicDBObject("$near", new double[]{0, 0})));
+            fail("Should be a query failure since there is no 2d index");
+        } catch (MongoException e) {
+            assertEquals(13038, e.getCode());
+        }
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,17 @@ public void testCursorNotFoundException() {`
`54`	`54`	`assertEquals(cursor.getCursorId(), e.getCursorId());`
`55`	`55`	`}`
`56`	`56`	`}`
	`57`	`+`
	`58`	`+ @Test`
	`59`	`+ public void testQueryFailureException() {`
	`60`	`+ DBCollection collection = db.getCollection("testQueryFailureException");`
	`61`	`+ collection.insert(new BasicDBObject("loc", new double[]{0, 0}));`
	`62`	`+ try {`
	`63`	`+ collection.findOne(new BasicDBObject("loc", new BasicDBObject("$near", new double[]{0, 0})));`
	`64`	`+ fail("Should be a query failure since there is no 2d index");`
	`65`	`+ } catch (MongoException e) {`
	`66`	`+ assertEquals(13038, e.getCode());`
	`67`	`+ }`
	`68`	`+ }`
	`69`	`+`
`57`	`70`	`}`