diff --git a/synapse/storage/schema/delta/49/event_chunks.py b/synapse/storage/schema/delta/49/event_chunks.py
new file mode 100644
index 0000000000..ee6a91e78b
--- /dev/null
+++ b/synapse/storage/schema/delta/49/event_chunks.py
@@ -0,0 +1,115 @@
+# -*- coding: utf-8 -*-
+# Copyright 2018 New Vector 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._base import SQLBaseStore, LoggingTransaction
+from synapse.storage.prepare_database import get_statements
+
+SQL = """
+
+ALTER TABLE events ADD COLUMN chunk_id BIGINT;
+
+-- FIXME: Add index on contains_url
+
+INSERT INTO background_updates (update_name, progress_json) VALUES
+ ('events_chunk_index', '{}');
+
+-- Stores how chunks of graph relate to each other
+CREATE TABLE chunk_graph (
+ chunk_id BIGINT NOT NULL,
+ prev_id BIGINT NOT NULL
+);
+
+CREATE UNIQUE INDEX chunk_graph_id ON chunk_graph (chunk_id, prev_id);
+CREATE INDEX chunk_graph_prev_id ON chunk_graph (prev_id);
+
+-- The extremities in each chunk. Note that these are pointing to events that
+-- we don't have, rather than boundary between chunks.
+CREATE TABLE chunk_backwards_extremities (
+ chunk_id BIGINT NOT NULL,
+ event_id TEXT NOT NULL
+);
+
+CREATE INDEX chunk_backwards_extremities_id ON chunk_backwards_extremities(
+ chunk_id, event_id
+);
+CREATE INDEX chunk_backwards_extremities_event_id ON chunk_backwards_extremities(
+ event_id
+);
+
+-- Maintains an absolute ordering of chunks. Gets updated when we see new
+-- edges between chunks.
+CREATE TABLE chunk_linearized (
+ chunk_id BIGINT NOT NULL,
+ room_id TEXT NOT NULL,
+ ordering DOUBLE PRECISION NOT NULL
+);
+
+CREATE UNIQUE INDEX chunk_linearized_id ON chunk_linearized (chunk_id);
+CREATE INDEX chunk_linearized_ordering ON chunk_linearized (room_id, ordering);
+"""
+
+
+def run_create(cur, database_engine, *args, **kwargs):
+ for statement in get_statements(SQL.splitlines()):
+ cur.execute(statement)
+
+ # We now go through and assign chunk IDs for all forward extremities.
+ # Note that we know that extremities can't reference each other, so we
+ # can simply assign each event a new chunk ID with an arbitrary order.
+
+ txn = LoggingTransaction(
+ cur, "schema_update", database_engine, [], [],
+ )
+
+ rows = SQLBaseStore._simple_select_list_txn(
+ txn,
+ table="event_forward_extremities",
+ keyvalues={},
+ retcols=("event_id", "room_id",),
+ )
+
+ next_chunk_id = 1
+ room_to_next_order = {}
+
+ for row in rows:
+ chunk_id = next_chunk_id
+ next_chunk_id += 1
+
+ room_id = row["room_id"]
+ event_id = row["event_id"]
+
+ SQLBaseStore._simple_update_txn(
+ txn,
+ table="events",
+ keyvalues={"room_id": room_id, "event_id": event_id},
+ updatevalues={"chunk_id": chunk_id},
+ )
+
+ ordering = room_to_next_order.get(room_id, 0)
+ room_to_next_order[room_id] = ordering + 1
+
+ SQLBaseStore._simple_insert_txn(
+ txn,
+ table="chunk_linearized",
+ values={
+ "chunk_id": chunk_id,
+ "room_id": row["room_id"],
+ "ordering": 0,
+ },
+ )
+
+
+def run_upgrade(*args, **kwargs):
+ pass
diff --git a/synapse/storage/schema/delta/49/event_chunks.sql b/synapse/storage/schema/delta/49/event_chunks.sql
deleted file mode 100644
index 6b428b4ef8..0000000000
--- a/synapse/storage/schema/delta/49/event_chunks.sql
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2018 New Vector 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.
- */
-
-ALTER TABLE events ADD COLUMN chunk_id BIGINT;
-
-INSERT INTO background_updates (update_name, progress_json) VALUES
- ('events_chunk_index', '{}');
-
--- Stores how chunks of graph relate to each other
-CREATE TABLE chunk_graph (
- chunk_id BIGINT NOT NULL,
- prev_id BIGINT NOT NULL
-);
-
-CREATE UNIQUE INDEX chunk_graph_id ON chunk_graph (chunk_id, prev_id);
-CREATE INDEX chunk_graph_prev_id ON chunk_graph (prev_id);
-
--- The extremities in each chunk. Note that these are pointing to events that
--- we don't have, rather than boundary between chunks.
-CREATE TABLE chunk_backwards_extremities (
- chunk_id BIGINT NOT NULL,
- event_id TEXT NOT NULL
-);
-
-CREATE INDEX chunk_backwards_extremities_id ON chunk_backwards_extremities(chunk_id, event_id);
-CREATE INDEX chunk_backwards_extremities_event_id ON chunk_backwards_extremities(event_id);
-
--- Maintains an absolute ordering of chunks. Gets updated when we see new
--- edges between chunks.
-CREATE TABLE chunk_linearized (
- chunk_id BIGINT NOT NULL,
- room_id TEXT NOT NULL,
- ordering DOUBLE PRECISION NOT NULL
-);
-
-CREATE UNIQUE INDEX chunk_linearized_id ON chunk_linearized (chunk_id);
-CREATE INDEX chunk_linearized_ordering ON chunk_linearized (room_id, ordering);
|
