mirror of https://github.com/watcha-fr/synapse
Olivier Wilkinson (reivilibre)
1 year ago
commit
8e8431bc6e
@ -1,50 +0,0 @@ |
||||
from synapse.storage.database import LoggingTransaction |
||||
from synapse.storage.engines import BaseDatabaseEngine, PostgresEngine |
||||
|
||||
|
||||
def run_create(cur: LoggingTransaction, database_engine: BaseDatabaseEngine) -> None: |
||||
""" |
||||
Update to drop the NOT NULL constraint on column user_id so that we can cease to |
||||
write to it without inserts to other columns triggering the constraint |
||||
""" |
||||
|
||||
if isinstance(database_engine, PostgresEngine): |
||||
drop_sql = """ |
||||
ALTER TABLE profiles ALTER COLUMN user_id DROP NOT NULL |
||||
""" |
||||
cur.execute(drop_sql) |
||||
else: |
||||
# irritatingly in SQLite we need to rewrite the table to drop the constraint. |
||||
cur.execute("DROP TABLE IF EXISTS temp_profiles") |
||||
|
||||
create_sql = """ |
||||
CREATE TABLE temp_profiles ( |
||||
full_user_id text NOT NULL, |
||||
user_id text, |
||||
displayname text, |
||||
avatar_url text, |
||||
UNIQUE (full_user_id), |
||||
UNIQUE (user_id) |
||||
) |
||||
""" |
||||
cur.execute(create_sql) |
||||
|
||||
copy_sql = """ |
||||
INSERT INTO temp_profiles ( |
||||
user_id, |
||||
displayname, |
||||
avatar_url, |
||||
full_user_id) |
||||
SELECT user_id, displayname, avatar_url, full_user_id FROM profiles |
||||
""" |
||||
cur.execute(copy_sql) |
||||
|
||||
drop_sql = """ |
||||
DROP TABLE profiles |
||||
""" |
||||
cur.execute(drop_sql) |
||||
|
||||
rename_sql = """ |
||||
ALTER TABLE temp_profiles RENAME to profiles |
||||
""" |
||||
cur.execute(rename_sql) |
||||
@ -1,54 +0,0 @@ |
||||
from synapse.storage.database import LoggingTransaction |
||||
from synapse.storage.engines import BaseDatabaseEngine, PostgresEngine |
||||
|
||||
|
||||
def run_create(cur: LoggingTransaction, database_engine: BaseDatabaseEngine) -> None: |
||||
""" |
||||
Update to drop the NOT NULL constraint on column user_id so that we can cease to |
||||
write to it without inserts to other columns triggering the constraint |
||||
""" |
||||
if isinstance(database_engine, PostgresEngine): |
||||
drop_sql = """ |
||||
ALTER TABLE user_filters ALTER COLUMN user_id DROP NOT NULL |
||||
""" |
||||
cur.execute(drop_sql) |
||||
|
||||
else: |
||||
# irritatingly in SQLite we need to rewrite the table to drop the constraint. |
||||
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, |
||||
filter_id bigint NOT NULL, |
||||
filter_json bytea NOT NULL |
||||
) |
||||
""" |
||||
cur.execute(create_sql) |
||||
|
||||
index_sql = """ |
||||
CREATE UNIQUE INDEX IF NOT EXISTS user_filters_full_user_id_unique ON |
||||
temp_user_filters (full_user_id, filter_id) |
||||
""" |
||||
cur.execute(index_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) |
||||
@ -0,0 +1,94 @@ |
||||
# 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 twisted.test.proto_helpers import MemoryReactor |
||||
|
||||
from synapse.server import HomeServer |
||||
from synapse.storage.database import LoggingTransaction |
||||
from synapse.storage.engines import PostgresEngine |
||||
from synapse.util import Clock |
||||
|
||||
from tests import unittest |
||||
|
||||
|
||||
class UserFiltersStoreTestCase(unittest.HomeserverTestCase): |
||||
""" |
||||
Test background migration that copies entries from column user_id to full_user_id, adding |
||||
the hostname in the process. |
||||
""" |
||||
|
||||
def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None: |
||||
self.store = hs.get_datastores().main |
||||
|
||||
def test_bg_migration(self) -> None: |
||||
updater = self.hs.get_datastores().main.db_pool.updates |
||||
|
||||
# drop the constraint so we can insert nulls in full_user_id to populate the test |
||||
if isinstance(self.store.database_engine, PostgresEngine): |
||||
|
||||
def f(txn: LoggingTransaction) -> None: |
||||
txn.execute( |
||||
"ALTER TABLE user_filters DROP CONSTRAINT full_user_id_not_null" |
||||
) |
||||
|
||||
self.get_success(self.store.db_pool.runInteraction("", f)) |
||||
|
||||
for i in range(0, 70): |
||||
self.get_success( |
||||
self.store.db_pool.simple_insert( |
||||
"user_filters", |
||||
{ |
||||
"user_id": f"hello{i:02}", |
||||
"filter_id": i, |
||||
"filter_json": bytearray(i), |
||||
}, |
||||
) |
||||
) |
||||
|
||||
# re-add the constraint so that when it's validated it actually exists |
||||
if isinstance(self.store.database_engine, PostgresEngine): |
||||
|
||||
def f(txn: LoggingTransaction) -> None: |
||||
txn.execute( |
||||
"ALTER TABLE user_filters ADD CONSTRAINT full_user_id_not_null CHECK (full_user_id IS NOT NULL) NOT VALID" |
||||
) |
||||
|
||||
self.get_success(self.store.db_pool.runInteraction("", f)) |
||||
|
||||
self.get_success( |
||||
self.store.db_pool.simple_insert( |
||||
"background_updates", |
||||
values={ |
||||
"update_name": "populate_full_user_id_user_filters", |
||||
"progress_json": "{}", |
||||
}, |
||||
) |
||||
) |
||||
|
||||
self.get_success( |
||||
updater.run_background_updates(False), |
||||
) |
||||
|
||||
expected_values = [] |
||||
for i in range(0, 70): |
||||
expected_values.append((f"@hello{i:02}:{self.hs.hostname}",)) |
||||
|
||||
res = self.get_success( |
||||
self.store.db_pool.execute( |
||||
"", None, "SELECT full_user_id from user_filters ORDER BY full_user_id" |
||||
) |
||||
) |
||||
self.assertEqual(len(res), len(expected_values)) |
||||
self.assertEqual(res, expected_values) |
||||
Loading…
Reference in new issue