summary refs log tree commit diff
path: root/synapse/storage/state.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-03-01 14:32:56 +0000
committerMark Haines <mark.haines@matrix.org>2016-03-01 14:32:56 +0000
commit54172924c834a954fcbbc6224318140b9e95aa7d (patch)
treeff950648c290b028b1993f1c627eaf764744df2a /synapse/storage/state.py
parentMerge pull request #607 from matrix-org/dbkr/send_inviter_member_event (diff)
downloadsynapse-54172924c834a954fcbbc6224318140b9e95aa7d.tar.xz
Load the current id in the IdGenerator constructor
Rather than loading them lazily. This allows us to remove all
the yield statements and spurious arguments for the get_next
methods.

It also allows us to replace all instances of get_next_txn with
get_next since get_next no longer needs to access the db.
Diffstat (limited to 'synapse/storage/state.py')
-rw-r--r--synapse/storage/state.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index 372b540002..8ed8a21b0a 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -83,7 +83,7 @@ class StateStore(SQLBaseStore):
             if event.is_state():
                 state_events[(event.type, event.state_key)] = event
 
-            state_group = self._state_groups_id_gen.get_next_txn(txn)
+            state_group = self._state_groups_id_gen.get_next()
             self._simple_insert_txn(
                 txn,
                 table="state_groups",