Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Wrap all of get_app_service_rooms in a txn.

This commit is contained in:
Kegan Dougal 2015-03-02 11:20:51 +00:00
parent b216b36892
commit 377ae369c1
6 changed files with 67 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
synapse/storage/appservice.py
View File

@ -15,6 +15,7 @@
import logging
from twisted.internet import defer
from synapse.api.constants import Membership
from synapse.api.errors import StoreError
from synapse.appservice import ApplicationService
from synapse.storage.roommember import RoomsForUser
@ -197,7 +198,6 @@ class ApplicationServiceStore(SQLBaseStore):
# TODO: The from_cache=False impl
# TODO: This should be JOINed with the application_services_regex table.
@defer.inlineCallbacks
def get_app_service_rooms(self, service):
"""Get a list of RoomsForUser for this application service.
@ -212,35 +212,49 @@ class ApplicationServiceStore(SQLBaseStore):
Returns:
A list of RoomsForUser.
"""
# FIXME: This is assuming that this store has methods from
# RoomStore, DirectoryStore, RegistrationStore, RoomMemberStore which is
# a bad assumption to make as it makes testing trickier and coupling
# less obvious.
return self.runInteraction(
"get_app_service_rooms",
self._get_app_service_rooms_txn,
service,
)
def _get_app_service_rooms_txn(self, txn, service):
# get all rooms matching the room ID regex.
room_entries = yield self.get_all_rooms()
room_entries = self._simple_select_list_txn(
txn=txn, table="rooms", keyvalues=None, retcols=["room_id"]
)
matching_room_list = set([
r["room_id"] for r in room_entries if
service.is_interested_in_room(r["room_id"])
])
# resolve room IDs for matching room alias regex.
room_alias_mappings = yield self.get_all_associations()
room_alias_mappings = self._simple_select_list_txn(
txn=txn, table="room_aliases", keyvalues=None,
retcols=["room_id", "room_alias"]
)
matching_room_list |= set([
r.room_id for r in room_alias_mappings if
service.is_interested_in_alias(r.room_alias)
r["room_id"] for r in room_alias_mappings if
service.is_interested_in_alias(r["room_alias"])
])
# get all rooms for every user for this AS. This is scoped to users on
# this HS only.
user_list = yield self.get_all_users()
user_list = self._simple_select_list_txn(
txn=txn, table="users", keyvalues=None, retcols=["name"]
)
user_list = [
u["name"] for u in user_list if
service.is_interested_in_user(u["name"])
]
rooms_for_user_matching_user_id = set() # RoomsForUser list
for user_id in user_list:
rooms_for_user = yield self.get_rooms_for_user(user_id)
# FIXME: This assumes this store is linked with RoomMemberStore :(
rooms_for_user = self._get_rooms_for_user_where_membership_is_txn(
txn=txn,
user_id=user_id,
membership_list=[Membership.JOIN]
)
rooms_for_user_matching_user_id |= set(rooms_for_user)
# make RoomsForUser tuples for room ids and aliases which are not in the
@ -253,7 +267,7 @@ class ApplicationServiceStore(SQLBaseStore):
]
rooms_for_user_matching_user_id |= set(missing_rooms_for_user)
defer.returnValue(rooms_for_user_matching_user_id)
return rooms_for_user_matching_user_id
@defer.inlineCallbacks
def _populate_cache(self):

21
synapse/storage/directory.py
View File

@ -134,27 +134,6 @@ class DirectoryStore(SQLBaseStore):
return room_id
@defer.inlineCallbacks
def get_all_associations(self):
"""Retrieve the entire list of room alias -> room ID pairings.
Returns:
A list of RoomAliasMappings.
"""
results = yield self._execute_and_decode(
"SELECT room_id, room_alias FROM room_aliases"
)
# TODO(kegan): It feels wrong to be specifying no servers here, but
# equally this function isn't required to obtain all servers so
# retrieving them "just for the sake of it" also seems wrong, but we
# want to conform to passing Objects around and not dicts..
defer.returnValue([
RoomAliasMapping(
room_id=r["room_id"], room_alias=r["room_alias"], servers=""
) for r in results
])
def get_aliases_for_room(self, room_id):
return self._simple_select_onecol(
"room_aliases",

4
synapse/storage/registration.py
View File

@ -92,10 +92,6 @@ class RegistrationStore(SQLBaseStore):
query, user_id
)
def get_all_users(self):
return self._simple_select_list(
table="users", keyvalues=None, retcols=["name"])
def get_user_by_token(self, token):
"""Get a user from the given access token.

10
synapse/storage/room.py
View File

@ -71,16 +71,6 @@ class RoomStore(SQLBaseStore):
RoomsTable.decode_single_result, query, room_id,
)
def get_all_rooms(self):
"""Retrieve all the rooms.
Returns:
A list of namedtuples containing the room information.
"""
return self._simple_select_list(
table="rooms", keyvalues=None, retcols=["room_id"]
)
@defer.inlineCallbacks
def get_rooms(self, is_public):
"""Retrieve a list of all public rooms.

