diff options
| author | Erik Johnston <erik@matrix.org> | 2020-07-17 17:03:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-17 17:03:27 +0100 |
| commit | 2d2acc1cf2f2c8caa1272a14658b28ede23b664f (patch) | |
| tree | 93caef0f60f679ae6b969c3d0c9768f3720090d3 | |
| parent | Fix TypeError in synapse.notifier (#7880) (diff) | |
| download | synapse-2d2acc1cf2f2c8caa1272a14658b28ede23b664f.tar.xz | |
Stop using 'device_max_stream_id' (#7882)
It serves no purpose and updating everytime we write to the device inbox stream means all such transactions will conflict, causing lots of transaction failures and retries.
| -rw-r--r-- | changelog.d/7882.misc | 1 | ||||
| -rw-r--r-- | synapse/replication/slave/storage/deviceinbox.py | 2 | ||||
| -rw-r--r-- | synapse/storage/data_stores/main/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/storage/data_stores/main/deviceinbox.py | 3 |
4 files changed, 3 insertions, 5 deletions
diff --git a/changelog.d/7882.misc b/changelog.d/7882.misc new file mode 100644 index 0000000000..9002749335 --- /dev/null +++ b/changelog.d/7882.misc @@ -0,0 +1 @@ +Stop using `device_max_stream_id` table and just use `device_inbox.stream_id`. diff --git a/synapse/replication/slave/storage/deviceinbox.py b/synapse/replication/slave/storage/deviceinbox.py index bd394f6b00..a8a16dbc71 100644 --- a/synapse/replication/slave/storage/deviceinbox.py +++ b/synapse/replication/slave/storage/deviceinbox.py @@ -26,7 +26,7 @@ class SlavedDeviceInboxStore(DeviceInboxWorkerStore, BaseSlavedStore): def __init__(self, database: Database, db_conn, hs): super(SlavedDeviceInboxStore, self).__init__(database, db_conn, hs) self._device_inbox_id_gen = SlavedIdTracker( - db_conn, "device_max_stream_id", "stream_id" + db_conn, "device_inbox", "stream_id" ) self._device_inbox_stream_cache = StreamChangeCache( "DeviceInboxStreamChangeCache", diff --git a/synapse/storage/data_stores/main/__init__.py b/synapse/storage/data_stores/main/__init__.py index 4b4763c701..932458f651 100644 --- a/synapse/storage/data_stores/main/__init__.py +++ b/synapse/storage/data_stores/main/__init__.py @@ -128,7 +128,7 @@ class DataStore( db_conn, "presence_stream", "stream_id" ) self._device_inbox_id_gen = StreamIdGenerator( - db_conn, "device_max_stream_id", "stream_id" + db_conn, "device_inbox", "stream_id" ) self._public_room_id_gen = StreamIdGenerator( db_conn, "public_room_list_stream", "stream_id" diff --git a/synapse/storage/data_stores/main/deviceinbox.py b/synapse/storage/data_stores/main/deviceinbox.py index ff86f18d40..da297b31fb 100644 --- a/synapse/storage/data_stores/main/deviceinbox.py +++ b/synapse/storage/data_stores/main/deviceinbox.py @@ -424,9 +424,6 @@ class DeviceInboxStore(DeviceInboxWorkerStore, DeviceInboxBackgroundUpdateStore) def _add_messages_to_local_device_inbox_txn( self, txn, stream_id, messages_by_user_then_device ): - sql = "UPDATE device_max_stream_id" " SET stream_id = ?" " WHERE stream_id < ?" - txn.execute(sql, (stream_id, stream_id)) - local_by_user_then_device = {} for user_id, messages_by_device in messages_by_user_then_device.items(): messages_json_for_user = {} |