github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-26 15:28:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Hack to allow CachedQuery into MergedCachedResults.

Browse Source
This commit is contained in:
bsimpson63
2012-03-22 03:55:41 -07:00
parent 27f6d93051
commit 3bf0d69e30
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
r2/r2/lib/db/queries.py
View File

@@ -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