14
synapse/storage/roommember.py
View File

@ -180,6 +180,14 @@ class RoomMemberStore(SQLBaseStore):
if not membership_list:
return defer.succeed(None)
return self.runInteraction(
"get_rooms_for_user_where_membership_is",
self._get_rooms_for_user_where_membership_is_txn,
user_id, membership_list
)
def _get_rooms_for_user_where_membership_is_txn(self, txn, user_id,
membership_list):
where_clause = "user_id = ? AND (%s)" % (
" OR ".join(["membership = ?" for _ in membership_list]),
)
@ -187,7 +195,6 @@ class RoomMemberStore(SQLBaseStore):
args = [user_id]
args.extend(membership_list)
def f(txn):
sql = (
"SELECT m.room_id, m.sender, m.membership"
" FROM room_memberships as m"
@ -201,11 +208,6 @@ class RoomMemberStore(SQLBaseStore):
RoomsForUser(**r) for r in self.cursor_to_dict(txn)
]
return self.runInteraction(
"get_rooms_for_user_where_membership_is",
f
)
def get_joined_hosts_for_room(self, room_id):
return self._simple_select_onecol(
"room_hosts",

36
synapse/storage/stream.py
View File

@ -146,18 +146,6 @@ class StreamStore(SQLBaseStore):
defer.returnValue(([], to_key))
return
# Logic:
# - We want ALL events which match the AS room_id regex
# - We want ALL events which match the rooms represented by the AS
# room_alias regex
# - We want ALL events for rooms that AS users have joined.
# This is currently supported via get_app_service_rooms (which is used
# for the Notifier listener rooms). We can't reasonably make a SQL
# query for these room IDs, so we'll pull all the events between from/to
# and filter in python.
rooms_for_as = yield self.get_app_service_rooms(service)
room_ids_for_as = [r.room_id for r in rooms_for_as]
# select all the events between from/to with a sensible limit
sql = (
"SELECT e.event_id, e.room_id, e.type, s.state_key, "
@ -169,6 +157,23 @@ class StreamStore(SQLBaseStore):
"limit": limit
}
def f(txn):
# pull out all the events between the tokens
txn.execute(sql, (from_id.stream, to_id.stream,))
rows = self.cursor_to_dict(txn)
# Logic:
# - We want ALL events which match the AS room_id regex
# - We want ALL events which match the rooms represented by the AS
# room_alias regex
# - We want ALL events for rooms that AS users have joined.
# This is currently supported via get_app_service_rooms (which is
# used for the Notifier listener rooms). We can't reasonably make a
# SQL query for these room IDs, so we'll pull all the events between
# from/to and filter in python.
rooms_for_as = self._get_app_service_rooms_txn(txn, service)
room_ids_for_as = [r.room_id for r in rooms_for_as]
def app_service_interested(row):
if row["room_id"] in room_ids_for_as:
return True
@ -178,11 +183,6 @@ class StreamStore(SQLBaseStore):
return True
return False
def f(txn):
txn.execute(sql, (from_id.stream, to_id.stream,))
rows = self.cursor_to_dict(txn)
ret = self._get_events_txn(
txn,
# apply the filter on the room id list
@ -197,7 +197,6 @@ class StreamStore(SQLBaseStore):
if rows:
key = "s%d" % max(r["stream_ordering"] for r in rows)
else:
# Assume we didn't get anything because there was nothing to
# get.
@ -266,7 +265,6 @@ class StreamStore(SQLBaseStore):
if rows:
key = "s%d" % max(r["stream_ordering"] for r in rows)
else:
# Assume we didn't get anything because there was nothing to
# get.