mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Dwight 2009-12-04 16:46:01 -05:00
commit d1587b662f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
db/mr.cpp
View File

@ -372,7 +372,6 @@ namespace mongo {
BSONObjBuilder countsBuilder;
BSONObjBuilder timingBuilder;
try {
dbtemprelease temprlease;
MRState state( mr );
state.scope->injectNative( "emit" , fast_emit );
@ -394,12 +393,13 @@ namespace mongo {
throw UserException( (string)"map invoke failed: " + state.scope->getError() );
if ( mr.verbose ) mapTime += mt.micros();
num++;
if ( num % 100 == 0 ){
Timer t;
mrtl->checkSize();
inReduce += t.micros();
dbtemprelease temprlease;
}
pm.hit();
@ -407,7 +407,6 @@ namespace mongo {
break;
}
countsBuilder.append( "input" , num );
countsBuilder.append( "emit" , mrtl->numEmits );
if ( mrtl->numEmits )
@ -429,6 +428,7 @@ namespace mongo {
ProgressMeter fpm( db.count( mr.incLong ) );
cursor = db.query( mr.incLong, Query().sort( sortKey ) );
while ( cursor->more() ){
BSONObj o = cursor->next().getOwned();
@ -443,6 +443,7 @@ namespace mongo {
prev = o;
all.push_back( o );
fpm.hit();
dbtemprelease tl;
}
state.finalReduce( all );