Skip to content

Commit aea0205

Browse files
jagermanjagerman
committed
upgrade & pg import: Add/handle seqno_creation
Set it to 0 because that's the safest value (the consequence of a 0 is just that a session client might end up with some extra deletions in some cases, but that seems fine).
1 parent 81e2c85 commit aea0205

File tree

5 files changed

+65
-57
lines changed

5 files changed

+65
-57
lines changed

‎contrib/pg-import.py‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,17 @@ def copy(table):
203203
started = time.time()
204204
count = 0
205205
count_total = curin.execute("SELECT COUNT(*) FROM messages").fetchone()[0]
206-
for mid, seqno in curin.execute("SELECT id, seqno FROM messages"):
206+
for mid, seqno, sdata, sreact, screat in curin.execute(
207+
"SELECT id, seqno, seqno_data, seqno_reactions, seqno_creation FROM messages"
208+
):
207209
curout.execute(
208-
"UPDATE messages SET seqno = %(seqno)s, seqno_data = %(seqno)s WHERE id = %(id)s",
209-
{'id': mid, 'seqno': seqno},
210+
"UPDATE messages SET"
211+
" seqno = %(seqno)s,"
212+
" seqno_data = %(sdata)s,"
213+
" seqno_reactions = %(sreact)s,"
214+
" seqno_creation = %(screat)s "
215+
"WHERE id = %(id)s",
216+
{'id': mid, 'seqno': seqno, 'sdata': sdata, 'sreact': sreact, 'screat': screat},
210217
)
211218
count += 1
212219
if count % 1000 == 0:

‎contrib/upgrade-tests/v0.1.10-expected.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ room_import_hacks:
1414
+------+-------------------+--------------------+
1515

