diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mongo/db/ops/update.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/pdfile.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/queryoptimizer.cpp | 12 | ||||
| -rw-r--r-- | src/mongo/db/queryoptimizer.h | 6 | ||||
| -rw-r--r-- | src/mongo/db/queryoptimizercursorimpl.cpp | 6 |
5 files changed, 14 insertions, 14 deletions
diff --git a/src/mongo/db/ops/update.cpp b/src/mongo/db/ops/update.cpp index 212092c9705..3cbf5fcc085 100644 --- a/src/mongo/db/ops/update.cpp +++ b/src/mongo/db/ops/update.cpp @@ -1120,7 +1120,7 @@ namespace mongo { // The Cursor must have a Matcher to record an elemMatchKey. But currently // a modifier on a dynamic array field may be applied even if there is no // elemMatchKey, so a matcher cannot be required. - //verify( 16109, c->matcher() ); + //assert( c->matcher() ); details.requestElemMatchKey(); } diff --git a/src/mongo/db/pdfile.cpp b/src/mongo/db/pdfile.cpp index a5818184bbd..877a2e92981 100644 --- a/src/mongo/db/pdfile.cpp +++ b/src/mongo/db/pdfile.cpp @@ -1531,7 +1531,7 @@ namespace mongo { DiskLoc toDelete = cc->currLoc(); bool ok = cc->advance(); ClientCursor::YieldData yieldData; - verify( 16093, cc->prepareToYield( yieldData ) ); + massert( 16093, "after yield cursor deleted" , cc->prepareToYield( yieldData ) ); theDataFileMgr.deleteRecord( ns, toDelete.rec(), toDelete, false, true , true ); if( !cc->recoverFromYield( yieldData ) ) { cc.release(); diff --git a/src/mongo/db/queryoptimizer.cpp b/src/mongo/db/queryoptimizer.cpp index 66e2c55e019..7a9429c8868 100644 --- a/src/mongo/db/queryoptimizer.cpp +++ b/src/mongo/db/queryoptimizer.cpp @@ -729,7 +729,7 @@ doneCheckOrder: _currentQps->prepareToRetryQuery() ) { // Avoid an infinite loop here - this should never occur. - verify( 15878, !retried ); + assert( !retried ); _runner.reset(); return iterateRunner( originalOp, true ); } @@ -804,7 +804,7 @@ doneCheckOrder: } shared_ptr<QueryOp> QueryPlanSet::Runner::next() { - verify( 16097, !done() ); + assert( !done() ); if ( _ops.empty() ) { shared_ptr<QueryOp> initialRet = init(); @@ -827,7 +827,7 @@ doneCheckOrder: } shared_ptr<QueryOp> QueryPlanSet::Runner::_next() { - verify( 16096, !_queue.empty() ); + assert( !_queue.empty() ); OpHolder holder = _queue.pop(); QueryOp &op = *holder._op; nextOp( op ); @@ -996,7 +996,7 @@ doneCheckOrder: } shared_ptr<QueryOp> MultiPlanScanner::nextOp() { - verify( 16095, !doneOps() ); + assert( !doneOps() ); shared_ptr<QueryOp> ret = _or ? nextOpOr() : nextOpSimple(); if ( ret->error() || ret->complete() ) { _doneOps = true; @@ -1038,7 +1038,7 @@ doneCheckOrder: } handleBeginningOfClause(); shared_ptr<QueryPlan> bestGuess = _currentQps->getBestGuess(); - verify( 16075, bestGuess ); + assert( bestGuess ); return bestGuess.get(); } @@ -1154,7 +1154,7 @@ doneCheckOrder: _matcher = newMatcher; _c = _queryPlan->newCursor(); // All sub cursors must support yields. - verify( 16092, _c->supportYields() ); + assert( _c->supportYields() ); if ( _explainPlanInfo ) { _explainPlanInfo.reset( new ExplainPlanInfo() ); _explainPlanInfo->notePlan( *_c, _queryPlan->scanAndOrderRequired(), diff --git a/src/mongo/db/queryoptimizer.h b/src/mongo/db/queryoptimizer.h index eedd2f6f2c7..f8af8971862 100644 --- a/src/mongo/db/queryoptimizer.h +++ b/src/mongo/db/queryoptimizer.h @@ -443,7 +443,7 @@ namespace mongo { /** Add explain information for a new clause. */ void addClauseInfo( const shared_ptr<ExplainClauseInfo> &clauseInfo ) { - verify( 16072, _explainQueryInfo ); + assert( _explainQueryInfo ); _explainQueryInfo->addClauseInfo( clauseInfo ); } @@ -588,12 +588,12 @@ namespace mongo { void noteYield(); const QueryPlan &queryPlan() const { - verify( 16085, _c->ok() && _queryPlan ); + assert( _c->ok() && _queryPlan ); return *_queryPlan; } const Projection::KeyOnly *keyFieldsOnly() const { - verify( 16086, _c->ok() && _queryPlan ); + assert( _c->ok() && _queryPlan ); return _queryPlan->keyFieldsOnly().get(); } private: diff --git a/src/mongo/db/queryoptimizercursorimpl.cpp b/src/mongo/db/queryoptimizercursorimpl.cpp index 3a765744f13..735245fa4fa 100644 --- a/src/mongo/db/queryoptimizercursorimpl.cpp +++ b/src/mongo/db/queryoptimizercursorimpl.cpp @@ -89,7 +89,7 @@ namespace mongo { // All candidate cursors must support yields for QueryOptimizerCursorImpl's // prepareToYield() and prepareToTouchEarlierIterate() to work. - verify( 15940, _c->supportYields() ); + assert( _c->supportYields() ); _capped = _c->capped(); // TODO This violates the current Cursor interface abstraction, but for now it's simpler to keep our own set of @@ -448,7 +448,7 @@ namespace mongo { if ( _currOp->error() || !ok() ) { // Advance to a non error op if one of the ops errored out. // Advance to a following $or clause if the $or clause returned all results. - verify( 16094, !_mps->doneOps() ); + assert( !_mps->doneOps() ); _advance( true ); } } @@ -760,7 +760,7 @@ namespace mongo { } if ( _planPolicy.permitOptimalIdPlan() && isSimpleIdQuery( _query ) ) { Database *database = cc().database(); - verify( 15985, database ); + assert( database ); NamespaceDetails *d = database->namespaceIndex.details( _ns ); if ( d ) { int idxNo = d->findIdIndex(); |