diff options
| author | Greg Studer <greg@10gen.com> | 2013-08-13 12:35:55 -0400 |
|---|---|---|
| committer | Greg Studer <greg@10gen.com> | 2013-08-13 12:35:55 -0400 |
| commit | 5c03be3aca41801c807ed49666020c4a8088549d (patch) | |
| tree | 9f0c35f358b3ebde81f34720f535272dfb81295b /src/mongo/s/collection_metadata_test.cpp | |
| parent | 5c94494146e1f38c81a497ac7300b65d85456cc7 (diff) | |
| download | mongo-5c03be3aca41801c807ed49666020c4a8088549d.tar.gz | |
Revert "SERVER-8869 command to merge co-located chunks"
This reverts commit a58ae77d0e5035cb4b541751dbe042e9173deea5.
Diffstat (limited to 'src/mongo/s/collection_metadata_test.cpp')
| -rw-r--r-- | src/mongo/s/collection_metadata_test.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mongo/s/collection_metadata_test.cpp b/src/mongo/s/collection_metadata_test.cpp index e67b870cf87..0cd7a6bd99d 100644 --- a/src/mongo/s/collection_metadata_test.cpp +++ b/src/mongo/s/collection_metadata_test.cpp @@ -126,7 +126,7 @@ namespace { TEST_F(NoChunkFixture, getNextFromEmpty) { ChunkType nextChunk; - ASSERT( !getCollMetadata().getNextChunk( getCollMetadata().getMinKey(), &nextChunk ) ); + ASSERT( getCollMetadata().getNextChunk( BSONObj(), &nextChunk ) ); } TEST_F(NoChunkFixture, FirstChunkClonePlus) { @@ -522,14 +522,14 @@ namespace { TEST_F(SingleChunkFixture, getNextFromEmpty) { ChunkType nextChunk; - ASSERT( getCollMetadata().getNextChunk( getCollMetadata().getMinKey(), &nextChunk ) ); + ASSERT( getCollMetadata().getNextChunk( BSONObj(), &nextChunk ) ); ASSERT_EQUALS( 0, nextChunk.getMin().woCompare(BSON("a" << 10)) ); ASSERT_EQUALS( 0, nextChunk.getMax().woCompare(BSON("a" << 20)) ); } - TEST_F(SingleChunkFixture, GetLastChunkIsFalse) { + TEST_F(SingleChunkFixture, GetNextFromLast) { ChunkType nextChunk; - ASSERT( !getCollMetadata().getNextChunk( getCollMetadata().getMaxKey(), &nextChunk ) ); + ASSERT( getCollMetadata().getNextChunk( BSONObj(), &nextChunk ) ); } TEST_F(SingleChunkFixture, LastChunkCloneMinus) { @@ -1116,14 +1116,14 @@ namespace { TEST_F(ThreeChunkWithRangeGapFixture, GetNextFromEmpty) { ChunkType nextChunk; - ASSERT( getCollMetadata().getNextChunk( getCollMetadata().getMinKey(), &nextChunk ) ); + ASSERT_FALSE( getCollMetadata().getNextChunk( BSONObj(), &nextChunk ) ); ASSERT_EQUALS( 0, nextChunk.getMin().woCompare(BSON("a" << MINKEY)) ); ASSERT_EQUALS( 0, nextChunk.getMax().woCompare(BSON("a" << 10)) ); } TEST_F(ThreeChunkWithRangeGapFixture, GetNextFromMiddle) { ChunkType nextChunk; - ASSERT( getCollMetadata().getNextChunk(BSON("a" << 20), &nextChunk) ); + ASSERT_FALSE( getCollMetadata().getNextChunk(BSON("a" << 10), &nextChunk) ); ASSERT_EQUALS( 0, nextChunk.getMin().woCompare(BSON("a" << 30)) ); ASSERT_EQUALS( 0, nextChunk.getMax().woCompare(BSON("a" << MAXKEY)) ); } |