Move CandidatePlanCharacter to querypattern.h.

davidsackett · Apr 25, 2012 · b60b052 · b60b052
1 parent 46ad79f
commit b60b052
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/src/mongo/db/queryoptimizer.h b/src/mongo/db/queryoptimizer.h
@@ -23,33 +23,14 @@
 #include "matcher.h"
 #include "explain.h"
 #include "../util/net/listen.h"
+#include "mongo/db/querypattern.h"
 
 namespace mongo {
 
     class IndexDetails;
     class IndexType;
     class QueryPlanSummary;
 
-    /** Summarizes the candidate plans that may run for a query. */
-    class CandidatePlanCharacter {
-    public:
-        CandidatePlanCharacter( bool mayRunInOrderPlan, bool mayRunOutOfOrderPlan ) :
-        _mayRunInOrderPlan( mayRunInOrderPlan ),
-        _mayRunOutOfOrderPlan( mayRunOutOfOrderPlan ) {
-        }
-        CandidatePlanCharacter() :
-        _mayRunInOrderPlan(),
-        _mayRunOutOfOrderPlan() {
-        }
-        bool mayRunInOrderPlan() const { return _mayRunInOrderPlan; }
-        bool mayRunOutOfOrderPlan() const { return _mayRunOutOfOrderPlan; }
-        bool valid() const { return mayRunInOrderPlan() || mayRunOutOfOrderPlan(); }
-        bool hybridPlanSet() const { return mayRunInOrderPlan() && mayRunOutOfOrderPlan(); }
-    private:
-        bool _mayRunInOrderPlan;
-        bool _mayRunOutOfOrderPlan;
-    };
-
     /** A plan for executing a query using the given index spec and FieldRangeSet. */
     class QueryPlan : boost::noncopyable {
     public:

diff --git a/src/mongo/db/querypattern.h b/src/mongo/db/querypattern.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #include "jsobj.h"
-#include "mongo/db/queryoptimizer.h"
 
 namespace mongo {
 
@@ -56,7 +55,27 @@ namespace mongo {
         map<string,Type> _fieldTypes;
         BSONObj _sort;
     };
-
+
+    /** Summarizes the candidate plans that may run for a query. */
+    class CandidatePlanCharacter {
+    public:
+        CandidatePlanCharacter( bool mayRunInOrderPlan, bool mayRunOutOfOrderPlan ) :
+        _mayRunInOrderPlan( mayRunInOrderPlan ),
+        _mayRunOutOfOrderPlan( mayRunOutOfOrderPlan ) {
+        }
+        CandidatePlanCharacter() :
+        _mayRunInOrderPlan(),
+        _mayRunOutOfOrderPlan() {
+        }
+        bool mayRunInOrderPlan() const { return _mayRunInOrderPlan; }
+        bool mayRunOutOfOrderPlan() const { return _mayRunOutOfOrderPlan; }
+        bool valid() const { return mayRunInOrderPlan() || mayRunOutOfOrderPlan(); }
+        bool hybridPlanSet() const { return mayRunInOrderPlan() && mayRunOutOfOrderPlan(); }
+    private:
+        bool _mayRunInOrderPlan;
+        bool _mayRunOutOfOrderPlan;
+    };
+
     /** Information about a query plan that ran successfully for a QueryPattern. */
     class CachedQueryPlan {
     public: