mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-27 12:08:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

Only fetch prev_content when a client is streaming/paginating. Use transactions for event streams.

Browse source
This commit is contained in:
Erik Johnston 2015-01-06 13:03:23 +00:00
parent 3e26720e05
commit 98933e3db6
2 changed files with 90 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
synapse/storage/_base.py
View file

@ -434,12 +434,15 @@ class SQLBaseStore(object):
return self.runInteraction("_simple_max_id", func) return self.runInteraction("_simple_max_id", func)
def _get_events(self, event_ids): def _get_events(self, event_ids, check_redacted=True,
get_prev_content=False):
return self.runInteraction( return self.runInteraction(
"_get_events", self._get_events_txn, event_ids "_get_events", self._get_events_txn, event_ids,
check_redacted=check_redacted, get_prev_content=get_prev_content,
) )
def _get_events_txn(self, txn, event_ids): def _get_events_txn(self, txn, event_ids, check_redacted=True,
get_prev_content=False):
if not event_ids: if not event_ids:
return [] return []
@ -450,7 +453,13 @@ class SQLBaseStore(object):
n = 50 n = 50
split = [event_ids[i:i + n] for i in range(0, len(event_ids), n)] split = [event_ids[i:i + n] for i in range(0, len(event_ids), n)]
for e_ids in split: for e_ids in split:
events.extend(self._get_events_txn(txn, e_ids)) events.extend(
self._get_events_txn(
txn, e_ids,
check_redacted=check_redacted,
get_prev_content=get_prev_content,
)
)
return events return events
logger.debug("_get_events_txn Fetching %d events", len(event_ids)) logger.debug("_get_events_txn Fetching %d events", len(event_ids))
@ -467,10 +476,17 @@ class SQLBaseStore(object):
res = txn.fetchall() res = txn.fetchall()
return [self._get_event_from_row_txn(txn, *r) for r in res] return [
self._get_event_from_row_txn(
txn, r[0], r[1], r[2],
check_redacted=check_redacted,
get_prev_content=get_prev_content,
)
for r in res
]
def _get_event_txn(self, txn, event_id, check_redacted=True, def _get_event_txn(self, txn, event_id, check_redacted=True,
get_prev_content=True): get_prev_content=False):
sql = ( sql = (
"SELECT internal_metadata, json, r.event_id FROM event_json as e " "SELECT internal_metadata, json, r.event_id FROM event_json as e "
"LEFT JOIN redactions as r ON e.event_id = r.redacts " "LEFT JOIN redactions as r ON e.event_id = r.redacts "
@ -493,14 +509,12 @@ class SQLBaseStore(object):
) )
def _get_event_from_row_txn(self, txn, internal_metadata, js, redacted, def _get_event_from_row_txn(self, txn, internal_metadata, js, redacted,
check_redacted=True, get_prev_content=True): check_redacted=True, get_prev_content=False):
d = json.loads(js) d = json.loads(js)
internal_metadata = json.loads(internal_metadata) internal_metadata = json.loads(internal_metadata)
ev = FrozenEvent(d, internal_metadata_dict=internal_metadata) ev = FrozenEvent(d, internal_metadata_dict=internal_metadata)
return ev
if check_redacted and redacted: if check_redacted and redacted:
ev = prune_event(ev) ev = prune_event(ev)

100
synapse/storage/stream.py
View file

