diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index f63c073a20..64556c5eb8 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -896,7 +896,7 @@ class SyncHandler(BaseHandler):
notifs = []
if last_unread_event_id:
- notifs = yield self.store.get_unread_event_actions_by_room_for_user(
+ notifs = yield self.store.get_unread_event_push_actions_by_room_for_user(
room_id, sync_config.user.to_string(), last_unread_event_id
)
else:
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py
index 250f22a168..3ab6da0625 100644
--- a/synapse/push/__init__.py
+++ b/synapse/push/__init__.py
@@ -27,7 +27,7 @@ import random
logger = logging.getLogger(__name__)
-# Pushers could now be moved to pull out of the event_actions table instead
+# Pushers could now be moved to pull out of the event_push_actions table instead
# of listening on the event stream: this would avoid them having to run the
# rules again.
class Pusher(object):
diff --git a/synapse/push/action_generator.py b/synapse/push/action_generator.py
index 4ab5d9e1b8..5526324a6d 100644
--- a/synapse/push/action_generator.py
+++ b/synapse/push/action_generator.py
@@ -40,7 +40,7 @@ class ActionGenerator:
actions_by_user = bulk_evaluator.action_for_event_by_user(event)
- yield self.store.set_actions_for_event_and_users(
+ yield self.store.set_push_actions_for_event_and_users(
event,
[
(uid, None, actions) for uid, actions in actions_by_user.items()
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index a112dd237f..43e05f144a 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -33,7 +33,7 @@ from .pusher import PusherStore
from .push_rule import PushRuleStore
from .media_repository import MediaRepositoryStore
from .rejections import RejectionsStore
-from .event_actions import EventActionsStore
+from .event_push_actions import EventPushActionsStore
from .state import StateStore
from .signatures import SignatureStore
@@ -76,7 +76,7 @@ class DataStore(RoomMemberStore, RoomStore,
SearchStore,
TagsStore,
AccountDataStore,
- EventActionsStore
+ EventPushActionsStore
):
def __init__(self, hs):
diff --git a/synapse/storage/event_actions.py b/synapse/storage/event_push_actions.py
index fa9cbe71ee..016c0adf8a 100644
--- a/synapse/storage/event_actions.py
+++ b/synapse/storage/event_push_actions.py
@@ -22,9 +22,9 @@ import simplejson as json
logger = logging.getLogger(__name__)
-class EventActionsStore(SQLBaseStore):
+class EventPushActionsStore(SQLBaseStore):
@defer.inlineCallbacks
- def set_actions_for_event_and_users(self, event, tuples):
+ def set_push_actions_for_event_and_users(self, event, tuples):
"""
:param event: the event set actions for
:param tuples: list of tuples of (user_id, profile_tag, actions)
@@ -42,15 +42,15 @@ class EventActionsStore(SQLBaseStore):
yield self.runInteraction(
"set_actions_for_event_and_users",
self._simple_insert_many_txn,
- EventActionsTable.table_name,
+ EventPushActionsTable.table_name,
values
)
@defer.inlineCallbacks
- def get_unread_event_actions_by_room_for_user(
+ def get_unread_event_push_actions_by_room_for_user(
self, room_id, user_id, last_read_event_id
):
- def _get_unread_event_actions_by_room(txn):
+ def _get_unread_event_push_actions_by_room(txn):
sql = (
"SELECT stream_ordering, topological_ordering"
" FROM events"
@@ -68,7 +68,7 @@ class EventActionsStore(SQLBaseStore):
sql = (
"SELECT ea.event_id, ea.actions"
- " FROM event_actions ea, events e"
+ " FROM event_push_actions ea, events e"
" WHERE ea.room_id = e.room_id"
" AND ea.event_id = e.event_id"
" AND ea.user_id = ?"
@@ -88,11 +88,11 @@ class EventActionsStore(SQLBaseStore):
]
ret = yield self.runInteraction(
- "get_unread_event_actions_by_room",
- _get_unread_event_actions_by_room
+ "get_unread_event_push_actions_by_room",
+ _get_unread_event_push_actions_by_room
)
defer.returnValue(ret)
-class EventActionsTable(object):
- table_name = "event_actions"
+class EventPushActionsTable(object):
+ table_name = "event_push_actions"
diff --git a/synapse/storage/schema/delta/27/event_actions.sql b/synapse/storage/schema/delta/27/event_push_actions.sql
index bbdaee990e..bdf6ae3f24 100644
--- a/synapse/storage/schema/delta/27/event_actions.sql
+++ b/synapse/storage/schema/delta/27/event_push_actions.sql
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-CREATE TABLE IF NOT EXISTS event_actions(
+CREATE TABLE IF NOT EXISTS event_push_actions(
room_id TEXT NOT NULL,
event_id TEXT NOT NULL,
user_id TEXT NOT NULL,
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS event_actions(
);
-CREATE INDEX event_actions_room_id_event_id_user_id_profile_tag on event_actions(room_id, event_id, user_id, profile_tag);
+CREATE INDEX event_push_actions_room_id_event_id_user_id_profile_tag on event_push_actions(room_id, event_id, user_id, profile_tag);
|
