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

$showDiskLoc query option SERVER-1054.

Browse Source 
Implementation is a bit ugly. Please code-review and let me know if there is a better way
This commit is contained in:
Mathias Stearn
2010-05-11 19:10:33 -04:00
parent 29df4539c4
commit f99aba9824
6 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
db/query.cpp
View File

@@ -324,7 +324,7 @@ namespace mongo {
last = c->currLoc();
BSONObj js = c->current();
fillQueryResultFromObj(b, cc->fields.get(), js);
fillQueryResultFromObj(b, cc->fields.get(), js, (cc->pq->showDiskLoc() ? &last : 0));
n++;
if ( (ntoreturn>0 && (n >= ntoreturn || b.len() > MaxBytesToReturnToClientAtOnce)) ||
(ntoreturn==0 && b.len()>1*1024*1024) ) {
@@ -547,7 +547,7 @@ namespace mongo {
if ( _inMemSort ) {
// note: no cursors for non-indexed, ordered results. results must be fairly small.
_so->add( _pq.returnKey() ? _c->currKey() : _c->current() );
_so->add( _pq.returnKey() ? _c->currKey() : _c->current(), _pq.showDiskLoc() ? &cl : 0 );
}
else if ( _ntoskip > 0 ) {
_ntoskip--;
@@ -570,7 +570,7 @@ namespace mongo {
else {
BSONObj js = _c->current();
assert( js.isValid() );
fillQueryResultFromObj( _buf , _pq.getFields() , js );
fillQueryResultFromObj( _buf , _pq.getFields() , js , (_pq.showDiskLoc() ? &cl : 0));
}
_n++;
if ( ! _c->supportGetMore() ){
@@ -657,7 +657,8 @@ namespace mongo {
/* run a query -- includes checking for and running a Command */
auto_ptr< QueryResult > runQuery(Message& m, QueryMessage& q, CurOp& curop ) {
StringBuilder& ss = curop.debug().str;
ParsedQuery pq( q );
shared_ptr<ParsedQuery> pq_shared( new ParsedQuery(q) );
ParsedQuery& pq( *pq_shared );
const char *ns = q.ns;
int ntoskip = q.ntoskip;
BSONObj jsobj = q.query;
@@ -763,7 +764,7 @@ namespace mongo {
uassert( 10110 , "bad query object", false);
}
if ( ! explain && isSimpleIdQuery( query ) && !pq.hasOption( QueryOption_CursorTailable ) ) {
if ( ! (explain || pq.showDiskLoc()) && isSimpleIdQuery( query ) && !pq.hasOption( QueryOption_CursorTailable ) ) {
nscanned = 1;
bool nsFound = false;
@@ -820,6 +821,7 @@ namespace mongo {
DEV out() << " query has more, cursorid: " << cursorid << endl;
cc->matcher = dqo.matcher();
cc->pos = n;
cc->pq = pq_shared;
cc->fields = pq.getFieldPtr();
cc->originalMessage = m;
cc->updateLocation();