diff options
| author | Hari Khalsa <hkhalsa@10gen.com> | 2013-08-05 16:13:06 -0400 |
|---|---|---|
| committer | Hari Khalsa <hkhalsa@10gen.com> | 2013-08-07 17:20:58 -0400 |
| commit | 3d3719bd3881b437f136d8ea8a8dfd22de2f3d52 (patch) | |
| tree | 2922be571d85a034170b8bb5f0e0ff568d4a3d5d /src/mongo/db/pipeline | |
| parent | 3e50406c655679a5a3ed52cb64b5750c7518fe6f (diff) | |
| download | mongo-3d3719bd3881b437f136d8ea8a8dfd22de2f3d52.tar.gz | |
SERVER-10026 SERVER-10376 scrub clientcursor vigorously
Diffstat (limited to 'src/mongo/db/pipeline')
| -rw-r--r-- | src/mongo/db/pipeline/document_source_cursor.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/db/pipeline/pipeline_d.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/pipeline/document_source_cursor.cpp b/src/mongo/db/pipeline/document_source_cursor.cpp index a93fd0032dc..cdc3cc0070d 100644 --- a/src/mongo/db/pipeline/document_source_cursor.cpp +++ b/src/mongo/db/pipeline/document_source_cursor.cpp @@ -108,7 +108,7 @@ namespace mongo { Lock::DBRead lk(ns); Client::Context ctx(ns, dbpath, /*doVersion=*/false); - ClientCursor::Pin pin(_cursorId); + ClientCursorPin pin(_cursorId); ClientCursor* cursor = pin.c(); uassert(16950, "Cursor deleted. Was the collection or database dropped?", @@ -272,7 +272,7 @@ namespace mongo { _projection.reset(new Projection); _projection->init(projection); - ClientCursor::Pin pin (_cursorId); + ClientCursorPin pin (_cursorId); verify(pin.c()); pin.c()->fields = _projection; diff --git a/src/mongo/db/pipeline/pipeline_d.cpp b/src/mongo/db/pipeline/pipeline_d.cpp index 9d57250e381..f1fa7f2f22c 100644 --- a/src/mongo/db/pipeline/pipeline_d.cpp +++ b/src/mongo/db/pipeline/pipeline_d.cpp @@ -197,7 +197,7 @@ namespace mongo { } // Now wrap the Cursor in ClientCursor - ClientCursor::Holder cursor( + ClientCursorHolder cursor( new ClientCursor(QueryOption_NoCursorTimeout, pCursor, fullName)); CursorId cursorId = cursor->cursorid(); massert(16917, str::stream() |