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

add_comments: Write scores before writing CommentTree

Browse Source 
get_comment_scores expects scores to exist for all comments present
in the CommentTree. To ensure this is true, write the scores before
writing the CommentTree.
This commit is contained in:
Brian Simpson
2016-03-09 13:46:37 -08:00
parent 476ac39e45
commit 21f3785a67
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
r2/r2/lib/comment_tree.py
View File

@@ -47,7 +47,6 @@ def add_comments(comments):
for link_id, link_comments in comments_by_link_id.iteritems():
link = links[link_id]
# retrieve and update the comment tree
new_comments = [
comment for comment in link_comments if not comment._deleted]
deleted_comments = [
@@ -56,6 +55,19 @@ def add_comments(comments):
'comment_tree.add.%s' % link.comment_tree_version)
timer.start()
# write scores before CommentTree because the scores must exist for all
# comments in the tree
for sort in ("_controversy", "_confidence", "_score"):
scores_by_comment = {
comment._id36: getattr(comment, sort)
for comment in link_comments
}
CommentScoresByLink.set_scores(link, sort, scores_by_comment)
scores_by_comment = _get_qa_comment_scores(link, link_comments)
CommentScoresByLink.set_scores(link, "_qa", scores_by_comment)
timer.intermediate('scores')
with CommentTree.mutation_context(link, timeout=180):
try:
timer.intermediate('lock')
@@ -87,17 +99,6 @@ def add_comments(comments):
timer.intermediate('update_search_index')
g.stats.simple_event('comment_tree_inconsistent')
# update scores
for sort in ("_controversy", "_confidence", "_score"):
scores_by_comment = {
comment._id36: getattr(comment, sort)
for comment in link_comments
}
CommentScoresByLink.set_scores(link, sort, scores_by_comment)
scores_by_comment = _get_qa_comment_scores(link, link_comments)
CommentScoresByLink.set_scores(link, "_qa", scores_by_comment)
timer.intermediate('scores')
timer.stop()