summaryrefslogtreecommitdiff
path: root/s
diff options
context:
space:
mode:
authorEliot Horowitz <eliot@10gen.com>2011-06-23 15:46:10 -0400
committerEliot Horowitz <eliot@10gen.com>2011-06-23 15:46:10 -0400
commit6cd435b005974c0c3e0ea743d9196e9dc75c3618 (patch)
tree345f45ebaecd7d84a5d52cf1a3431492f2d634e9 /s
parentea1de002b3a33ea9d41e10b0266f2ca9af522fbc (diff)
downloadmongo-6cd435b005974c0c3e0ea743d9196e9dc75c3618.tar.gz
SERVER-2563 - make ClientCursor check disk location for record in memory if its going to be needed
Diffstat (limited to 's')
-rw-r--r--s/d_migrate.cpp2
-rw-r--r--s/d_split.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/s/d_migrate.cpp b/s/d_migrate.cpp
index 9e87326f480..c7c3d4c92d0 100644
--- a/s/d_migrate.cpp
+++ b/s/d_migrate.cpp
@@ -469,7 +469,7 @@ namespace mongo {
// we can afford to yield here because any change to the base data that we might miss is already being
// queued and will be migrated in the 'transferMods' stage
- if ( ! cc->yieldSometimes() ) {
+ if ( ! cc->yieldSometimes( ClientCursor::DontNeed ) ) {
cc.release();
break;
}
diff --git a/s/d_split.cpp b/s/d_split.cpp
index 28ee9fa3109..64fc4cb42e4 100644
--- a/s/d_split.cpp
+++ b/s/d_split.cpp
@@ -82,7 +82,7 @@ namespace mongo {
while ( c->ok() ) {
num++;
c->advance();
- if ( ! cc->yieldSometimes() ) {
+ if ( ! cc->yieldSometimes( ClientCursor::DontNeed ) ) {
cc.release();
break;
}
@@ -220,7 +220,7 @@ namespace mongo {
}
cc->advance();
- if ( ! cc->yieldSometimes() ) {
+ if ( ! cc->yieldSometimes( ClientCursor::DontNeed ) ) {
cc.release();
break;
}
@@ -419,7 +419,7 @@ namespace mongo {
break;
}
- if ( ! cc->yieldSometimes() ) {
+ if ( ! cc->yieldSometimes( ClientCursor::DontNeed ) ) {
// we were near and and got pushed to the end
// i think returning the splits we've already found is fine