diff options
| author | Aaron <aaron@10gen.com> | 2012-02-24 15:16:08 -0800 |
|---|---|---|
| committer | Aaron <aaron@10gen.com> | 2012-02-24 22:49:17 -0800 |
| commit | 87102538abc9c6cb65fca650585bfb9e4afe4910 (patch) | |
| tree | 7e8dc45d775572ab4917d8605a133ff98760d874 /src/mongo/dbtests/queryoptimizertests.cpp | |
| parent | 34413328aa56af3280db84eb5a3d20409eddcdda (diff) | |
| download | mongo-87102538abc9c6cb65fca650585bfb9e4afe4910.tar.gz | |
SERVER-4150 allow plan picking with takeover with non hybrid unordered plans, clean query optimizer cursor interface and add more tests
Diffstat (limited to 'src/mongo/dbtests/queryoptimizertests.cpp')
| -rw-r--r-- | src/mongo/dbtests/queryoptimizertests.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/mongo/dbtests/queryoptimizertests.cpp b/src/mongo/dbtests/queryoptimizertests.cpp index fff857b61ad..333b466ed12 100644 --- a/src/mongo/dbtests/queryoptimizertests.cpp +++ b/src/mongo/dbtests/queryoptimizertests.cpp @@ -932,16 +932,16 @@ namespace QueryOptimizerTests { { shared_ptr<QueryPlanSet> qps = makeQps( BSON( "a" << 1 ), BSONObj() ); ASSERT_EQUALS( 1, qps->nPlans() ); - ASSERT( qps->possibleOrderedPlan() ); - ASSERT( qps->haveOrderedPlan() ); + ASSERT( qps->possibleInOrderPlan() ); + ASSERT( qps->haveInOrderPlan() ); ASSERT( !qps->possibleOutOfOrderPlan() ); } { shared_ptr<QueryPlanSet> qps = makeQps( BSON( "a" << 1 ), BSON( "b" << 1 ) ); ASSERT_EQUALS( 3, qps->nPlans() ); - ASSERT( qps->possibleOrderedPlan() ); - ASSERT( qps->haveOrderedPlan() ); + ASSERT( qps->possibleInOrderPlan() ); + ASSERT( qps->haveInOrderPlan() ); ASSERT( qps->possibleOutOfOrderPlan() ); } @@ -953,8 +953,8 @@ namespace QueryOptimizerTests { { shared_ptr<QueryPlanSet> qps = makeQps( BSON( "a" << 1 ), BSON( "b" << 1 ) ); ASSERT_EQUALS( 1, qps->nPlans() ); - ASSERT( qps->possibleOrderedPlan() ); - ASSERT( !qps->haveOrderedPlan() ); + ASSERT( qps->possibleInOrderPlan() ); + ASSERT( !qps->haveInOrderPlan() ); ASSERT( qps->possibleOutOfOrderPlan() ); } @@ -964,16 +964,16 @@ namespace QueryOptimizerTests { { shared_ptr<QueryPlanSet> qps = makeQps( BSON( "a" << 1 ), BSON( "b" << 1 ) ); ASSERT_EQUALS( 1, qps->nPlans() ); - ASSERT( qps->possibleOrderedPlan() ); - ASSERT( qps->haveOrderedPlan() ); + ASSERT( qps->possibleInOrderPlan() ); + ASSERT( qps->haveInOrderPlan() ); ASSERT( qps->possibleOutOfOrderPlan() ); } { shared_ptr<QueryPlanSet> qps = makeQps( BSON( "a" << 1 ), BSON( "c" << 1 ) ); ASSERT_EQUALS( 2, qps->nPlans() ); - ASSERT( !qps->possibleOrderedPlan() ); - ASSERT( !qps->haveOrderedPlan() ); + ASSERT( !qps->possibleInOrderPlan() ); + ASSERT( !qps->haveInOrderPlan() ); ASSERT( qps->possibleOutOfOrderPlan() ); } } @@ -1031,8 +1031,8 @@ namespace QueryOptimizerTests { { shared_ptr<MultiPlanScanner> mps = makeMps( BSON( "a" << 1 ), BSONObj() ); ASSERT_EQUALS( 1, mps->currentNPlans() ); - ASSERT( mps->possibleOrderedPlan() ); - ASSERT( mps->haveOrderedPlan() ); + ASSERT( mps->possibleInOrderPlan() ); + ASSERT( mps->haveInOrderPlan() ); ASSERT( !mps->possibleOutOfOrderPlan() ); } @@ -1040,8 +1040,8 @@ namespace QueryOptimizerTests { shared_ptr<MultiPlanScanner> mps = makeMps( BSON( "a" << 1 ), BSON( "b" << 1 ) ); ASSERT_EQUALS( 3, mps->currentNPlans() ); - ASSERT( mps->possibleOrderedPlan() ); - ASSERT( mps->haveOrderedPlan() ); + ASSERT( mps->possibleInOrderPlan() ); + ASSERT( mps->haveInOrderPlan() ); ASSERT( mps->possibleOutOfOrderPlan() ); } @@ -1054,8 +1054,8 @@ namespace QueryOptimizerTests { shared_ptr<MultiPlanScanner> mps = makeMps( BSON( "a" << 1 ), BSON( "b" << 1 ) ); ASSERT_EQUALS( 1, mps->currentNPlans() ); - ASSERT( mps->possibleOrderedPlan() ); - ASSERT( !mps->haveOrderedPlan() ); + ASSERT( mps->possibleInOrderPlan() ); + ASSERT( !mps->haveInOrderPlan() ); ASSERT( mps->possibleOutOfOrderPlan() ); } @@ -1066,8 +1066,8 @@ namespace QueryOptimizerTests { shared_ptr<MultiPlanScanner> mps = makeMps( BSON( "a" << 1 ), BSON( "b" << 1 ) ); ASSERT_EQUALS( 1, mps->currentNPlans() ); - ASSERT( mps->possibleOrderedPlan() ); - ASSERT( mps->haveOrderedPlan() ); + ASSERT( mps->possibleInOrderPlan() ); + ASSERT( mps->haveInOrderPlan() ); ASSERT( mps->possibleOutOfOrderPlan() ); } @@ -1075,8 +1075,8 @@ namespace QueryOptimizerTests { shared_ptr<MultiPlanScanner> mps = makeMps( BSON( "a" << 1 ), BSON( "c" << 1 ) ); ASSERT_EQUALS( 2, mps->currentNPlans() ); - ASSERT( !mps->possibleOrderedPlan() ); - ASSERT( !mps->haveOrderedPlan() ); + ASSERT( !mps->possibleInOrderPlan() ); + ASSERT( !mps->haveInOrderPlan() ); ASSERT( mps->possibleOutOfOrderPlan() ); } @@ -1084,8 +1084,8 @@ namespace QueryOptimizerTests { shared_ptr<MultiPlanScanner> mps = makeMps( fromjson( "{$or:[{a:1}]}" ), BSON( "c" << 1 ) ); ASSERT_EQUALS( 1, mps->currentNPlans() ); - ASSERT( !mps->possibleOrderedPlan() ); - ASSERT( !mps->haveOrderedPlan() ); + ASSERT( !mps->possibleInOrderPlan() ); + ASSERT( !mps->haveInOrderPlan() ); ASSERT( mps->possibleOutOfOrderPlan() ); } @@ -1093,8 +1093,8 @@ namespace QueryOptimizerTests { shared_ptr<MultiPlanScanner> mps = makeMps( fromjson( "{$or:[{a:1,b:1}]}" ), BSONObj() ); ASSERT_EQUALS( 0, mps->currentNPlans() ); - ASSERT( mps->possibleOrderedPlan() ); - ASSERT( mps->haveOrderedPlan() ); + ASSERT( mps->possibleInOrderPlan() ); + ASSERT( mps->haveInOrderPlan() ); ASSERT( !mps->possibleOutOfOrderPlan() ); } } |