From 73880268ef7184d17ec369074d1d0d72de56f33c Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 11 Apr 2017 17:34:09 +0100
Subject: Refactor event ordering check to events store

---
 synapse/storage/events.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'synapse/storage')

diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 64fe937bdc..3c6df5c2d2 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -2159,6 +2159,34 @@ class EventsStore(SQLBaseStore):
             ]
         )
 
+    @defer.inlineCallbacks
+    def is_event_after(self, event_id1, event_id2):
+        is_after = True
+
+        to_1, so_1 = yield self._get_event_ordering(event_id1)
+        to_2, so_2 = yield self._get_event_ordering(event_id2)
+
+        # Prevent updating if the existing marker is ahead in the stream
+        if to_1 > to_2:
+            is_after = False
+        elif to_1 == to_2 and so_1 >= so_2:
+            is_after = False
+
+        defer.returnValue(is_after)
+
+    @defer.inlineCallbacks
+    def _get_event_ordering(self, event_id):
+        res = yield self._simple_select_one(
+            table="events",
+            retcols=["topological_ordering", "stream_ordering"],
+            keyvalues={"event_id": event_id},
+            allow_none=True
+        )
+
+        if not res:
+            raise SynapseError(404, "Could not find event %s" % (event_id,))
+
+        defer.returnValue((int(res["topological_ordering"]), int(res["stream_ordering"])))
 
 AllNewEventsResult = namedtuple("AllNewEventsResult", [
     "new_forward_events", "new_backfill_events",
-- 
cgit 1.5.1


From 7f9470906636f169f9925f8e5205dc3ffb1a057d Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 11 Apr 2017 18:35:45 +0100
Subject: travis flake8..

---
 synapse/storage/events.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'synapse/storage')

diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 3c6df5c2d2..702bd64b2e 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -2188,6 +2188,7 @@ class EventsStore(SQLBaseStore):
 
         defer.returnValue((int(res["topological_ordering"]), int(res["stream_ordering"])))
 
+
 AllNewEventsResult = namedtuple("AllNewEventsResult", [
     "new_forward_events", "new_backfill_events",
     "forward_ex_outliers", "backward_ex_outliers",
-- 
cgit 1.5.1


From b9557064bf6003a666b8fb6813dd3618fe9e48b4 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 12 Apr 2017 14:36:20 +0100
Subject: Simplify is_event_after logic

---
 synapse/handlers/read_marker.py |  5 +++--
 synapse/storage/events.py       | 13 +++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'synapse/storage')

diff --git a/synapse/handlers/read_marker.py b/synapse/handlers/read_marker.py
index 800240b8a9..3f46a16b90 100644
--- a/synapse/handlers/read_marker.py
+++ b/synapse/handlers/read_marker.py
@@ -48,9 +48,10 @@ class ReadMarkerHandler(BaseHandler):
             should_update = True
 
             if existing_read_marker:
+                # Only update if the new marker is ahead in the stream
                 should_update = yield self.store.is_event_after(
-                    existing_read_marker['marker'],
-                    event_id
+                    event_id,
+                    existing_read_marker['marker']
                 )
 
             if should_update:
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 702bd64b2e..221cb563d8 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -2161,18 +2161,11 @@ class EventsStore(SQLBaseStore):
 
     @defer.inlineCallbacks
     def is_event_after(self, event_id1, event_id2):
-        is_after = True
-
+        """Returns True if event_id1 is after event_id2 in the stream
+        """
         to_1, so_1 = yield self._get_event_ordering(event_id1)
         to_2, so_2 = yield self._get_event_ordering(event_id2)
-
-        # Prevent updating if the existing marker is ahead in the stream
-        if to_1 > to_2:
-            is_after = False
-        elif to_1 == to_2 and so_1 >= so_2:
-            is_after = False
-
-        defer.returnValue(is_after)
+        defer.returnValue(to_1 > to_2 and so_1 > so_2)
 
     @defer.inlineCallbacks
     def _get_event_ordering(self, event_id):
-- 
cgit 1.5.1


From 6a70647d453ddeae9599601cc49a6b7cde5de519 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 13 Apr 2017 13:46:17 +0100
Subject: Correct logic in is_event_after

---
 synapse/storage/events.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'synapse/storage')

diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 221cb563d8..a3790419dd 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -2165,7 +2165,7 @@ class EventsStore(SQLBaseStore):
         """
         to_1, so_1 = yield self._get_event_ordering(event_id1)
         to_2, so_2 = yield self._get_event_ordering(event_id2)
-        defer.returnValue(to_1 > to_2 and so_1 > so_2)
+        defer.returnValue((to_1, so_1) > (to_2, so_2))
 
     @defer.inlineCallbacks
     def _get_event_ordering(self, event_id):
-- 
cgit 1.5.1