SERVER-23891 implement ShardId class

1 files changed, 10 insertions, 6 deletions

diff --git a/src/mongo/s/move_chunk_request.cpp b/src/mongo/s/move_chunk_request.cpp
index 8370000d511..3117f2a2cbb 100644
--- a/src/mongo/s/move_chunk_request.cpp
+++ b/src/mongo/s/move_chunk_request.cpp
@@ -86,14 +86,18 @@ StatusWith<MoveChunkRequest> MoveChunkRequest::createFromCommand(NamespaceString
     }
 
     {
-        Status status = bsonExtractStringField(obj, kFromShardId, &request._fromShardId);
+        std::string shardStr;
+        Status status = bsonExtractStringField(obj, kFromShardId, &shardStr);
+        request._fromShardId = shardStr;
         if (!status.isOK()) {
             return status;
         }
     }
 
     {
-        Status status = bsonExtractStringField(obj, kToShardId, &request._toShardId);
+        std::string shardStr;
+        Status status = bsonExtractStringField(obj, kToShardId, &shardStr);
+        request._toShardId = shardStr;
         if (!status.isOK()) {
             return status;
         }
@@ -132,8 +136,8 @@ void MoveChunkRequest::appendAsCommand(BSONObjBuilder* builder,
                                        const NamespaceString& nss,
                                        const ChunkVersion& shardVersion,
                                        const ConnectionString& configServerConnectionString,
-                                       const std::string& fromShardId,
-                                       const std::string& toShardId,
+                                       const ShardId& fromShardId,
+                                       const ShardId& toShardId,
                                        const ChunkRange& range,
                                        int64_t maxChunkSizeBytes,
                                        const MigrationSecondaryThrottleOptions& secondaryThrottle,
@@ -145,8 +149,8 @@ void MoveChunkRequest::appendAsCommand(BSONObjBuilder* builder,
     builder->append(kMoveChunk, nss.ns());
     shardVersion.appendForCommands(builder);
     builder->append(kConfigServerConnectionString, configServerConnectionString.toString());
-    builder->append(kFromShardId, fromShardId);
-    builder->append(kToShardId, toShardId);
+    builder->append(kFromShardId, fromShardId.toString());
+    builder->append(kToShardId, toShardId.toString());
     range.append(builder);
     builder->append(kMaxChunkSizeBytes, static_cast<long long>(maxChunkSizeBytes));
     secondaryThrottle.append(builder);