summaryrefslogtreecommitdiff
path: root/src/mongo/db/query
diff options
context:
space:
mode:
authorKaloian Manassiev <kaloian.manassiev@mongodb.com>2014-05-01 21:47:12 -0400
committerKaloian Manassiev <kaloian.manassiev@mongodb.com>2014-05-04 17:54:10 -0400
commitef53c2435ea7b041fb06ed30ff3baf0ab8c30466 (patch)
tree028f54200fd61fc97d8f4447013c6f8f0d3b3016 /src/mongo/db/query
parent8fe31447b9d21521aa8022a24b4b1c27747c2ba5 (diff)
downloadmongo-ef53c2435ea7b041fb06ed30ff3baf0ab8c30466.tar.gz
SERVER-13797 Remove more usages of Client::getContext
This change removes additional usages of Client::getContext and replaces them with passing the database directly.
Diffstat (limited to 'src/mongo/db/query')
-rw-r--r--src/mongo/db/query/new_find.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/query/new_find.cpp b/src/mongo/db/query/new_find.cpp
index 25ffb9b042d..4ac697959fc 100644
--- a/src/mongo/db/query/new_find.cpp
+++ b/src/mongo/db/query/new_find.cpp
@@ -155,7 +155,7 @@ namespace mongo {
// passing in a query object (necessary to check SlaveOK query option), the only state where
// reads are allowed is PRIMARY (or master in master/slave). This function uasserts if
// reads are not okay.
- replVerifyReadsOk();
+ replVerifyReadsOk(ns, NULL);
// A pin performs a CC lookup and if there is a CC, increments the CC's pin value so it
// doesn't time out. Also informs ClientCursor that there is somebody actively holding the
@@ -514,7 +514,7 @@ namespace mongo {
killCurrentOp.checkForInterrupt(); // May trigger maxTimeAlwaysTimeOut fail point.
// uassert if we are not on a primary, and not a secondary with SlaveOk query parameter set.
- replVerifyReadsOk(&pq);
+ replVerifyReadsOk(cq->ns(), &pq);
// If this exists, the collection is sharded.
// If it doesn't exist, we can assume we're not sharded.