fix geo arrays in matcher'd within

jstests/geo_array0.js

@@ -1,25 +1,27 @@
 // Make sure the very basics of geo arrays are sane by creating a few multi location docs
-
 t = db.geoarray
-t.drop();
-
-t.insert( { zip : "10001", loc : { home : [ 10, 10 ], work : [ 50, 50 ] } } )
-t.insert( { zip : "10002", loc : { home : [ 20, 20 ], work : [ 50, 50 ] } } )
-t.insert( { zip : "10003", loc : { home : [ 30, 30 ], work : [ 50, 50 ] } } )
-assert.isnull( db.getLastError() )
-
-t.ensureIndex( { loc : "2d", zip : 1 } );
-assert.isnull( db.getLastError() )
-assert.eq( 2, t.getIndexKeys().length )
-
-t.insert( { zip : "10004", loc : { home : [ 40, 40 ], work : [ 50, 50 ] } } )
-
-assert.isnull( db.getLastError() )
-
-// test normal access
-
-printjson( t.find( { loc : { $within : { $box : [ [ 0, 0 ], [ 45, 45 ] ] } } } ).toArray() )
-
-assert.eq( 4, t.find( { loc : { $within : { $box : [ [ 0, 0 ], [ 45, 45 ] ] } } } ).count() );
 
-assert.eq( 4, t.find( { loc : { $within : { $box : [ [ 45, 45 ], [ 50, 50 ] ] } } } ).count() );
+function test(index) {
+    t.drop();
+    t.insert( { zip : "10001", loc : { home : [ 10, 10 ], work : [ 50, 50 ] } } )
+    t.insert( { zip : "10002", loc : { home : [ 20, 20 ], work : [ 50, 50 ] } } )
+    t.insert( { zip : "10003", loc : { home : [ 30, 30 ], work : [ 50, 50 ] } } )
+    assert.isnull( db.getLastError() )
+
+    if (index) {
+        t.ensureIndex( { loc : "2d", zip : 1 } );
+        assert.isnull( db.getLastError() )
+        assert.eq( 2, t.getIndexKeys().length )
+    }
+
+    t.insert( { zip : "10004", loc : { home : [ 40, 40 ], work : [ 50, 50 ] } } )
+    assert.isnull( db.getLastError() )
+
+    // test normal access
+    printjson( t.find( { loc : { $within : { $box : [ [ 0, 0 ], [ 45, 45 ] ] } } } ).toArray() )
+    assert.eq( 4, t.find( { loc : { $within : { $box : [ [ 0, 0 ], [ 45, 45 ] ] } } } ).count() );
+    assert.eq( 4, t.find( { loc : { $within : { $box : [ [ 45, 45 ], [ 50, 50 ] ] } } } ).count() );
+}
+
+test(false)
+test(true)

jstests/geo_array1.js

@@ -1,30 +1,38 @@
 // Make sure many locations in one doc works, in the form of an array
 
 t = db.geoarray1
-t.drop();
+function test(index) {
+    t.drop();
 
-var locObj = []
+    var locObj = []
+        // Add locations everywhere
+        for ( var i = 0; i < 10; i++ ) {
+            for ( var j = 0; j < 10; j++ ) {
+                if ( j % 2 == 0 )
+                    locObj.push( [ i, j ] )
+                else
+                    locObj.push( { x : i, y : j } )
+            }
+        }
 
-// Add locations everywhere
-for ( var i = 0; i < 10; i++ ) {
-	for ( var j = 0; j < 10; j++ ) {
-		if ( j % 2 == 0 )
-			locObj.push( [ i, j ] )
-		else
-			locObj.push( { x : i, y : j } )
-	}
-}
+    // Add docs with all these locations
+    for( var i = 0; i < 300; i++ ){
+        t.insert( { loc : locObj } )
+    }
 
-// Add docs with all these locations 
-for( var i = 0; i < 300; i++ ){
-	t.insert( { loc : locObj } )
-}
-t.ensureIndex( { loc : "2d" } )
+    if (index) {
+        t.ensureIndex( { loc : "2d" } )
+    }
 
-// Pull them back
-for ( var i = 0; i < 10; i++ ) {
-	for ( var j = 0; j < 10; j++ ) {
-		assert.eq( 300, t.find( { loc : { $within : { $box : [ [ i - 0.5, j - 0.5 ], [ i + 0.5, j + 0.5 ] ] } } } )
-				.count() )
-	}
+    // Pull them back
+    for ( var i = 0; i < 10; i++ ) {
+        for ( var j = 0; j < 10; j++ ) {
+            assert.eq(300, t.find({loc: {$within: {$box: [[i - 0.5, j - 0.5 ],
+                                                          [i + 0.5,j + 0.5]]}}})
+                      .count())
+        }
+    }
 }
+
+test(true)
+test(false)

src/mongo/db/matcher.cpp

@@ -963,6 +963,14 @@ namespace mongo {
             for (BSONElementSet::const_iterator i = s.begin(); i != s.end(); ++i) {
                 if (!i->isABSONObj()) { continue; }
                 if (it->matches(i->Obj())) { ++matches; break; }
+                // Maybe it's an array of geometries
+                BSONObjIterator geoIt(i->Obj());
+                while (geoIt.more()) {
+                    BSONElement e = geoIt.next();
+                    if (e.isABSONObj() && it->matches(e.embeddedObject())) {
+                        ++matches; break;
+                    }
+                }
             }
             if (0 == matches) { return false; }
         }