diff options
| author | Jason Rassi <rassi@10gen.com> | 2015-04-10 19:52:05 -0400 |
|---|---|---|
| committer | Jason Rassi <rassi@10gen.com> | 2015-04-22 11:16:40 -0400 |
| commit | d187ea1cc67b1975b6a1cbfcca1977598e9ea0c5 (patch) | |
| tree | 31a80677506d77677274c97ffeac321e14e71db3 /src/mongo/db/query/query_settings.h | |
| parent | 88f6f4733bca7c615dd6fedcfc93a24cfa68372a (diff) | |
| download | mongo-d187ea1cc67b1975b6a1cbfcca1977598e9ea0c5.tar.gz | |
SERVER-17659 Move CQ::getPlanCacheKey() => PlanCache::computeKey()
Includes partial revert of e5f17aaf. In particular, CanonicalQuery
objects no longer pre-generate their PlanCacheKey.
Diffstat (limited to 'src/mongo/db/query/query_settings.h')
| -rw-r--r-- | src/mongo/db/query/query_settings.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/db/query/query_settings.h b/src/mongo/db/query/query_settings.h index beb312daf91..a65ea88d901 100644 --- a/src/mongo/db/query/query_settings.h +++ b/src/mongo/db/query/query_settings.h @@ -35,6 +35,7 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/query/canonical_query.h" #include "mongo/db/query/index_entry.h" +#include "mongo/db/query/plan_cache.h" #include "mongo/platform/unordered_map.h" namespace mongo { @@ -100,7 +101,7 @@ namespace mongo { * Returns false and sets allowedIndicesOut to NULL otherwise. * Caller owns AllowedIndices. */ - bool getAllowedIndices(const CanonicalQuery& query, + bool getAllowedIndices(const PlanCacheKey& query, AllowedIndices** allowedIndicesOut) const; /** @@ -115,12 +116,13 @@ namespace mongo { * frees resources for existing entry before replacing. */ void setAllowedIndices(const CanonicalQuery& canonicalQuery, + const PlanCacheKey& key, const std::vector<BSONObj>& indexes); /** * Removes single entry from query settings. No effect if query shape is not found. */ - void removeAllowedIndices(const CanonicalQuery& canonicalQuery); + void removeAllowedIndices(const PlanCacheKey& canonicalQuery); /** * Clears all allowed indices from query settings. |