Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "events: Check last_event_id for validity." 

This isn't correct without a proper migration for existing queues,
which may not be implementable.

This reverts commit e00d4be6d5.
This commit is contained in:
Tim Abbott 2019-07-31 16:04:26 -07:00
parent 2738e909f8
commit b86c5cc490
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/tests/test_tornado.py
View File

@ -117,7 +117,7 @@ class EventsTestCase(TornadoWebTestCase):
event_queue_id = self.create_queue() event_queue_id = self.create_queue()
data = { data = {
'queue_id': event_queue_id, 'queue_id': event_queue_id,
'last_event_id': -1, 'last_event_id': 0,
} }
path = '/json/events?{}'.format(urllib.parse.urlencode(data)) path = '/json/events?{}'.format(urllib.parse.urlencode(data))

6
zerver/tornado/event_queue.py
View File

@ -240,7 +240,6 @@ class EventQueue:
def __init__(self, id: str) -> None: def __init__(self, id: str) -> None:
self.queue = deque() # type: ignore # Should be Deque[Dict[str, Any]], but Deque isn't available in Python 3.4 self.queue = deque() # type: ignore # Should be Deque[Dict[str, Any]], but Deque isn't available in Python 3.4
self.next_event_id = 0 # type: int self.next_event_id = 0 # type: int
self.newest_pruned_id = -1 # type: int
self.id = id # type: str self.id = id # type: str
self.virtual_events = {} # type: Dict[str, Dict[str, Any]] self.virtual_events = {} # type: Dict[str, Dict[str, Any]]
@ -296,7 +295,6 @@ class EventQueue:
# See the comment on pop; that applies here as well # See the comment on pop; that applies here as well
def prune(self, through_id: int) -> None: def prune(self, through_id: int) -> None:
while len(self.queue) != 0 and self.queue[0]['id'] <= through_id: while len(self.queue) != 0 and self.queue[0]['id'] <= through_id:
self.newest_pruned_id = self.queue[0]['id']
self.pop() self.pop()
def contents(self) -> List[Dict[str, Any]]: def contents(self) -> List[Dict[str, Any]]:
@ -524,11 +522,7 @@ def fetch_events(query: Mapping[str, Any]) -> Dict[str, Any]:
raise BadEventQueueIdError(queue_id) raise BadEventQueueIdError(queue_id)
if user_profile_id != client.user_profile_id: if user_profile_id != client.user_profile_id:
raise JsonableError(_("You are not authorized to get events from this queue")) raise JsonableError(_("You are not authorized to get events from this queue"))
if last_event_id < client.event_queue.newest_pruned_id:
raise JsonableError(_("An event newer than %s has already been pruned!") % (last_event_id,))
client.event_queue.prune(last_event_id) client.event_queue.prune(last_event_id)
if last_event_id != client.event_queue.newest_pruned_id:
raise JsonableError(_("Event %s was not in this queue") % (last_event_id,))
was_connected = client.finish_current_handler() was_connected = client.finish_current_handler()
if not client.event_queue.empty() or dont_block: if not client.event_queue.empty() or dont_block: