summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-11-15 14:02:34 +0000
committerGitHub <noreply@github.com>2019-11-15 14:02:34 +0000
commit657d614f6a53f3dbfd2858bd85d0f81563db0041 (patch)
tree6ef5a4a9a9b3aaa14f0e80989c23445b59de3d38 /synapse/storage
parentAdd optional python dependencies to snap packaging (#6317) (diff)
downloadsynapse-657d614f6a53f3dbfd2858bd85d0f81563db0041.tar.xz
Replace UPDATE with UPSERT on device_max_stream_id table (#6363)
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/data_stores/main/deviceinbox.py17
1 files changed, 15 insertions, 2 deletions
diff --git a/synapse/storage/data_stores/main/deviceinbox.py b/synapse/storage/data_stores/main/deviceinbox.py

index f04aad0743..96cd0fb77a 100644 --- a/synapse/storage/data_stores/main/deviceinbox.py +++ b/synapse/storage/data_stores/main/deviceinbox.py
@@ -358,8 +358,21 @@ 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)) + # Compatible method of performing an upsert + sql = "SELECT stream_id FROM device_max_stream_id" + + txn.execute(sql) + rows = txn.fetchone() + if rows: + db_stream_id = rows[0] + if db_stream_id < stream_id: + # Insert the new stream_id + sql = "UPDATE device_max_stream_id SET stream_id = ?" + else: + # No rows, perform an insert + sql = "INSERT INTO device_max_stream_id (stream_id) VALUES (?)" + + txn.execute(sql, (stream_id,)) local_by_user_then_device = {} for user_id, messages_by_device in messages_by_user_then_device.items():