Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-07-04 18:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

SQL doesn't allow AUTOINCREMENT on non PRIMARY KEY columns.

Browse Source
This commit is contained in:
Erik Johnston 2014-08-18 16:00:46 +01:00
parent b4a1f2ccb5
commit 709a92cee8
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
synapse/storage/__init__.py
View File

@ -45,6 +45,9 @@ class DataStore(RoomMemberStore, RoomStore,
self.event_factory = hs.get_event_factory() self.event_factory = hs.get_event_factory()
self.hs = hs self.hs = hs
self.min_token_deferred = self._get_min_token()
self.min_token = None
@defer.inlineCallbacks @defer.inlineCallbacks
def persist_event(self, event, backfilled=False): def persist_event(self, event, backfilled=False):
if event.type == RoomMemberEvent.TYPE: if event.type == RoomMemberEvent.TYPE:
@ -82,7 +85,7 @@ class DataStore(RoomMemberStore, RoomStore,
@defer.inlineCallbacks @defer.inlineCallbacks
def _store_event(self, event, backfilled): def _store_event(self, event, backfilled):
# FIXME (erikj): This should be removed when we start amalgamating # FIXME (erikj): This should be removed when we start amalgamating
# event and pdu storage. # event and pdu storage
yield self.hs.get_federation().fill_out_prev_events(event) yield self.hs.get_federation().fill_out_prev_events(event)
vals = { vals = {
@ -95,7 +98,10 @@ class DataStore(RoomMemberStore, RoomStore,
} }
if backfilled: if backfilled:
vals["token_ordering"] = "-1" if not self.min_token_deferred.called:
yield self.min_token_deferred
self.min_token -= 1
vals["token_ordering"] = self.min_token
unrec = { unrec = {
k: v k: v
@ -151,6 +157,17 @@ class DataStore(RoomMemberStore, RoomStore,
defer.returnValue([self._parse_event_from_row(r) for r in results]) defer.returnValue([self._parse_event_from_row(r) for r in results])
@defer.inlineCallbacks
def _get_min_token(self):
row = yield self._execute(
None,
"SELECT MIN(token_ordering) FROM events"
)
self.min_token = rows[0][0] if rows and rows[0] else 0
defer.returnValue(self.min_token)
def schema_path(schema): def schema_path(schema):
""" Get a filesystem path for the named database schema """ Get a filesystem path for the named database schema

2
synapse/storage/schema/im.sql
View File

@ -14,7 +14,7 @@
*/ */
CREATE TABLE IF NOT EXISTS events( CREATE TABLE IF NOT EXISTS events(
token_ordering INTEGER AUTOINCREMENT, token_ordering INTEGER PRIMARY KEY AUTOINCREMENT,
topological_ordering INTEGER NOT NULL, topological_ordering INTEGER NOT NULL,
event_id TEXT NOT NULL, event_id TEXT NOT NULL,
type TEXT NOT NULL, type TEXT NOT NULL,

2
tests/rest/test_presence.py
View File

@ -51,6 +51,7 @@ class PresenceStateTestCase(unittest.TestCase):
hs = HomeServer("test", hs = HomeServer("test",
db_pool=None, db_pool=None,
http_client=None, http_client=None,
datastore=None,
resource_for_client=self.mock_server, resource_for_client=self.mock_server,
resource_for_federation=self.mock_server, resource_for_federation=self.mock_server,
) )
@ -109,6 +110,7 @@ class PresenceListTestCase(unittest.TestCase):
hs = HomeServer("test", hs = HomeServer("test",
db_pool=None, db_pool=None,
http_client=None, http_client=None,
datastore=None,
resource_for_client=self.mock_server, resource_for_client=self.mock_server,
resource_for_federation=self.mock_server resource_for_federation=self.mock_server
) )

1
tests/rest/test_profile.py
View File

@ -46,6 +46,7 @@ class ProfileTestCase(unittest.TestCase):
resource_for_client=self.mock_server, resource_for_client=self.mock_server,
federation=Mock(), federation=Mock(),
replication_layer=Mock(), replication_layer=Mock(),
datastore=None,
) )
def _get_user_by_token(token=None): def _get_user_by_token(token=None):