SERVER-16889 Modernize getExecutor*(), PlanExecutor::make() signatures

1 files changed, 6 insertions, 7 deletions

diff --git a/src/mongo/db/commands/distinct.cpp b/src/mongo/db/commands/distinct.cpp
index 2c281140c63..9fb1214234c 100644
--- a/src/mongo/db/commands/distinct.cpp
+++ b/src/mongo/db/commands/distinct.cpp
@@ -123,17 +123,16 @@ public:
             return true;
         }
 
-        PlanExecutor* rawExec;
-        Status status =
-            getExecutorDistinct(txn, collection, query, key, PlanExecutor::YIELD_AUTO, &rawExec);
-        if (!status.isOK()) {
+        auto statusWithPlanExecutor =
+            getExecutorDistinct(txn, collection, query, key, PlanExecutor::YIELD_AUTO);
+        if (!statusWithPlanExecutor.isOK()) {
             uasserted(17216,
                       mongoutils::str::stream() << "Can't get executor for query " << query << ": "
-                                                << status.toString());
+                                                << statusWithPlanExecutor.getStatus().toString());
             return 0;
         }
 
-        unique_ptr<PlanExecutor> exec(rawExec);
+        unique_ptr<PlanExecutor> exec = std::move(statusWithPlanExecutor.getValue());
 
         BSONObj obj;
         PlanExecutor::ExecState state;
@@ -165,7 +164,7 @@ public:
 
         // Get summary information about the plan.
         PlanSummaryStats stats;
-        Explain::getSummaryStats(exec.get(), &stats);
+        Explain::getSummaryStats(*exec, &stats);
 
         verify(start == bb.buf());