paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 03:11:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade event flag collapsing to support all flag changes.

Browse Source 
(imported from commit a2ca74b779d67148aee41e92e4a4cb716620e566)
This commit is contained in:
Tim Abbott
2013-11-22 15:04:41 -05:00
parent d2486670a8
commit abded5f886
2 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zerver/lib/event_queue.py
View File

@@ -151,13 +151,10 @@ def compute_full_event_type(event):
if event["type"] == "update_message_flags": if event["type"] == "update_message_flags":
if event["all"]: if event["all"]:
# Put the "all" case in its own category # Put the "all" case in its own category
return "%s/%s/all" % (event["flag"], event["operation"]) return "all_flags/%s/%s" % (event["flag"], event["operation"])
return "%s/%s" % (event["flag"], event["operation"]) return "flags/%s/%s" % (event["operation"], event["flag"])
return event["type"] return event["type"]
# Virtual events are a mechanism for storing pointer changes and other
# easily collapsed event types efficiently.
VIRTUAL_EVENT_TYPES = ["pointer", "read/add", "restart"]
class EventQueue(object): class EventQueue(object):
def __init__(self, id): def __init__(self, id):
self.queue = deque() self.queue = deque()
@@ -186,7 +183,8 @@ class EventQueue(object):
event['id'] = self.next_event_id event['id'] = self.next_event_id
self.next_event_id += 1 self.next_event_id += 1
full_event_type = compute_full_event_type(event) full_event_type = compute_full_event_type(event)
if full_event_type in VIRTUAL_EVENT_TYPES: if (full_event_type in ["pointer", "restart"] or
full_event_type.startswith("flags/")):
if full_event_type not in self.virtual_events: if full_event_type not in self.virtual_events:
self.virtual_events[full_event_type] = copy.deepcopy(event) self.virtual_events[full_event_type] = copy.deepcopy(event)
return return
@@ -197,10 +195,10 @@ class EventQueue(object):
virtual_event["timestamp"] = event["timestamp"] virtual_event["timestamp"] = event["timestamp"]
if full_event_type == "pointer": if full_event_type == "pointer":
virtual_event["pointer"] = event["pointer"] virtual_event["pointer"] = event["pointer"]
elif full_event_type == "read/add":
virtual_event["messages"] += event["messages"]
elif full_event_type == "restart": elif full_event_type == "restart":
virtual_event["server_generation"] = event["server_generation"] virtual_event["server_generation"] = event["server_generation"]
elif full_event_type.startswith("flags/"):
virtual_event["messages"] += event["messages"]
else: else:
self.queue.append(event) self.queue.append(event)

25
zerver/tests.py
View File

@@ -2543,7 +2543,7 @@ class EventQueueTest(TestCase):
"timestamp": "22"}, "timestamp": "22"},
]) ])
def test_flag_collapsing(self): def test_flag_add_collapsing(self):
queue = EventQueue("1") queue = EventQueue("1")
queue.push({"type": "update_message_flags", queue.push({"type": "update_message_flags",
"flag": "read", "flag": "read",
@@ -2566,6 +2566,29 @@ class EventQueueTest(TestCase):
"messages": [1,2,3,4,5,6], "messages": [1,2,3,4,5,6],
"timestamp": "1"}]) "timestamp": "1"}])
def test_flag_remove_collapsing(self):
queue = EventQueue("1")
queue.push({"type": "update_message_flags",
"flag": "collapsed",
"operation": "remove",
"all": False,
"messages": [1, 2, 3, 4],
"timestamp": "1"})
queue.push({"type": "update_message_flags",
"flag": "collapsed",
"all": False,
"operation": "remove",
"messages": [5, 6],
"timestamp": "1"})
self.assertEqual(queue.contents(),
[{'id': 1,
'type': 'update_message_flags',
"all": False,
"flag": "collapsed",
"operation": "remove",
"messages": [1,2,3,4,5,6],
"timestamp": "1"}])
def test_collapse_event(self): def test_collapse_event(self):
queue = EventQueue("1") queue = EventQueue("1")
queue.push({"type": "pointer", queue.push({"type": "pointer",