summaryrefslogtreecommitdiff
path: root/src/mongo/dbtests/querytests.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/dbtests/querytests.cpp')
-rw-r--r--src/mongo/dbtests/querytests.cpp33
1 files changed, 15 insertions, 18 deletions
diff --git a/src/mongo/dbtests/querytests.cpp b/src/mongo/dbtests/querytests.cpp
index 6c178e4f11e..880d94913db 100644
--- a/src/mongo/dbtests/querytests.cpp
+++ b/src/mongo/dbtests/querytests.cpp
@@ -1058,30 +1058,27 @@ public:
_client.insert(ns, BSON("a" << 2 << "b" << 2));
ASSERT_EQUALS(4, count(_client.query(NamespaceString(ns), BSONObj())));
- BSONObj hints[] = {BSONObj(), BSON("a" << 1 << "b" << 1)};
- for (int i = 0; i < 2; ++i) {
- check(0, 0, 3, 3, 4, hints[i]);
- check(1, 1, 2, 2, 3, hints[i]);
- check(1, 2, 2, 2, 2, hints[i]);
- check(1, 2, 2, 1, 1, hints[i]);
-
- unique_ptr<DBClientCursor> c = query(1, 2, 2, 2, hints[i]);
- BSONObj obj = c->next();
- ASSERT_EQUALS(1, obj.getIntField("a"));
- ASSERT_EQUALS(2, obj.getIntField("b"));
- obj = c->next();
- ASSERT_EQUALS(2, obj.getIntField("a"));
- ASSERT_EQUALS(1, obj.getIntField("b"));
- ASSERT(!c->more());
- }
+ BSONObj hint = BSON("a" << 1 << "b" << 1);
+ check(0, 0, 3, 3, 4, hint);
+ check(1, 1, 2, 2, 3, hint);
+ check(1, 2, 2, 2, 2, hint);
+ check(1, 2, 2, 1, 1, hint);
+
+ unique_ptr<DBClientCursor> c = query(1, 2, 2, 2, hint);
+ BSONObj obj = c->next();
+ ASSERT_EQUALS(1, obj.getIntField("a"));
+ ASSERT_EQUALS(2, obj.getIntField("b"));
+ obj = c->next();
+ ASSERT_EQUALS(2, obj.getIntField("a"));
+ ASSERT_EQUALS(1, obj.getIntField("b"));
+ ASSERT(!c->more());
}
private:
unique_ptr<DBClientCursor> query(int minA, int minB, int maxA, int maxB, const BSONObj& hint) {
Query q;
q = q.minKey(BSON("a" << minA << "b" << minB)).maxKey(BSON("a" << maxA << "b" << maxB));
- if (!hint.isEmpty())
- q.hint(hint);
+ q.hint(hint);
return _client.query(NamespaceString(ns), q);
}
void check(