xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:mongodb/mongo

Browse Source
This commit is contained in:
Eliot Horowitz
2009-12-31 16:31:16 -05:00
parent d531f77f67 bf86eaeccf
commit 135802bfff
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
db/instance.cpp
View File

@@ -144,6 +144,8 @@ namespace mongo {
QueryMessage q(d);
QueryResult* msgdata;
Client& c = cc();
try {
if (q.fields.get() && q.fields->errmsg)
uassert( 10053 , q.fields->errmsg, false);
@@ -160,9 +162,8 @@ namespace mongo {
}
setClient( q.ns, dbpath, &lock );
Client& client = cc();
client.top.setRead();
client.curop()->setNS(q.ns);
c.top.setRead();
c.curop()->setNS(q.ns);
msgdata = runQuery(m, q, op ).release();
}
catch ( AssertionException& e ) {
@@ -199,7 +200,7 @@ namespace mongo {
resp->setData(msgdata, true); // transport will free
dbresponse.response = resp;
dbresponse.responseTo = responseTo;
Database *database = cc().database();
Database *database = c.database();
if ( database ) {
if ( database->profile )
op.debug().str << " bytes:" << resp->data->dataLen();