diff options
| author | Eliot Horowitz <eliot@10gen.com> | 2010-05-07 12:19:00 -0400 |
|---|---|---|
| committer | Eliot Horowitz <eliot@10gen.com> | 2010-05-07 12:19:00 -0400 |
| commit | c43ab4c85dba85e39a453bf4f916492f4f6a9173 (patch) | |
| tree | 9bc8ba5d4021ef171a38b5dc22e4c3655c04882f /db/mr.cpp | |
| parent | aaebac3baaedc3a055067b35c0c7eedfd4c8b0ed (diff) | |
| download | mongo-c43ab4c85dba85e39a453bf4f916492f4f6a9173.tar.gz | |
fix repair with dups and background indexes SERVER-1099
also progress meter enhancements
Diffstat (limited to 'db/mr.cpp')
| -rw-r--r-- | db/mr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/db/mr.cpp b/db/mr.cpp index f6211f7b14a..001daceffcf 100644 --- a/db/mr.cpp +++ b/db/mr.cpp @@ -446,7 +446,7 @@ namespace mongo { MRTL * mrtl = new MRTL( state ); _tlmr.reset( mrtl ); - ProgressMeter & pm = op->setMessage( "m/r: (1/3) emit phase" , db.count( mr.ns , mr.filter ) ); + ProgressMeterHolder pm( op->setMessage( "m/r: (1/3) emit phase" , db.count( mr.ns , mr.filter ) ) ); long long mapTime = 0; { readlock lock( mr.ns ); @@ -531,7 +531,7 @@ namespace mongo { BSONObj prev; BSONList all; - pm = op->setMessage( "m/r: (3/3) final reduce to collection" , db.count( mr.incLong ) ); + assert( pm == op->setMessage( "m/r: (3/3) final reduce to collection" , db.count( mr.incLong ) ) ); auto_ptr<Cursor> temp = QueryPlanSet(mr.incLong.c_str() , BSONObj() , sortKey ).getBestGuess()->newCursor(); auto_ptr<ClientCursor> cursor( new ClientCursor( QueryOption_NoCursorTimeout , temp , mr.incLong.c_str() ) ); @@ -544,7 +544,7 @@ namespace mongo { if ( o.woSortOrder( prev , sortKey ) == 0 ){ all.push_back( o ); - if ( pm.hits() % 1000 == 0 ){ + if ( pm->hits() % 1000 == 0 ){ if ( ! cursor->yield() ){ cursor.release(); break; |