diff options
| author | Aaron <aaron@10gen.com> | 2009-12-29 20:53:40 -0800 |
|---|---|---|
| committer | Aaron <aaron@10gen.com> | 2009-12-29 20:53:40 -0800 |
| commit | 13533a68a80a78ef9a6a4a2b4b1940380cc3ca8b (patch) | |
| tree | 5b7568eef9a18b26979bed61cd5ddbe9a73eaf5e | |
| parent | 9240b5026630f3cb28a30d47b91bcee20802ed14 (diff) | |
| parent | 9e96ad0a07d68f07297003169d940e87894d24bb (diff) | |
| download | mongo-13533a68a80a78ef9a6a4a2b4b1940380cc3ca8b.tar.gz | |
Merge branch 'master' of github.com:mongodb/mongo
| -rw-r--r-- | dbtests/queryoptimizertests.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/dbtests/queryoptimizertests.cpp b/dbtests/queryoptimizertests.cpp index 6dba2f56641..31ce9fce3c0 100644 --- a/dbtests/queryoptimizertests.cpp +++ b/dbtests/queryoptimizertests.cpp @@ -29,7 +29,10 @@ namespace mongo { extern BSONObj id_obj; - auto_ptr< QueryResult > runQuery(Message& m, QueryMessage& q, stringstream& ss ); + auto_ptr< QueryResult > runQuery(Message& m, QueryMessage& q ){ + CurOp op; + return runQuery( m , q , op ); + } } // namespace mongo namespace QueryOptimizerTests { @@ -742,7 +745,7 @@ namespace QueryOptimizerTests { DbMessage d(m); QueryMessage q(d); - ASSERT_EQUALS( 0, runQuery( m, q, ss )->nReturned ); + ASSERT_EQUALS( 0, runQuery( m, q)->nReturned ); } }; @@ -1014,7 +1017,7 @@ namespace QueryOptimizerTests { { DbMessage d(m); QueryMessage q(d); - runQuery( m, q, ss ); + runQuery( m, q); } ASSERT( BSON( "$natural" << 1 ).woCompare( NamespaceDetailsTransient::_get( ns() ).indexForPattern( FieldRangeSet( ns(), BSON( "b" << 0 << "a" << GTE << 0 ) ).pattern() ) ) == 0 ); @@ -1023,7 +1026,7 @@ namespace QueryOptimizerTests { { DbMessage d(m2); QueryMessage q(d); - runQuery( m2, q, ss ); + runQuery( m2, q); } ASSERT( BSON( "a" << 1 ).woCompare( NamespaceDetailsTransient::_get( ns() ).indexForPattern( FieldRangeSet( ns(), BSON( "b" << 0 << "a" << GTE << 0 ) ).pattern() ) ) == 0 ); ASSERT_EQUALS( 2, NamespaceDetailsTransient::_get( ns() ).nScannedForPattern( FieldRangeSet( ns(), BSON( "b" << 0 << "a" << GTE << 0 ) ).pattern() ) ); |