Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Drop sent_transactions #4244

Merged
merged 2 commits into from
Dec 4, 2018
Merged

Drop sent_transactions #4244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
704c529
Drop sent_transactions
aaronraimist Dec 2, 2018
44dc4c3
Add changelog
aaronraimist Dec 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/4244.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Drop sent_transactions table
1 change: 0 additions & 1 deletion synapse/storage/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ def __init__(self, db_conn, hs):
db_conn, "device_lists_stream", "stream_id",
)

self._transaction_id_gen = IdGenerator(db_conn, "sent_transactions", "id")
self._access_tokens_id_gen = IdGenerator(db_conn, "access_tokens", "id")
self._event_reports_id_gen = IdGenerator(db_conn, "event_reports", "id")
self._push_rule_id_gen = IdGenerator(db_conn, "push_rules", "id")
Expand Down
2 changes: 1 addition & 1 deletion synapse/storage/prepare_database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

# 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 = 52
SCHEMA_VERSION = 53
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not always necessary to bump this - you can just keep adding more delta files into the current delta directory.


dir_path = os.path.abspath(os.path.dirname(__file__))

Expand Down
32 changes: 0 additions & 32 deletions synapse/storage/schema/delta/34/sent_txn_purge.py
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions synapse/storage/schema/delta/11/v11.sql → ...chema/delta/53/drop_sent_transactions.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015, 2016 OpenMarket Ltd
/* Copyright 2018 New Vector Ltd
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New Vector didn't write it, so this isn't really true.

You wrote it (all six words of it), so it's copyright yourself (with a license for us to use it via the DCO), either implicitly or explicitly. So either: Copyright 2018 Aaron Raimist, or just omit it.

*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,4 +13,4 @@
* limitations under the License.
*/

CREATE INDEX IF NOT EXISTS sent_transaction_txn_id ON sent_transactions(transaction_id);
DROP TABLE IF EXISTS sent_transactions;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be useful to have a comment here explaining why this is a useful thing to do and some of the history

19 changes: 0 additions & 19 deletions synapse/storage/schema/full_schemas/11/transactions.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,6 @@ CREATE TABLE IF NOT EXISTS received_transactions(

CREATE INDEX transactions_have_ref ON received_transactions(origin, has_been_referenced);-- WHERE has_been_referenced = 0;


-- Stores what transactions we've sent, what their response was (if we got one) and whether we have
-- since referenced the transaction in another outgoing transaction
CREATE TABLE IF NOT EXISTS sent_transactions(
id INTEGER PRIMARY KEY AUTOINCREMENT, -- This is used to apply insertion ordering
transaction_id TEXT,
destination TEXT,
response_code INTEGER DEFAULT 0,
response_json TEXT,
ts BIGINT
);

CREATE INDEX sent_transaction_dest ON sent_transactions(destination);
CREATE INDEX sent_transaction_txn_id ON sent_transactions(transaction_id);
-- So that we can do an efficient look up of all transactions that have yet to be successfully
-- sent.
CREATE INDEX sent_transaction_sent ON sent_transactions(response_code);


-- For sent transactions only.
CREATE TABLE IF NOT EXISTS transaction_id_to_pdu(
transaction_id INTEGER,
Expand Down
19 changes: 0 additions & 19 deletions synapse/storage/schema/full_schemas/16/transactions.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,6 @@ CREATE TABLE IF NOT EXISTS received_transactions(

CREATE INDEX transactions_have_ref ON received_transactions(origin, has_been_referenced);-- WHERE has_been_referenced = 0;


-- Stores what transactions we've sent, what their response was (if we got one) and whether we have
-- since referenced the transaction in another outgoing transaction
CREATE TABLE IF NOT EXISTS sent_transactions(
id BIGINT PRIMARY KEY, -- This is used to apply insertion ordering
transaction_id TEXT,
destination TEXT,
response_code INTEGER DEFAULT 0,
response_json TEXT,
ts BIGINT
);

CREATE INDEX sent_transaction_dest ON sent_transactions(destination);
CREATE INDEX sent_transaction_txn_id ON sent_transactions(transaction_id);
-- So that we can do an efficient look up of all transactions that have yet to be successfully
-- sent.
CREATE INDEX sent_transaction_sent ON sent_transactions(response_code);


-- For sent transactions only.
CREATE TABLE IF NOT EXISTS transaction_id_to_pdu(
transaction_id INTEGER,
Expand Down