diff options
author | Spencer T Brody <spencer@mongodb.com> | 2015-08-19 17:14:33 -0400 |
---|---|---|
committer | Spencer T Brody <spencer@mongodb.com> | 2015-08-25 12:56:28 -0400 |
commit | f415aad16ec26a89110a71232dc898218dc5d85c (patch) | |
tree | 14cae84b235c52981d8d661b5219d02aab193cf0 /src/mongo/s/chunk_diff_test.cpp | |
parent | eb0430ee860d22b164cd603ce7186842f72c8537 (diff) | |
download | mongo-f415aad16ec26a89110a71232dc898218dc5d85c.tar.gz |
SERVER-19875 Add OperationContext to CatalogManager::getAllShards
Diffstat (limited to 'src/mongo/s/chunk_diff_test.cpp')
-rw-r--r-- | src/mongo/s/chunk_diff_test.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/mongo/s/chunk_diff_test.cpp b/src/mongo/s/chunk_diff_test.cpp index 76df3e999a6..28dd7e63f1e 100644 --- a/src/mongo/s/chunk_diff_test.cpp +++ b/src/mongo/s/chunk_diff_test.cpp @@ -33,6 +33,7 @@ #include <utility> #include "mongo/db/jsobj.h" +#include "mongo/db/operation_context_noop.h" #include "mongo/platform/random.h" #include "mongo/s/catalog/type_chunk.h" #include "mongo/s/chunk_diff.h" @@ -61,11 +62,11 @@ public: return true; } - virtual pair<BSONObj, BSONObj> rangeFor(const ChunkType& chunk) const { + virtual pair<BSONObj, BSONObj> rangeFor(OperationContext* txn, const ChunkType& chunk) const { return make_pair(chunk.getMin(), chunk.getMax()); } - virtual ShardId shardFor(const string& name) const { + virtual ShardId shardFor(OperationContext* txn, const string& name) const { return name; } }; @@ -82,7 +83,7 @@ public: return false; } - virtual pair<BSONObj, BSONObj> rangeFor(const ChunkType& chunk) const { + virtual pair<BSONObj, BSONObj> rangeFor(OperationContext* txn, const ChunkType& chunk) const { return make_pair(chunk.getMax(), chunk.getMin()); } }; @@ -108,6 +109,7 @@ protected: ~ChunkDiffUnitTest() = default; void runTest(bool isInverse) { + OperationContextNoop txn; int numShards = 10; int numInitialChunks = 5; @@ -173,7 +175,7 @@ protected: convertBSONArrayToChunkTypes(chunks, &chunksVector); // Validate initial load - differ->calculateConfigDiff(chunksVector); + differ->calculateConfigDiff(&txn, chunksVector); validate(isInverse, chunksVector, ranges, maxVersion, maxShardVersions); // Generate a lot of diffs, and keep validating that updating from the diffs always gives us @@ -328,7 +330,7 @@ protected: std::vector<ChunkType> chunksVector; convertBSONArrayToChunkTypes(chunks, &chunksVector); - differ->calculateConfigDiff(chunksVector); + differ->calculateConfigDiff(&txn, chunksVector); validate(isInverse, chunksVector, ranges, maxVersion, maxShardVersions); } |