Browse Source

Clean-up events persistance code (#14411)

By removing unused variables and making some arguments
required which are always provided.
tags/v1.72.0rc1
Patrick Cloke 1 year ago
committed by GitHub
parent
commit
fb66fae84b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 8 deletions
  1. +1
    -0
      changelog.d/14411.misc
  2. +0
    -2
      synapse/storage/controllers/persist_events.py
  3. +3
    -6
      synapse/storage/databases/main/events.py

+ 1
- 0
changelog.d/14411.misc View File

@@ -0,0 +1 @@
Clean-up event persistence code.

+ 0
- 2
synapse/storage/controllers/persist_events.py View File

@@ -716,8 +716,6 @@ class EventsPersistenceStorageController:
)
if not is_still_joined:
logger.info("Server no longer in room %s", room_id)
latest_event_ids = set()
current_state = {}
delta.no_longer_in_room = True

state_delta_for_room[room_id] = delta


+ 3
- 6
synapse/storage/databases/main/events.py View File

@@ -355,9 +355,9 @@ class PersistEventsStore:
txn: LoggingTransaction,
*,
events_and_contexts: List[Tuple[EventBase, EventContext]],
inhibit_local_membership_updates: bool = False,
state_delta_for_room: Optional[Dict[str, DeltaState]] = None,
new_forward_extremities: Optional[Dict[str, Set[str]]] = None,
inhibit_local_membership_updates: bool,
state_delta_for_room: Dict[str, DeltaState],
new_forward_extremities: Dict[str, Set[str]],
) -> None:
"""Insert some number of room events into the necessary database tables.

@@ -384,9 +384,6 @@ class PersistEventsStore:
PartialStateConflictError: if attempting to persist a partial state event in
a room that has been un-partial stated.
"""
state_delta_for_room = state_delta_for_room or {}
new_forward_extremities = new_forward_extremities or {}

all_events_and_contexts = events_and_contexts

min_stream_order = events_and_contexts[0][0].internal_metadata.stream_ordering


Loading…
Cancel
Save