diff options
| author | Andy Schwerin <schwerin@mongodb.com> | 2015-04-06 17:07:02 -0400 |
|---|---|---|
| committer | Andy Schwerin <schwerin@mongodb.com> | 2015-04-07 11:28:49 -0400 |
| commit | 6febdbaf542464bab747e3ab3ba49ad7b38acd8f (patch) | |
| tree | ca13cd69929179dc3927cac9895bff3e3fc74787 /src/mongo/db/clientcursor.cpp | |
| parent | 7dc9a83e8be3446551297e746dad4f6d74b7dca2 (diff) | |
| download | mongo-6febdbaf542464bab747e3ab3ba49ad7b38acd8f.tar.gz | |
SERVER-17817 Make CurOp a decoration of ClientBasic, not a member of Client.
Diffstat (limited to 'src/mongo/db/clientcursor.cpp')
| -rw-r--r-- | src/mongo/db/clientcursor.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mongo/db/clientcursor.cpp b/src/mongo/db/clientcursor.cpp index 26bea429d2a..9fc4c309aa5 100644 --- a/src/mongo/db/clientcursor.cpp +++ b/src/mongo/db/clientcursor.cpp @@ -44,7 +44,6 @@ #include "mongo/db/commands.h" #include "mongo/db/commands/server_status.h" #include "mongo/db/commands/server_status_metric.h" -#include "mongo/db/curop.h" #include "mongo/db/jsobj.h" #include "mongo/db/operation_context_impl.h" #include "mongo/db/repl/repl_client_info.h" @@ -182,13 +181,13 @@ namespace mongo { _idleAgeMillis = millis; } - void ClientCursor::updateSlaveLocation(OperationContext* txn, CurOp& curop) { + void ClientCursor::updateSlaveLocation(OperationContext* txn) { if (_slaveReadTill.isNull()) return; verify(str::startsWith(_ns.c_str(), "local.oplog.")); - Client* c = curop.getClient(); + Client* c = txn->getClient(); verify(c); OID rid = repl::ReplClientInfo::forClient(c).getRemoteID(); if (!rid.isSet()) |