SERVER-5685 modifications to prefetch

- include deletes in prefetching
- do not prefetch the record data for capped collections because the lookup is expensive
- filter out exceptions when using index phase 1 to page in index pages

1 files changed, 4 insertions, 4 deletions

diff --git a/src/mongo/db/prefetch.h b/src/mongo/db/prefetch.h
index 29e5f3871d0..a5935fe9fac 100644
--- a/src/mongo/db/prefetch.h
+++ b/src/mongo/db/prefetch.h
@@ -20,12 +20,12 @@
 
 namespace mongo {
     class NamespaceDetails;
+    // page in both index and data pages for an op from the oplog
+    void prefetchPagesForReplicatedOp(const BSONObj& op);
+
     // page in pages needed for all index lookups on a given object
-    void prefetchIndexPages(const char *ns, const BSONObj& obj);
+    void prefetchIndexPages(NamespaceDetails *nsd, const BSONObj& obj);
 
     // page in the data pages for a record associated with an object
     void prefetchRecordPages(const char *ns, const BSONObj& obj);
-
-    // page in both index and data pages for an op from the oplog
-    void prefetchPagesForReplicatedOp(const BSONObj& op);
 }