0
0
mirror of https://github.com/mongodb/mongo.git synced 2024-11-30 17:10:48 +01:00

fix sharded outType

This commit is contained in:
Eliot Horowitz 2010-11-15 17:23:28 -05:00
parent 35386e6fd9
commit 8f726a40b8
2 changed files with 6 additions and 1 deletions

View File

@ -720,7 +720,11 @@ namespace mongo {
} }
long long finalCount = mr.renameIfNeeded( db , &state ); long long finalCount;
{
dblock lk;
finalCount = mr.renameIfNeeded( db , &state );
}
log(0) << " mapreducefinishcommand " << mr.finalLong << " " << finalCount << endl; log(0) << " mapreducefinishcommand " << mr.finalLong << " " << finalCount << endl;
for ( set<ServerAndQuery>::iterator i=servers.begin(); i!=servers.end(); i++ ){ for ( set<ServerAndQuery>::iterator i=servers.begin(); i!=servers.end(); i++ ){

View File

@ -844,6 +844,7 @@ namespace mongo {
} }
else if ( fn == "keeptemp" || else if ( fn == "keeptemp" ||
fn == "out" || fn == "out" ||
fn == "outType" ||
fn == "finalize" ){ fn == "finalize" ){
// we don't want to copy these // we don't want to copy these
} }