diff options
| author | Aaron <aaron@10gen.com> | 2012-03-11 23:11:34 -0700 |
|---|---|---|
| committer | Aaron <aaron@10gen.com> | 2012-03-12 13:42:30 -0700 |
| commit | 4e1c66f452697a1c19af5eca23a0e8dfb37b6895 (patch) | |
| tree | b93660e752978e4a029fdb7f5bc20140085d9a01 /src/mongo/dbtests/queryoptimizertests.cpp | |
| parent | a6487107c9b18d8d7849cb8b60e62b61a2eb772a (diff) | |
| download | mongo-4e1c66f452697a1c19af5eca23a0e8dfb37b6895.tar.gz | |
SERVER-4669 Remove obsolete code for handling collection drops safely without assertion.
Diffstat (limited to 'src/mongo/dbtests/queryoptimizertests.cpp')
| -rw-r--r-- | src/mongo/dbtests/queryoptimizertests.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/mongo/dbtests/queryoptimizertests.cpp b/src/mongo/dbtests/queryoptimizertests.cpp index fdcd19463de..7cce2d2aa4e 100644 --- a/src/mongo/dbtests/queryoptimizertests.cpp +++ b/src/mongo/dbtests/queryoptimizertests.cpp @@ -624,7 +624,7 @@ namespace QueryOptimizerTests { auto_ptr< FieldRangeSetPair > frsp( new FieldRangeSetPair( ns(), BSON( "a" << 1 ) ) ); auto_ptr< FieldRangeSetPair > frspOrig( new FieldRangeSetPair( *frsp ) ); QueryPlanSet s( ns(), frsp, frspOrig, BSON( "a" << 1 ), shared_ptr<Projection>(), - BSON( "b" << 1 ), true, hint ); + BSON( "b" << 1 ), hint ); ASSERT_EQUALS( 1, s.nPlans() ); } }; @@ -638,8 +638,7 @@ namespace QueryOptimizerTests { auto_ptr< FieldRangeSetPair > frsp( new FieldRangeSetPair( ns(), BSON( "a" << 1 ) ) ); auto_ptr< FieldRangeSetPair > frspOrig( new FieldRangeSetPair( *frsp ) ); QueryPlanSet s( ns(), frsp, frspOrig, BSON( "a" << 1 ), shared_ptr<Projection>(), - BSON( "b" << 1 ), true, - hint ); + BSON( "b" << 1 ), hint ); ASSERT_EQUALS( 1, s.nPlans() ); } }; @@ -653,8 +652,7 @@ namespace QueryOptimizerTests { auto_ptr< FieldRangeSetPair > frsp( new FieldRangeSetPair( ns(), BSON( "a" << 1 ) ) ); auto_ptr< FieldRangeSetPair > frspOrig( new FieldRangeSetPair( *frsp ) ); QueryPlanSet s( ns(), frsp, frspOrig, BSON( "a" << 1 ), shared_ptr<Projection>(), - BSON( "b" << 1 ), true, - hint ); + BSON( "b" << 1 ), hint ); ASSERT_EQUALS( 1, s.nPlans() ); } }; @@ -680,7 +678,7 @@ namespace QueryOptimizerTests { auto_ptr< FieldRangeSetPair > frspOrig( new FieldRangeSetPair( *frsp ) ); ASSERT_THROWS( QueryPlanSet s( ns(), frsp, frspOrig, BSON( "a" << 1 ), shared_ptr<Projection>(), - BSON( "b" << 1 ), true, hint ), + BSON( "b" << 1 ), hint ), AssertionException ); } }; @@ -816,7 +814,7 @@ namespace QueryOptimizerTests { auto_ptr< FieldRangeSetPair > frspOrig( new FieldRangeSetPair( *frsp ) ); QueryPlanSet s( ns(), frsp, frspOrig, fromjson( "{a:{$in:[2,3,6,9,11]}}" ), shared_ptr<Projection>(), - BSONObj(), true, hint ); + BSONObj(), hint ); QueryPlan qp( nsd(), 1, s.frsp(), s.originalFrsp(), fromjson( "{a:{$in:[2,3,6,9,11]}}" ), shared_ptr<Projection>(), BSONObj() ); @@ -833,7 +831,7 @@ namespace QueryOptimizerTests { auto_ptr< FieldRangeSetPair > frspOrig( new FieldRangeSetPair( *frsp ) ); QueryPlanSet s( ns(), frsp, frspOrig, fromjson( "{a:{$in:[2,3,6,9,11]}}" ), shared_ptr<Projection>(), - BSON( "a" << -1 ), true, hint ); + BSON( "a" << -1 ), hint ); QueryPlan qp( nsd(), 1, s.frsp(), s.originalFrsp(), fromjson( "{a:{$in:[2,3,6,9,11]}}" ), shared_ptr<Projection>(), BSON( "a" << -1 ) ); |