From 3bf0d69e30ba4015ecc7d9f5a2d778c8c7d0b80f Mon Sep 17 00:00:00 2001 From: bsimpson63 Date: Thu, 22 Mar 2012 03:55:41 -0700 Subject: [PATCH] Hack to allow CachedQuery into MergedCachedResults. --- r2/r2/lib/db/queries.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/r2/r2/lib/db/queries.py b/r2/r2/lib/db/queries.py index b38b84e2e..e18e27d1c 100644 --- a/r2/r2/lib/db/queries.py +++ b/r2/r2/lib/db/queries.py @@ -9,7 +9,7 @@ from r2.lib.solrsearch import DomainSearchQuery from r2.lib import amqp, sup, filters from r2.lib.comment_tree import add_comments, update_comment_votes from r2.models.query_cache import cached_query, merged_cached_query, \ - UserQueryCache, SubredditQueryCache, CachedQueryMutator + UserQueryCache, SubredditQueryCache, CachedQueryMutator, CachedQuery from r2.models.query_cache import ThingTupleComparator import cPickle as pickle @@ -217,6 +217,8 @@ class MergedCachedResults(object): self.cached_results = results CachedResults.fetch_multi([r for r in results if isinstance(r, CachedResults)]) + CachedQuery._fetch_multi([r for r in results + if isinstance(r, CachedQuery)]) self._fetched = True self.sort = results[0].sort