clean up curop read/write detection

This commit is contained in:
Eliot Horowitz
2010-02-10 15:16:00 -05:00
parent f765ec0442
commit b88e91c8f5
4 changed files with 10 additions and 18 deletions

View File

@@ -171,7 +171,6 @@ namespace mongo {
if (q.fields.get() && q.fields->errmsg)
uassert( 10053 , q.fields->errmsg, false);
c.curop()->setRead();
msgdata = runQuery(m, q, op ).release();
}
catch ( AssertionException& e ) {
@@ -454,7 +453,6 @@ namespace mongo {
mongolock lk(1);
Client::Context ctx( ns );
op.setWrite();
UpdateResult res = updateObjects(ns, toupdate, query, upsert, multi, true, op.debug() );
recordUpdate( res.existing , (int) res.num ); // for getlasterror
@@ -466,7 +464,6 @@ namespace mongo {
assert(*ns);
uassert( 10056 , "not master", isMasterNs( ns ) );
Client::Context ctx(ns);
op.setWrite();
int flags = d.pullInt();
bool justOne = flags & 1;
assert( d.moreJSObjs() );
@@ -490,7 +487,6 @@ namespace mongo {
ss << ns;
mongolock lk(false);
Client::Context ctx(ns);
curop.setRead();
int ntoreturn = d.pullInt();
long long cursorid = d.pullInt64();
ss << " cid:" << cursorid;
@@ -520,7 +516,6 @@ namespace mongo {
assert(*ns);
uassert( 10058 , "not master", isMasterNs( ns ) );
Client::Context ctx(ns);
op.setWrite();
op.debug().str << ns;
while ( d.moreJSObjs() ) {