Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Store state groups separately from events #2784

Merged
merged 15 commits into from
Feb 6, 2018
Merged

Store state groups separately from events #2784

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
cb222e2
Split state group persist into seperate storage func
erikjohnston Jan 11, 2018
0f18d58
Add per database engine code for state group id gen
erikjohnston Jan 11, 2018
c8c8f53
Move store_state_group to StateReadStore
erikjohnston Jan 12, 2018
1b2af72
Hook up store_state_group
erikjohnston Feb 5, 2018
2fdf245
Fix tests
erikjohnston Feb 5, 2018
e66f2c3
Rename _store_mult_state_groups_txn
erikjohnston Feb 5, 2018
693ea27
Rename StateGroupReadStore
erikjohnston Feb 5, 2018
a742398
Remove redundant _have_persisted_state_group_txn
erikjohnston Feb 6, 2018
90cd2e6
Update comments
erikjohnston Feb 6, 2018
c695725
Comment compute_event_context
erikjohnston Feb 6, 2018
22be520
Set start val for state_group_id_seq
richvdh Jan 30, 2018
2694524
Update comments
erikjohnston Feb 6, 2018
7018b68
Don't store state for outliers
erikjohnston Feb 6, 2018
a6b415c
Update comment
erikjohnston Feb 6, 2018
4a72132
Update docstring as state groups are ints
erikjohnston Feb 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions synapse/storage/events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ def _persist_events_txn(self, txn, events_and_contexts, backfilled,

# Insert into the state_groups, state_groups_state, and
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this comment is misleading now

# event_to_state_groups tables.
self._store_mult_state_groups_txn(txn, events_and_contexts)
self._store_event_state_mappings_txn(txn, events_and_contexts)

# _store_rejected_events_txn filters out any events which were
# rejected, and returns the filtered list.
Expand Down Expand Up @@ -982,7 +982,7 @@ def _update_outliers_txn(self, txn, events_and_contexts):
# insert into the state_group, state_groups_state and
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

# event_to_state_groups tables.
try:
self._store_mult_state_groups_txn(txn, ((event, context),))
self._store_event_state_mappings_txn(txn, ((event, context),))
except Exception:
logger.exception("")
raise
Expand Down
2 changes: 1 addition & 1 deletion synapse/storage/state.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ def _have_persisted_state_group_txn(self, txn, state_group):
row = txn.fetchone()
return row and row[0]

def _store_mult_state_groups_txn(self, txn, events_and_contexts):
def _store_event_state_mappings_txn(self, txn, events_and_contexts):
state_groups = {}
for event, context in events_and_contexts:
if event.internal_metadata.is_outlier():
Expand Down