This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix sqlite
user_filters
upgrade (#15817)
- Loading branch information
Showing
4 changed files
with
92 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Fix sqlite `user_filters` upgrade introduced in v1.86.0. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
synapse/storage/schema/main/delta/78/03_remove_unused_indexes_user_filters.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
# 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. | ||
from synapse.config.homeserver import HomeServerConfig | ||
from synapse.storage.database import LoggingTransaction | ||
from synapse.storage.engines import BaseDatabaseEngine, Sqlite3Engine | ||
|
||
|
||
def run_update( | ||
cur: LoggingTransaction, | ||
database_engine: BaseDatabaseEngine, | ||
config: HomeServerConfig, | ||
) -> None: | ||
""" | ||
Fix to drop unused indexes caused by incorrectly adding UNIQUE constraint to | ||
columns `user_id` and `full_user_id` of table `user_filters` in previous migration. | ||
""" | ||
|
||
if isinstance(database_engine, Sqlite3Engine): | ||
cur.execute("DROP TABLE IF EXISTS temp_user_filters") | ||
create_sql = """ | ||
CREATE TABLE temp_user_filters ( | ||
full_user_id text NOT NULL, | ||
user_id text NOT NULL, | ||
filter_id bigint NOT NULL, | ||
filter_json bytea NOT NULL | ||
) | ||
""" | ||
cur.execute(create_sql) | ||
|
||
copy_sql = """ | ||
INSERT INTO temp_user_filters ( | ||
user_id, | ||
filter_id, | ||
filter_json, | ||
full_user_id) | ||
SELECT user_id, filter_id, filter_json, full_user_id FROM user_filters | ||
""" | ||
cur.execute(copy_sql) | ||
|
||
drop_sql = """ | ||
DROP TABLE user_filters | ||
""" | ||
cur.execute(drop_sql) | ||
|
||
rename_sql = """ | ||
ALTER TABLE temp_user_filters RENAME to user_filters | ||
""" | ||
cur.execute(rename_sql) | ||
|
||
index_sql = """ | ||
CREATE UNIQUE INDEX IF NOT EXISTS user_filters_unique ON | ||
user_filters (user_id, filter_id) | ||
""" | ||
cur.execute(index_sql) |
25 changes: 25 additions & 0 deletions
25
synapse/storage/schema/main/delta/78/04_add_full_user_id_index_user_filters.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# 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. | ||
|
||
from synapse.storage.database import LoggingTransaction | ||
from synapse.storage.engines import BaseDatabaseEngine, Sqlite3Engine | ||
|
||
|
||
def run_create(cur: LoggingTransaction, database_engine: BaseDatabaseEngine) -> None: | ||
if isinstance(database_engine, Sqlite3Engine): | ||
idx_sql = """ | ||
CREATE UNIQUE INDEX IF NOT EXISTS user_filters_full_user_id_unique ON | ||
user_filters (full_user_id, filter_id) | ||
""" | ||
cur.execute(idx_sql) |