dandri/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2026-08-28 05:04:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix running into StopIteration

Browse Source 
More context about how/why `StopIteration` was being ignored silently
which made this problem harder to debug. See
https://github.com/element-hq/synapse/pull/17512#discussion_r1715954505
This commit is contained in:
Eric Eastwood
2024-08-13 17:15:09 -05:00
parent 3566abd9bc
commit 5df94f47b5
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
synapse/storage/databases/main/events.py
+26 -23
View File
@@ -1543,34 +1543,37 @@ class PersistEventsStore:
)
# Update the `sliding_sync_joined_rooms` table
args: List[Any] = [
room_id,
# Even though `Mapping`/`Dict` have no guaranteed order, some
# implementations may preserve insertion order so we're just going to
# choose the best possible answer by using the "first" event ID which we
# will assume will have the greatest `stream_ordering`. We really just
# need *some* answer in case we are the first ones inserting into the
# table and in reality,
# `_update_sliding_sync_tables_with_new_persisted_events_txn()` is run
# after this function to update it to the correct latest value. This is
# just to account for things changing in the future.
next(iter(to_insert.values())),
]
# If we have a `bump_event_id`, let's update the `bump_stamp` column
bump_stamp_column = ""
bump_stamp_values_clause = ""
if bump_event_id is not None:
bump_stamp_column = "bump_stamp, "
bump_stamp_values_clause = (
"(SELECT stream_ordering FROM events WHERE event_id = ?),"
)
args.append(bump_event_id)
#
# Pulling keys/values separately is safe and will produce congruent lists
insert_keys = sliding_sync_joined_rooms_insert_map.keys()
insert_values = sliding_sync_joined_rooms_insert_map.values()
args.extend(iter(insert_values))
# We only need to update when one of the relevant state values has changed
if insert_keys:
args: List[Any] = [
room_id,
# Even though `Mapping`/`Dict` have no guaranteed order, some
# implementations may preserve insertion order so we're just going to
# choose the best possible answer by using the "first" event ID which we
# will assume will have the greatest `stream_ordering`. We really just
# need *some* answer in case we are the first ones inserting into the
# table and in reality,
# `_update_sliding_sync_tables_with_new_persisted_events_txn()` is run
# after this function to update it to the correct latest value. This is
# just to account for things changing in the future.
next(iter(to_insert.values())),
]
# If we have a `bump_event_id`, let's update the `bump_stamp` column
bump_stamp_column = ""
bump_stamp_values_clause = ""
if bump_event_id is not None:
bump_stamp_column = "bump_stamp, "
bump_stamp_values_clause = (
"(SELECT stream_ordering FROM events WHERE event_id = ?),"
)
args.append(bump_event_id)
args.extend(iter(insert_values))
# We don't update `event_stream_ordering` `ON CONFLICT` because it's simpler
# we can just
#