diff options
Diffstat (limited to 'src/mongo/db')
| -rw-r--r-- | src/mongo/db/pipeline/document_source_merge.idl | 2 | ||||
| -rw-r--r-- | src/mongo/db/s/chunk_splitter.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/s/config/configsvr_merge_chunks_command.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/db/s/migration_coordinator_document.idl | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/db/pipeline/document_source_merge.idl b/src/mongo/db/pipeline/document_source_merge.idl index 4def6572ddb..7948517e773 100644 --- a/src/mongo/db/pipeline/document_source_merge.idl +++ b/src/mongo/db/pipeline/document_source_merge.idl @@ -112,7 +112,7 @@ structs: do not match. targetCollectionVersion: - type: ChunkVersion + type: ChunkVersionArrayWronglyEncodedAsBSONObjFormat optional: true description: If set, the collection's ChunkVersion found when parsed on mongos. Can be used to check if a collection has since been dropped and re-created, diff --git a/src/mongo/db/s/chunk_splitter.cpp b/src/mongo/db/s/chunk_splitter.cpp index d3d867c932e..54a849f8b93 100644 --- a/src/mongo/db/s/chunk_splitter.cpp +++ b/src/mongo/db/s/chunk_splitter.cpp @@ -411,7 +411,7 @@ void ChunkSplitter::_runAutosplit(std::shared_ptr<ChunkSplitStateDriver> chunkSp "namespace"_attr = nss, "minKey"_attr = redact(chunk.getMin()), "maxKey"_attr = redact(chunk.getMax()), - "lastmod"_attr = redact(chunk.getLastmod().toBSON()), + "lastmod"_attr = chunk.getLastmod(), "splitPoints"_attr = splitPoints.size(), "maxChunkSizeBytes"_attr = maxChunkSizeBytes, "extraInfo"_attr = diff --git a/src/mongo/db/s/config/configsvr_merge_chunks_command.cpp b/src/mongo/db/s/config/configsvr_merge_chunks_command.cpp index c794f6714c4..60494a2155f 100644 --- a/src/mongo/db/s/config/configsvr_merge_chunks_command.cpp +++ b/src/mongo/db/s/config/configsvr_merge_chunks_command.cpp @@ -94,8 +94,8 @@ public: request().getChunkRange(), request().getShard(), request().getValidAfter())); - return ConfigSvrMergeResponse{ - ChunkVersion::fromBSONThrowing(shardAndCollVers["shardVersion"].Obj())}; + return ConfigSvrMergeResponse{ChunkVersion::parsePositionalFormat( + shardAndCollVers[ChunkVersion::kShardVersionField])}; } private: diff --git a/src/mongo/db/s/migration_coordinator_document.idl b/src/mongo/db/s/migration_coordinator_document.idl index 028cb194582..391cea306aa 100644 --- a/src/mongo/db/s/migration_coordinator_document.idl +++ b/src/mongo/db/s/migration_coordinator_document.idl @@ -94,7 +94,7 @@ structs: type: chunk_range description: "The range being migrated." preMigrationChunkVersion: - type: ChunkVersion + type: ChunkVersionArrayWronglyEncodedAsBSONObjFormat description: "The version, at the start of the migration, of the chunk being moved." decision: type: Decision |