1616
message_metadata:
17-
+----+------+------+--------------------------------------------------------------------+-----------+---------------+--------+----------+----------------+-------+------------+-----------------+------------------+--------------+------------+
18-
| id | room | user | session_id | data_size | data_unpadded | edited | filtered | posted | seqno | seqno_data | seqno_reactions | signature_length | whisper_mods | whisper_to |
19-
+----+------+------+--------------------------------------------------------------------+-----------+---------------+--------+----------+----------------+-------+------------+-----------------+------------------+--------------+------------+
20-
| 1 | 1 | 1 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 159 | 53 | NULL | 0 | 1645824540.756 | 0 | 0 | 0 | 64 | 0 | NULL |
21-
| 2 | 1 | 1 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 639 | 551 | NULL | 0 | 1645824567.514 | 0 | 0 | 0 | 64 | 0 | NULL |
22-
| 3 | 1 | 2 | 05d27acc399e89b1583937319822949d71f59345628a3cbec423203b0d915d586d | 159 | 128 | NULL | 0 | 1645824697.870 | 0 | 0 | 0 | 64 | 0 | NULL |
23-
| 4 | 1 | 2 | 05d27acc399e89b1583937319822949d71f59345628a3cbec423203b0d915d586d | 159 | 52 | NULL | 0 | 1645824705.590 | 0 | 0 | 0 | 64 | 0 | NULL |
24-
| 5 | 1 | 1 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 319 | 281 | NULL | 0 | 1645824767.426 | 0 | 0 | 0 | 64 | 0 | NULL |
25-
| 6 | 2 | 1 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 159 | 126 | NULL | 0 | 1645824865.895 | 0 | 0 | 0 | 64 | 0 | NULL |
26-
| 7 | 2 | 1 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 639 | 505 | NULL | 0 | 1645824894.587 | 0 | 0 | 0 | 64 | 0 | NULL |
27-
| 8 | 2 | 1 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 159 | 76 | NULL | 0 | 1645824903.687 | 0 | 0 | 0 | 64 | 0 | NULL |
28-
| 9 | 2 | 2 | 05d27acc399e89b1583937319822949d71f59345628a3cbec423203b0d915d586d | 159 | 33 | NULL | 0 | 1645825259.618 | 0 | 0 | 0 | 64 | 0 | NULL |
29-
| 10 | 2 | 3 | deleted | NULL | NULL | NULL | 0 | 0.000 | 1 | 1 | 0 | NULL | 0 | NULL |
30-
| 11 | 2 | 1 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 159 | 140 | NULL | 0 | 1645825373.383 | 1 | 1 | 0 | 64 | 0 | NULL |
31-
| 12 | 2 | 4 | 05a573fa0cf6f2091f3024ef88c1c3f774bf408947b493c01a26a9dbf6a3ba1e63 | 159 | 43 | NULL | 0 | 1645825444.599 | 1 | 1 | 0 | 64 | 0 | NULL |
32-
+----+------+------+--------------------------------------------------------------------+-----------+---------------+--------+----------+----------------+-------+------------+-----------------+------------------+--------------+------------+
17+
+----+------+------+--------------------------------------------------------------------+-----------+---------------+--------+----------+----------------+-------+----------------+------------+-----------------+------------------+--------------+------------+
18+
| id | room | user | session_id | data_size | data_unpadded | edited | filtered | posted | seqno | seqno_creation | seqno_data | seqno_reactions | signature_length | whisper_mods | whisper_to |
19+
+----+------+------+--------------------------------------------------------------------+-----------+---------------+--------+----------+----------------+-------+----------------+------------+-----------------+------------------+--------------+------------+
20+
| 1 | 1 | 1 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 159 | 53 | NULL | 0 | 1645824540.756 | 0 | 0 | 0 | 0 | 64 | 0 | NULL |
21+
| 2 | 1 | 1 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 639 | 551 | NULL | 0 | 1645824567.514 | 0 | 0 | 0 | 0 | 64 | 0 | NULL |
22+
| 3 | 1 | 2 | 05d27acc399e89b1583937319822949d71f59345628a3cbec423203b0d915d586d | 159 | 128 | NULL | 0 | 1645824697.870 | 0 | 0 | 0 | 0 | 64 | 0 | NULL |
23+
| 4 | 1 | 2 | 05d27acc399e89b1583937319822949d71f59345628a3cbec423203b0d915d586d | 159 | 52 | NULL | 0 | 1645824705.590 | 0 | 0 | 0 | 0 | 64 | 0 | NULL |
24+
| 5 | 1 | 1 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 319 | 281 | NULL | 0 | 1645824767.426 | 0 | 0 | 0 | 0 | 64 | 0 | NULL |
25+
| 6 | 2 | 1 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 159 | 126 | NULL | 0 | 1645824865.895 | 0 | 0 | 0 | 0 | 64 | 0 | NULL |
26+
| 7 | 2 | 1 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 639 | 505 | NULL | 0 | 1645824894.587 | 0 | 0 | 0 | 0 | 64 | 0 | NULL |
27+
| 8 | 2 | 1 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 159 | 76 | NULL | 0 | 1645824903.687 | 0 | 0 | 0 | 0 | 64 | 0 | NULL |
28+
| 9 | 2 | 2 | 05d27acc399e89b1583937319822949d71f59345628a3cbec423203b0d915d586d | 159 | 33 | NULL | 0 | 1645825259.618 | 0 | 0 | 0 | 0 | 64 | 0 | NULL |
29+
| 10 | 2 | 3 | deleted | NULL | NULL | NULL | 0 | 0.000 | 1 | 0 | 1 | 0 | NULL | 0 | NULL |
30+
| 11 | 2 | 1 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 159 | 140 | NULL | 0 | 1645825373.383 | 1 | 0 | 1 | 0 | 64 | 0 | NULL |
31+
| 12 | 2 | 4 | 05a573fa0cf6f2091f3024ef88c1c3f774bf408947b493c01a26a9dbf6a3ba1e63 | 159 | 43 | NULL | 0 | 1645825444.599 | 1 | 0 | 1 | 0 | 64 | 0 | NULL |
32+
+----+------+------+--------------------------------------------------------------------+-----------+---------------+--------+----------+----------------+-------+----------------+------------+-----------------+------------------+--------------+------------+
3333

3434
pinned_messages:
3535
+------+---------+-----------+-----------+

