SERVER-10026 add NO_BLOCKING_SORT as planner option for agg

1 files changed, 6 insertions, 0 deletions

diff --git a/src/mongo/db/query/query_planner.h b/src/mongo/db/query/query_planner.h
index 2b3ef1079aa..01378ae2e31 100644
--- a/src/mongo/db/query/query_planner.h
+++ b/src/mongo/db/query/query_planner.h
@@ -53,6 +53,10 @@ namespace mongo {
             // shardingState.needCollectionMetadata(current_namespace) in the same lock that you use
             // to build the query runner.
             INCLUDE_SHARD_FILTER = 4,
+
+            // Set this if you don't want any plans with a blocking sort stage.  All sorts must be
+            // provided by the index.
+            NO_BLOCKING_SORT = 8,
         };
 
         // See Options enum above.
@@ -251,6 +255,8 @@ namespace mongo {
          *
          * Takes ownership of 'solnRoot' and 'taggedRoot'.
          *
+         * Returns NULL if a solution cannot be constructed given the requirements in 'params'.
+         *
          * Caller owns the returned QuerySolution.
          */
         static QuerySolution* analyzeDataAccess(const CanonicalQuery& query,