@ -137,12 +137,12 @@ class StreamStore(SQLBaseStore):
with_feedback=with_feedback, with_feedback=with_feedback,
) )
@defer.inlineCallbacks
@log_function @log_function
def get_room_events_stream(self, user_id, from_key, to_key, room_id, def get_room_events_stream(self, user_id, from_key, to_key, room_id,
limit=0, with_feedback=False): limit=0, with_feedback=False):
# TODO (erikj): Handle compressed feedback # TODO (erikj): Handle compressed feedback
current_room_membership_sql = ( current_room_membership_sql = (
"SELECT m.room_id FROM room_memberships as m " "SELECT m.room_id FROM room_memberships as m "
"INNER JOIN current_state_events as c ON m.event_id = c.event_id " "INNER JOIN current_state_events as c ON m.event_id = c.event_id "
@ -157,11 +157,6 @@ class StreamStore(SQLBaseStore):
"WHERE m.user_id = ? " "WHERE m.user_id = ? "
) )
del_sql = (
"SELECT event_id FROM redactions WHERE redacts = e.event_id "
"LIMIT 1"
)
if limit: if limit:
limit = max(limit, MAX_STREAM_SIZE) limit = max(limit, MAX_STREAM_SIZE)
else: else:
@ -172,38 +167,42 @@ class StreamStore(SQLBaseStore):
to_id = _parse_stream_token(to_key) to_id = _parse_stream_token(to_key)
if from_key == to_key: if from_key == to_key:
defer.returnValue(([], to_key)) return defer.succeed(([], to_key))
return
sql = ( sql = (
"SELECT *, (%(redacted)s) AS redacted FROM events AS e WHERE " "SELECT e.event_id, e.stream_ordering FROM events AS e WHERE "
"(e.outlier = 0 AND (room_id IN (%(current)s)) OR " "(e.outlier = 0 AND (room_id IN (%(current)s)) OR "
"(event_id IN (%(invites)s))) " "(event_id IN (%(invites)s))) "
"AND e.stream_ordering > ? AND e.stream_ordering <= ? " "AND e.stream_ordering > ? AND e.stream_ordering <= ? "
"ORDER BY stream_ordering ASC LIMIT %(limit)d " "ORDER BY stream_ordering ASC LIMIT %(limit)d "
) % { ) % {
"redacted": del_sql,
"current": current_room_membership_sql, "current": current_room_membership_sql,
"invites": membership_sql, "invites": membership_sql,
"limit": limit "limit": limit
} }
rows = yield self._execute_and_decode( def f(txn):
sql, txn.execute(sql, (user_id, user_id, from_id, to_id,))
user_id, user_id, from_id, to_id
)
ret = yield self._parse_events(rows) rows = self.cursor_to_dict(txn)
ret = self._get_events_txn(
txn,
[r["event_id"] for r in rows],
get_prev_content=True
)
if rows: if rows:
key = "s%d" % max([r["stream_ordering"] for r in rows]) key = "s%d" % max([r["stream_ordering"] for r in rows])
else: else:
# Assume we didn't get anything because there was nothing to get. # Assume we didn't get anything because there was nothing to
# get.
key = to_key key = to_key
defer.returnValue((ret, key)) return ret, key
return self.runInteraction("get_room_events_stream", f)
@defer.inlineCallbacks
@log_function @log_function
def paginate_room_events(self, room_id, from_key, to_key=None, def paginate_room_events(self, room_id, from_key, to_key=None,
direction='b', limit=-1, direction='b', limit=-1,
@ -221,7 +220,9 @@ class StreamStore(SQLBaseStore):
bounds = _get_token_bound(from_key, from_comp) bounds = _get_token_bound(from_key, from_comp)
if to_key: if to_key:
bounds = "%s AND %s" % (bounds, _get_token_bound(to_key, to_comp)) bounds = "%s AND %s" % (
bounds, _get_token_bound(to_key, to_comp)
)
if int(limit) > 0: if int(limit) > 0:
args.append(int(limit)) args.append(int(limit))
@ -229,27 +230,21 @@ class StreamStore(SQLBaseStore):
else: else:
limit_str = "" limit_str = ""
del_sql = (
"SELECT event_id FROM redactions WHERE redacts = events.event_id "
"LIMIT 1"
)
sql = ( sql = (
"SELECT *, (%(redacted)s) AS redacted FROM events" "SELECT * FROM events"
" WHERE outlier = 0 AND room_id = ? AND %(bounds)s" " WHERE outlier = 0 AND room_id = ? AND %(bounds)s"
" ORDER BY topological_ordering %(order)s," " ORDER BY topological_ordering %(order)s,"
" stream_ordering %(order)s %(limit)s" " stream_ordering %(order)s %(limit)s"
) % { ) % {
"redacted": del_sql,
"bounds": bounds, "bounds": bounds,
"order": order, "order": order,
"limit": limit_str "limit": limit_str
} }
rows = yield self._execute_and_decode( def f(txn):
sql, txn.execute(sql, args)
*args
) rows = self.cursor_to_dict(txn)
if rows: if rows:
topo = rows[-1]["topological_ordering"] topo = rows[-1]["topological_ordering"]
@ -262,38 +257,31 @@ class StreamStore(SQLBaseStore):
# TODO (erikj): We should work out what to do here instead. # TODO (erikj): We should work out what to do here instead.
next_token = to_key if to_key else from_key next_token = to_key if to_key else from_key
events = yield self._parse_events(rows) events = self._get_events_txn(
txn,
defer.returnValue( [r["event_id"] for r in rows],
( get_prev_content=True
events,
next_token
)
) )
@defer.inlineCallbacks return events, next_token,
return self.runInteraction("paginate_room_events", f)
def get_recent_events_for_room(self, room_id, limit, end_token, def get_recent_events_for_room(self, room_id, limit, end_token,
with_feedback=False): with_feedback=False):
# TODO (erikj): Handle compressed feedback # TODO (erikj): Handle compressed feedback
del_sql = (
"SELECT event_id FROM redactions WHERE redacts = events.event_id "
"LIMIT 1"
)
sql = ( sql = (
"SELECT *, (%(redacted)s) AS redacted FROM events " "SELECT * FROM events "
"WHERE room_id = ? AND stream_ordering <= ? AND outlier = 0 " "WHERE room_id = ? AND stream_ordering <= ? AND outlier = 0 "
"ORDER BY topological_ordering DESC, stream_ordering DESC LIMIT ? " "ORDER BY topological_ordering DESC, stream_ordering DESC LIMIT ? "
) % {
"redacted": del_sql,
}
rows = yield self._execute_and_decode(
sql,
room_id, end_token, limit
) )
def f(txn):
txn.execute(sql, (room_id, end_token, limit,))
rows = self.cursor_to_dict(txn)
rows.reverse() # As we selected with reverse ordering rows.reverse() # As we selected with reverse ordering
if rows: if rows:
@ -305,11 +293,15 @@ class StreamStore(SQLBaseStore):
else: else:
token = (end_token, end_token) token = (end_token, end_token)
events = yield self._parse_events(rows) events = self._get_events_txn(
txn,
[r["event_id"] for r in rows],
get_prev_content=True
)
ret = (events, token) return events, token
defer.returnValue(ret) return self.runInteraction("get_recent_events_for_room", f)
def get_room_events_max_id(self): def get_room_events_max_id(self):
return self.runInteraction( return self.runInteraction(