Revert "SERVER-16889 query subsystem CanonicalQuery::canonicalize use StatusWith<unique_ptr> for ownership transfer"

This reverts commit 3f6f66daac840fe2b2dc26eeeacbf015479567df.

1 files changed, 7 insertions, 8 deletions

diff --git a/src/mongo/db/dbhelpers.cpp b/src/mongo/db/dbhelpers.cpp
index 0517552c7c2..e5e198d7ff0 100644
--- a/src/mongo/db/dbhelpers.cpp
+++ b/src/mongo/db/dbhelpers.cpp
@@ -129,19 +129,18 @@ RecordId Helpers::findOne(OperationContext* txn,
     if (!collection)
         return RecordId();
 
+    CanonicalQuery* cq;
     const WhereCallbackReal whereCallback(txn, collection->ns().db());
 
-    auto statusWithCQ = CanonicalQuery::canonicalize(collection->ns(), query, whereCallback);
-    massert(17244, "Could not canonicalize " + query.toString(), statusWithCQ.isOK());
-    unique_ptr<CanonicalQuery> cq = std::move(statusWithCQ.getValue());
+    massert(17244,
+            "Could not canonicalize " + query.toString(),
+            CanonicalQuery::canonicalize(collection->ns(), query, &cq, whereCallback).isOK());
 
     PlanExecutor* rawExec;
     size_t options = requireIndex ? QueryPlannerParams::NO_TABLE_SCAN : QueryPlannerParams::DEFAULT;
-    massert(
-        17245,
-        "Could not get executor for query " + query.toString(),
-        getExecutor(txn, collection, cq.release(), PlanExecutor::YIELD_MANUAL, &rawExec, options)
-            .isOK());
+    massert(17245,
+            "Could not get executor for query " + query.toString(),
+            getExecutor(txn, collection, cq, PlanExecutor::YIELD_MANUAL, &rawExec, options).isOK());
 
     unique_ptr<PlanExecutor> exec(rawExec);
     PlanExecutor::ExecState state;