mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-09 12:51:56 +00:00
Merge pull request #1134 from matrix-org/erikj/fix_stream_public_deletion
Fix _delete_old_forward_extrem_cache query
This commit is contained in:
commit
bbc0d9617f
@ -398,12 +398,11 @@ class EventFederationStore(SQLBaseStore):
|
||||
sql = ("""
|
||||
DELETE FROM stream_ordering_to_exterm
|
||||
WHERE
|
||||
(
|
||||
SELECT max(stream_ordering) AS stream_ordering
|
||||
room_id IN (
|
||||
SELECT room_id
|
||||
FROM stream_ordering_to_exterm
|
||||
WHERE room_id = stream_ordering_to_exterm.room_id
|
||||
) > ?
|
||||
AND stream_ordering < ?
|
||||
WHERE stream_ordering > ?
|
||||
) AND stream_ordering < ?
|
||||
""")
|
||||
txn.execute(
|
||||
sql,
|
||||
|
@ -25,7 +25,7 @@ logger = logging.getLogger(__name__)
|
||||
|
||||
# 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_VERSION = 35
|
||||
SCHEMA_VERSION = 36
|
||||
|
||||
dir_path = os.path.abspath(os.path.dirname(__file__))
|
||||
|
||||
|
26
synapse/storage/schema/delta/36/readd_public_rooms.sql
Normal file
26
synapse/storage/schema/delta/36/readd_public_rooms.sql
Normal file
@ -0,0 +1,26 @@
|
||||
/* 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.
|
||||
*/
|
||||
|
||||
-- Re-add some entries to stream_ordering_to_exterm that were incorrectly deleted
|
||||
INSERT INTO stream_ordering_to_exterm (stream_ordering, room_id, event_id)
|
||||
SELECT
|
||||
(SELECT stream_ordering FROM events where event_id = e.event_id) AS stream_ordering,
|
||||
room_id,
|
||||
event_id
|
||||
FROM event_forward_extremities AS e
|
||||
WHERE NOT EXISTS (
|
||||
SELECT room_id FROM stream_ordering_to_exterm AS s
|
||||
WHERE s.room_id = e.room_id
|
||||
);
|
Loading…
Reference in New Issue
Block a user