‎contrib/upgrade-tests/v0.2.0-expected.txt‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ rooms:
1010

1111
room_import_hacks:
1212
message_metadata:
13-
+----+------+------+--------------------------------------------------------------------+-----------+---------------+----------------+----------+----------------+-------+------------+-----------------+------------------+--------------+------------+
14-
| id | room | user | session_id | data_size | data_unpadded | edited | filtered | posted | seqno | seqno_data | seqno_reactions | signature_length | whisper_mods | whisper_to |
15-
+----+------+------+--------------------------------------------------------------------+-----------+---------------+----------------+----------+----------------+-------+------------+-----------------+------------------+--------------+------------+
16-
| 1 | 2 | 1 | 05fb466d312e1666ad1c84c4ee55b7e034151c0e366a313d95d11436a5f36e1e75 | 799 | 681 | NULL | 0 | 1646058393.290 | 2 | 2 | 0 | 64 | 0 | NULL |
17-
| 2 | 2 | 2 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 159 | 80 | NULL | 0 | 1646059234.443 | 3 | 3 | 0 | 64 | 0 | NULL |
18-
| 3 | 1 | 2 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 479 | 471 | NULL | 0 | 1646067202.759 | 1 | 1 | 0 | 64 | 0 | NULL |
19-
| 4 | 3 | 2 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 159 | 44 | NULL | 0 | 1646067395.828 | 1 | 1 | 0 | 64 | 0 | NULL |
20-
| 5 | 3 | 2 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 2719 | 2621 | NULL | 0 | 1646067432.157 | 2 | 2 | 0 | 64 | 0 | NULL |
21-
| 6 | 3 | 1 | 05fb466d312e1666ad1c84c4ee55b7e034151c0e366a313d95d11436a5f36e1e75 | 479 | 381 | NULL | 0 | 1646067453.007 | 3 | 3 | 0 | 64 | 0 | NULL |
22-
| 7 | 1 | 1 | 05fb466d312e1666ad1c84c4ee55b7e034151c0e366a313d95d11436a5f36e1e75 | 799 | 668 | NULL | 0 | 1646067555.281 | 3 | 3 | 0 | 64 | 0 | NULL |
23-
| 8 | 1 | 2 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 639 | 570 | NULL | 0 | 1646067572.896 | 4 | 4 | 0 | 64 | 0 | NULL |
24-
| 9 | 1 | 3 | 05d27acc399e89b1583937319822949d71f59345628a3cbec423203b0d915d586d | NULL | NULL | 1646067733.570 | 0 | 1646067692.109 | 6 | 6 | 0 | NULL | 0 | NULL |
25-
| 10 | 2 | 3 | 05d27acc399e89b1583937319822949d71f59345628a3cbec423203b0d915d586d | 159 | 26 | NULL | 0 | 1646067780.962 | 4 | 4 | 0 | 64 | 0 | NULL |
26-
| 11 | 3 | 1 | 05fb466d312e1666ad1c84c4ee55b7e034151c0e366a313d95d11436a5f36e1e75 | 319 | 198 | NULL | 0 | 1646069642.635 | 4 | 4 | 0 | 64 | 0 | NULL |
27-
| 12 | 1 | 4 | 05a573fa0cf6f2091f3024ef88c1c3f774bf408947b493c01a26a9dbf6a3ba1e63 | 159 | 55 | NULL | 0 | 1646069808.232 | 7 | 7 | 0 | 64 | 0 | NULL |
28-
| 13 | 2 | 4 | 05a573fa0cf6f2091f3024ef88c1c3f774bf408947b493c01a26a9dbf6a3ba1e63 | 159 | 33 | NULL | 0 | 1646070894.716 | 5 | 5 | 0 | 64 | 0 | NULL |
29-
+----+------+------+--------------------------------------------------------------------+-----------+---------------+----------------+----------+----------------+-------+------------+-----------------+------------------+--------------+------------+
13+
+----+------+------+--------------------------------------------------------------------+-----------+---------------+----------------+----------+----------------+-------+----------------+------------+-----------------+------------------+--------------+------------+
14+
| id | room | user | session_id | data_size | data_unpadded | edited | filtered | posted | seqno | seqno_creation | seqno_data | seqno_reactions | signature_length | whisper_mods | whisper_to |
15+
+----+------+------+--------------------------------------------------------------------+-----------+---------------+----------------+----------+----------------+-------+----------------+------------+-----------------+------------------+--------------+------------+
16+
| 1 | 2 | 1 | 05fb466d312e1666ad1c84c4ee55b7e034151c0e366a313d95d11436a5f36e1e75 | 799 | 681 | NULL | 0 | 1646058393.290 | 2 | 0 | 2 | 0 | 64 | 0 | NULL |
17+
| 2 | 2 | 2 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 159 | 80 | NULL | 0 | 1646059234.443 | 3 | 0 | 3 | 0 | 64 | 0 | NULL |
18+
| 3 | 1 | 2 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 479 | 471 | NULL | 0 | 1646067202.759 | 1 | 0 | 1 | 0 | 64 | 0 | NULL |
19+
| 4 | 3 | 2 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 159 | 44 | NULL | 0 | 1646067395.828 | 1 | 0 | 1 | 0 | 64 | 0 | NULL |
20+
| 5 | 3 | 2 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 2719 | 2621 | NULL | 0 | 1646067432.157 | 2 | 0 | 2 | 0 | 64 | 0 | NULL |
21+
| 6 | 3 | 1 | 05fb466d312e1666ad1c84c4ee55b7e034151c0e366a313d95d11436a5f36e1e75 | 479 | 381 | NULL | 0 | 1646067453.007 | 3 | 0 | 3 | 0 | 64 | 0 | NULL |
22+
| 7 | 1 | 1 | 05fb466d312e1666ad1c84c4ee55b7e034151c0e366a313d95d11436a5f36e1e75 | 799 | 668 | NULL | 0 | 1646067555.281 | 3 | 0 | 3 | 0 | 64 | 0 | NULL |
23+
| 8 | 1 | 2 | 05c12b7ed495ad55982f43613e1b4c8d32800c5726f817e35011a3a5a3c64c4349 | 639 | 570 | NULL | 0 | 1646067572.896 | 4 | 0 | 4 | 0 | 64 | 0 | NULL |
24+
| 9 | 1 | 3 | 05d27acc399e89b1583937319822949d71f59345628a3cbec423203b0d915d586d | NULL | NULL | 1646067733.570 | 0 | 1646067692.109 | 6 | 0 | 6 | 0 | NULL | 0 | NULL |
25+
| 10 | 2 | 3 | 05d27acc399e89b1583937319822949d71f59345628a3cbec423203b0d915d586d | 159 | 26 | NULL | 0 | 1646067780.962 | 4 | 0 | 4 | 0 | 64 | 0 | NULL |
26+
| 11 | 3 | 1 | 05fb466d312e1666ad1c84c4ee55b7e034151c0e366a313d95d11436a5f36e1e75 | 319 | 198 | NULL | 0 | 1646069642.635 | 4 | 0 | 4 | 0 | 64 | 0 | NULL |
27+
| 12 | 1 | 4 | 05a573fa0cf6f2091f3024ef88c1c3f774bf408947b493c01a26a9dbf6a3ba1e63 | 159 | 55 | NULL | 0 | 1646069808.232 | 7 | 0 | 7 | 0 | 64 | 0 | NULL |
28+
| 13 | 2 | 4 | 05a573fa0cf6f2091f3024ef88c1c3f774bf408947b493c01a26a9dbf6a3ba1e63 | 159 | 33 | NULL | 0 | 1646070894.716 | 5 | 0 | 5 | 0 | 64 | 0 | NULL |
29+
+----+------+------+--------------------------------------------------------------------+-----------+---------------+----------------+----------+----------------+-------+----------------+------------+-----------------+------------------+--------------+------------+
3030

3131
pinned_messages:
3232
+------+---------+-----------+-----------+

0 commit comments

Comments
 (0)