Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Drop unused tables & unneeded access token ID for events. (#16268)
Browse files Browse the repository at this point in the history
Drop the event_txn_id table and the tables related to MSC2716,
which is no longer supported in Synapse.
  • Loading branch information
clokep authored Oct 6, 2023
1 parent fc31b49 commit cabd577
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 8 deletions.
1 change: 1 addition & 0 deletions changelog.d/16268.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Clean-up unused tables.
8 changes: 2 additions & 6 deletions synapse/handlers/message.py
Original file line number Diff line number Diff line change
Expand Up @@ -693,13 +693,9 @@ async def create_event(
if require_consent and not is_exempt:
await self.assert_accepted_privacy_policy(requester)

# Save the access token ID, the device ID and the transaction ID in the event
# internal metadata. This is useful to determine if we should echo the
# transaction_id in events.
# Save the the device ID and the transaction ID in the event internal metadata.
# This is useful to determine if we should echo the transaction_id in events.
# See `synapse.events.utils.EventClientSerializer.serialize_event`
if requester.access_token_id is not None:
builder.internal_metadata.token_id = requester.access_token_id

if requester.device_id is not None:
builder.internal_metadata.device_id = requester.device_id

Expand Down
4 changes: 2 additions & 2 deletions synapse/storage/schema/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@


SCHEMA_COMPAT_VERSION = (
# The `event_txn_id_device_id` must be written to for new events.
80
# The event_txn_id table and tables from MSC2716 no longer exist.
82
)
"""Limit on how far the synapse codebase can be rolled back without breaking db compat
Expand Down
24 changes: 24 additions & 0 deletions synapse/storage/schema/main/delta/82/03_drop_old_tables.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/* Copyright 2023 The Matrix.org Foundation C.I.C
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

-- Drop the old event transaction ID table, the event_txn_id_device_id table
-- should be used instead.
DROP TABLE IF EXISTS event_txn_id;

-- Drop tables related to MSC2716 since the implementation is being removed
DROP TABLE insertion_events;
DROP TABLE insertion_event_edges;
DROP TABLE insertion_event_extremities;
DROP TABLE batch_events;

0 comments on commit cabd577

Please sign in to comment.