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

Also remove yield from within lock in the other generator

This commit is contained in:
Erik Johnston 2015-04-29 19:17:00 +01:00
parent d2d61a8288
commit 50f96f256f
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
synapse/storage/util/id_generators.py
View File

@ -30,15 +30,13 @@ class IdGenerator(object):
@defer.inlineCallbacks @defer.inlineCallbacks
def get_next(self): def get_next(self):
if self._next_id is None:
yield self.store.runInteraction(
"IdGenerator_%s" % (self.table,),
self.get_next_txn,
)
with self._lock: with self._lock:
if not self._next_id:
res = yield self.store._execute_and_decode(
"IdGenerator_%s" % (self.table,),
"SELECT MAX(%s) as mx FROM %s" % (self.column, self.table,)
)
self._next_id = (res and res[0] and res[0]["mx"]) or 1
i = self._next_id i = self._next_id
self._next_id += 1 self._next_id += 1
defer.returnValue(i) defer.returnValue(i)