github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-25 06:48:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix various comment deletion bugs in comment trees.

Browse Source
This commit is contained in:
Logan Hanks
2012-10-26 14:03:18 -07:00
parent be2757f71e
commit ceecb3ca51
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,10 +91,10 @@ def update_comment_votes(comments, write_consistency_level = None):
write_consistency_level = write_consistency_level)
def delete_comment(comment):
with CommentTree.mutation_context(comment.link_id):
link = Link._byID(comment.link_id, data=True)
link = Link._byID(comment.link_id, data=True)
with CommentTree.mutation_context(link):
cache = get_comment_tree(link)
cache.delete_comment(comment)
cache.delete_comment(comment, link)
from r2.lib.db.queries import changed
changed(link)

13
r2/r2/models/comment_tree.py
View File

@@ -248,9 +248,14 @@ class CommentTreeStorageV2(CommentTreeStorageBase):
@tdb_cassandra.will_write
def delete_comment(cls, tree, comment):
CommentTreeStorageBase.delete_comment(tree, comment)
pids = [int(pid_str, 36) if pid_str else -1
for pid_str in comment.parents.split(':')]
pids.append(comment._id)
updates = {}
for d, (pid, cid) in enumerate(zip(pids, pids[1:])):
updates[(d, pid, cid)] = -1
with batch.Mutator(g.cassandra_pools[cls._connection_pool]) as m:
m.insert(cls._cf, cls._key(tree.link_id),
dict((c.parents + ':' + c._id36), '0'))
m.insert(cls._cf, cls._key(tree.link_id), updates)
@classmethod
@tdb_cassandra.will_write
@@ -392,8 +397,8 @@ class CommentTree:
def add_comment(self, comment):
return self.add_comments([comment])
def delete_comment(self, comment):
impl = cls.IMPLEMENTATIONS[link.comment_tree_version]
def delete_comment(self, comment, link):
impl = self.IMPLEMENTATIONS[link.comment_tree_version]
impl.delete_comment(self, comment)
self.link._incr('num_comments', -1)