1 files changed, 82 insertions, 0 deletions
diff --git a/jstests/core/index/geo/geo3.js b/jstests/core/index/geo/geo3.js
new file mode 100644
index 00000000000..7e54fd7dc5f
--- /dev/null
+++ b/jstests/core/index/geo/geo3.js
@@ -0,0 +1,82 @@
+// @tags: [
+//   operations_longer_than_stepdown_interval_in_txns,
+//   requires_fastcount,
+// ]
+
+(function() {
+t = db.geo3;
+t.drop();
+
+n = 1;
+arr = [];
+for (var x = -100; x < 100; x += 2) {
+    for (var y = -100; y < 100; y += 2) {
+        arr.push({_id: n++, loc: [x, y], a: Math.abs(x) % 5, b: Math.abs(y) % 5});
+    }
+}
+t.insert(arr);
+assert.eq(t.count(), 100 * 100);
+assert.eq(t.count(), n - 1);
+
+t.createIndex({loc: "2d"});
+
+// Test the "query" parameter in $geoNear.
+
+let res = t.aggregate([
+               {$geoNear: {near: [50, 50], distanceField: "dist", query: {a: 2}}},
+               {$limit: 10},
+           ]).toArray();
+assert.eq(10, res.length, tojson(res));
+res.forEach(doc => assert.eq(2, doc.a, tojson(doc)));
+
+function avgA(q, len) {
+    if (!len)
+        len = 10;
+    var realq = {loc: {$near: [50, 50]}};
+    if (q)
+        Object.extend(realq, q);
+    var as = t.find(realq).limit(len).map(function(z) {
+        return z.a;
+    });
+    assert.eq(len, as.length, "length in avgA");
+    return Array.avg(as);
+}
+
+function testFiltering(msg) {
+    assert.gt(2, avgA({}), msg + " testFiltering 1 ");
+    assert.eq(2, avgA({a: 2}), msg + " testFiltering 2 ");
+    assert.eq(4, avgA({a: 4}), msg + " testFiltering 3 ");
+}
+
+testFiltering("just loc");
+
+assert.commandWorked(t.dropIndex({loc: "2d"}));
+assert.commandWorked(t.createIndex({loc: "2d", a: 1}));
+
+res = t.aggregate([
+           {$geoNear: {near: [50, 50], distanceField: "dist", query: {a: 2}}},
+           {$limit: 10},
+       ]).toArray();
+assert.eq(10, res.length, "B3");
+res.forEach(doc => assert.eq(2, doc.a, tojson(doc)));
+
+testFiltering("loc and a");
+
+assert.commandWorked(t.dropIndex({loc: "2d", a: 1}));
+assert.commandWorked(t.createIndex({loc: "2d", b: 1}));
+
+testFiltering("loc and b");
+
+q = {
+    loc: {$near: [50, 50]}
+};
+assert.eq(100, t.find(q).limit(100).itcount(), "D1");
+assert.eq(100, t.find(q).limit(100).size(), "D2");
+
+assert.eq(20, t.find(q).limit(20).itcount(), "D3");
+assert.eq(20, t.find(q).limit(20).size(), "D4");
+
+// SERVER-14039 Wrong limit after skip with $nearSphere, 2d index
+assert.eq(10, t.find(q).skip(10).limit(10).itcount(), "D5");
+assert.eq(10, t.find(q).skip(10).limit(10).size(), "D6");
+}());