SERVER-13084: remove Client::database and make many things not use thread local versions

1 files changed, 4 insertions, 8 deletions

diff --git a/src/mongo/db/prefetch.cpp b/src/mongo/db/prefetch.cpp
index ee1646288e8..fdcd3bc2c75 100644
--- a/src/mongo/db/prefetch.cpp
+++ b/src/mongo/db/prefetch.cpp
@@ -56,7 +56,7 @@ namespace mongo {
                                                     &prefetchDocStats );
 
     // prefetch for an oplog operation
-    void prefetchPagesForReplicatedOp(const BSONObj& op) {
+    void prefetchPagesForReplicatedOp(Database* db, const BSONObj& op) {
         const char *opField;
         const char *opType = op.getStringField("op");
         switch (*opType) {
@@ -75,10 +75,6 @@ namespace mongo {
         BSONObj obj = op.getObjectField(opField);
         const char *ns = op.getStringField("ns");
 
-        Database* db = cc().database();
-        if ( !db )
-            return;
-
         Collection* collection = db->getCollection( ns );
         if ( !collection )
             return;
@@ -185,12 +181,12 @@ namespace mongo {
                 // we can probably use Client::Context here instead of ReadContext as we
                 // have locked higher up the call stack already
                 Client::ReadContext ctx( ns );
-                if( Helpers::findById(cc(), ns, builder.done(), result) ) {
+                if( Helpers::findById(ctx.ctx().db(), ns, builder.done(), result) ) {
                     // do we want to use Record::touch() here?  it's pretty similar.
                     volatile char _dummy_char = '\0';
                     // Touch the first word on every page in order to fault it into memory
-                    for (int i = 0; i < result.objsize(); i += g_minOSPageSizeBytes) {                        
-                        _dummy_char += *(result.objdata() + i); 
+                    for (int i = 0; i < result.objsize(); i += g_minOSPageSizeBytes) {
+                        _dummy_char += *(result.objdata() + i);
                     }
                     // hit the last page, in case we missed it above
                     _dummy_char += *(result.objdata() + result.objsize() - 1);