mirror of
https://github.com/element-hq/synapse
synced 2024-09-12 02:25:10 +00:00
Merge pull request #1113 from matrix-org/erikj/remove_auth
Remove redundant event_auth index
This commit is contained in:
commit
927a67ee1a
3 changed files with 82 additions and 2 deletions
|
@ -603,7 +603,6 @@ class EventsStore(SQLBaseStore):
|
||||||
"rejections",
|
"rejections",
|
||||||
"redactions",
|
"redactions",
|
||||||
"room_memberships",
|
"room_memberships",
|
||||||
"state_events",
|
|
||||||
"topics"
|
"topics"
|
||||||
):
|
):
|
||||||
txn.executemany(
|
txn.executemany(
|
||||||
|
|
|
@ -25,7 +25,7 @@ logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
# Remember to update this number every time a change is made to database
|
# Remember to update this number every time a change is made to database
|
||||||
# schema files, so the users will be informed on server restarts.
|
# schema files, so the users will be informed on server restarts.
|
||||||
SCHEMA_VERSION = 36
|
SCHEMA_VERSION = 37
|
||||||
|
|
||||||
dir_path = os.path.abspath(os.path.dirname(__file__))
|
dir_path = os.path.abspath(os.path.dirname(__file__))
|
||||||
|
|
||||||
|
|
81
synapse/storage/schema/delta/37/remove_auth_idx.py
Normal file
81
synapse/storage/schema/delta/37/remove_auth_idx.py
Normal file
|
@ -0,0 +1,81 @@
|
||||||
|
# Copyright 2016 OpenMarket Ltd
|
||||||
|
#
|
||||||
|
# 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.prepare_database import get_statements
|
||||||
|
from synapse.storage.engines import PostgresEngine
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
DROP_INDICES = """
|
||||||
|
-- We only ever query based on event_id
|
||||||
|
DROP INDEX IF EXISTS state_events_room_id;
|
||||||
|
DROP INDEX IF EXISTS state_events_type;
|
||||||
|
DROP INDEX IF EXISTS state_events_state_key;
|
||||||
|
|
||||||
|
-- room_id is indexed elsewhere
|
||||||
|
DROP INDEX IF EXISTS current_state_events_room_id;
|
||||||
|
DROP INDEX IF EXISTS current_state_events_state_key;
|
||||||
|
DROP INDEX IF EXISTS current_state_events_type;
|
||||||
|
|
||||||
|
DROP INDEX IF EXISTS transactions_have_ref;
|
||||||
|
|
||||||
|
-- (topological_ordering, stream_ordering, room_id) seems like a strange index,
|
||||||
|
-- and is used incredibly rarely.
|
||||||
|
DROP INDEX IF EXISTS events_order_topo_stream_room;
|
||||||
|
|
||||||
|
DROP INDEX IF EXISTS event_search_ev_idx;
|
||||||
|
"""
|
||||||
|
|
||||||
|
POSTGRES_DROP_CONSTRAINT = """
|
||||||
|
ALTER TABLE event_auth DROP CONSTRAINT IF EXISTS event_auth_event_id_auth_id_room_id_key;
|
||||||
|
"""
|
||||||
|
|
||||||
|
SQLITE_DROP_CONSTRAINT = """
|
||||||
|
DROP INDEX IF EXISTS evauth_edges_id;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS event_auth_new(
|
||||||
|
event_id TEXT NOT NULL,
|
||||||
|
auth_id TEXT NOT NULL,
|
||||||
|
room_id TEXT NOT NULL
|
||||||
|
);
|
||||||
|
|
||||||
|
INSERT INTO event_auth_new
|
||||||
|
SELECT event_id, auth_id, room_id
|
||||||
|
FROM event_auth;
|
||||||
|
|
||||||
|
DROP TABLE event_auth;
|
||||||
|
|
||||||
|
ALTER TABLE event_auth_new RENAME TO event_auth;
|
||||||
|
|
||||||
|
CREATE INDEX evauth_edges_id ON event_auth(event_id);
|
||||||
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
def run_create(cur, database_engine, *args, **kwargs):
|
||||||
|
for statement in get_statements(DROP_INDICES.splitlines()):
|
||||||
|
cur.execute(statement)
|
||||||
|
|
||||||
|
if isinstance(database_engine, PostgresEngine):
|
||||||
|
drop_constraint = POSTGRES_DROP_CONSTRAINT
|
||||||
|
else:
|
||||||
|
drop_constraint = SQLITE_DROP_CONSTRAINT
|
||||||
|
|
||||||
|
for statement in get_statements(drop_constraint.splitlines()):
|
||||||
|
cur.execute(statement)
|
||||||
|
|
||||||
|
|
||||||
|
def run_upgrade(cur, database_engine, *args, **kwargs):
|
||||||
|
pass
|
Loading…
Reference in a new issue