github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-27 03:00:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

CommentOrderer.read_cache: don't try to filter MissingChildrenTuple

Browse Source 
First pop it off the ordered list if it exists, then filter out
too deep and too many comments.
This commit is contained in:
Brian Simpson
2016-03-15 11:18:07 -07:00
parent 64dbfd30d0
commit d3e643a574
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
r2/r2/models/builder.py
View File

@@ -995,6 +995,17 @@ class CommentOrderer(CommentOrdererBase):
comment_tuples = g.permacache.get(key) or []
self.timer.intermediate("read_precomputed")
# precomputed order might have returned more than max_comments. before
# dealing with that we need to preserve the MissingChildrenTuple for
# missing root level comments
if comment_tuples and isinstance(comment_tuples[-1], MissingChildrenTuple):
mct = comment_tuples.pop(-1)
top_level_not_visible = mct.child_ids
num_children_not_visible = mct.num_children
else:
top_level_not_visible = set()
num_children_not_visible = 0
# precomputed order uses the default max_depth. filter the list
# if we need a different max_depth. NOTE: we may end up with fewer
# comments than were requested.
@@ -1004,15 +1015,6 @@ class CommentOrderer(CommentOrdererBase):
if comment_tuple.depth < self.max_depth
]
# precomputed order might have returned more than max_comments
if comment_tuples and isinstance(comment_tuples[-1], MissingChildrenTuple):
mct = comment_tuples.pop(-1)
top_level_not_visible = mct.child_ids
num_children_not_visible = mct.num_children
else:
top_level_not_visible = set()
num_children_not_visible = 0
if len(comment_tuples) > self.max_comments:
top_level_not_visible.update({
comment_tuple.comment_id