From bd55ae88974e8f5af4554ea4efd9e3a385e32a2f Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Thu, 13 Apr 2017 12:07:14 +0100 Subject: [PATCH] Review comments --- .../dendrite/syncserver/storage/current_room_state_table.go | 3 +++ .../dendrite/syncserver/storage/output_room_events_table.go | 1 + 2 files changed, 4 insertions(+) diff --git a/src/github.com/matrix-org/dendrite/syncserver/storage/current_room_state_table.go b/src/github.com/matrix-org/dendrite/syncserver/storage/current_room_state_table.go index 4e0f67625..8d936f7eb 100644 --- a/src/github.com/matrix-org/dendrite/syncserver/storage/current_room_state_table.go +++ b/src/github.com/matrix-org/dendrite/syncserver/storage/current_room_state_table.go @@ -29,6 +29,8 @@ CREATE TABLE IF NOT EXISTS current_room_state ( ); -- for event deletion CREATE UNIQUE INDEX IF NOT EXISTS event_id_idx ON current_room_state(event_id); +-- for querying membership states of users +CREATE INDEX IF NOT EXISTS membership_idx ON current_room_state(membership) WHERE membership IS NOT NULL AND membership != 'leave'; ` const upsertRoomStateSQL = "" + @@ -105,6 +107,7 @@ func (s *currentRoomStateStatements) CurrentState(txn *sql.Tx, roomID string) ([ if err := rows.Scan(&eventBytes); err != nil { return nil, err } + // TODO: Handle redacted events ev, err := gomatrixserverlib.NewEventFromTrustedJSON(eventBytes, false) if err != nil { return nil, err diff --git a/src/github.com/matrix-org/dendrite/syncserver/storage/output_room_events_table.go b/src/github.com/matrix-org/dendrite/syncserver/storage/output_room_events_table.go index f1dc09b30..5e9eb74d4 100644 --- a/src/github.com/matrix-org/dendrite/syncserver/storage/output_room_events_table.go +++ b/src/github.com/matrix-org/dendrite/syncserver/storage/output_room_events_table.go @@ -158,6 +158,7 @@ func rowsToEvents(rows *sql.Rows) ([]gomatrixserverlib.Event, error) { if err := rows.Scan(&eventBytes); err != nil { return nil, err } + // TODO: Handle redacted events ev, err := gomatrixserverlib.NewEventFromTrustedJSON(eventBytes, false) if err != nil { return nil, err