SERVER-28656 consolidate utility functions for forwarding commands to shards into cluster_commands_common.h

1 files changed, 3 insertions, 12 deletions

diff --git a/src/mongo/s/commands/cluster_db_stats_cmd.cpp b/src/mongo/s/commands/cluster_db_stats_cmd.cpp
index 16151cf0f1c..ea83968a486 100644
--- a/src/mongo/s/commands/cluster_db_stats_cmd.cpp
+++ b/src/mongo/s/commands/cluster_db_stats_cmd.cpp
@@ -30,9 +30,9 @@
 
 #include <vector>
 
-#include "mongo/s/commands/scatter_gather_from_shards.h"
-
+#include "mongo/db/commands.h"
 #include "mongo/s/client/shard_registry.h"
+#include "mongo/s/commands/cluster_commands_common.h"
 #include "mongo/s/grid.h"
 
 namespace mongo {
@@ -71,20 +71,11 @@ public:
              int options,
              std::string& errmsg,
              BSONObjBuilder& output) override {
-
-        // Target all shards.
-        std::vector<AsyncRequestsSender::Request> requests;
-        std::vector<ShardId> shardIds;
-        Grid::get(opCtx)->shardRegistry()->getAllShardIds(&shardIds);
-        for (auto&& shardId : shardIds) {
-            requests.emplace_back(std::move(shardId), cmdObj);
-        }
-
+        auto requests = buildRequestsForAllShards(opCtx, cmdObj);
         auto swResults = gatherResults(opCtx, dbName, cmdObj, options, requests, &output);
         if (!swResults.isOK()) {
             return appendCommandStatus(output, swResults.getStatus());
         }
-
         aggregateResults(std::move(swResults.getValue()), output);
         return true;
     }