From 17fee30c0e443c59c27ead604a45c77caf825f6e Mon Sep 17 00:00:00 2001 From: Till Faelligen <2353100+S7evinK@users.noreply.github.com> Date: Fri, 22 Jul 2022 09:06:24 +0200 Subject: [PATCH] Remove noise/unneeded code --- syncapi/internal/keychange_test.go | 5 --- .../postgres/output_room_events_table.go | 35 ------------------- .../sqlite3/output_room_events_table.go | 34 ------------------ .../output_room_events_topology_table.go | 25 ------------- syncapi/storage/tables/interface.go | 1 - syncapi/syncapi_test.go | 18 ---------- 6 files changed, 118 deletions(-) diff --git a/syncapi/internal/keychange_test.go b/syncapi/internal/keychange_test.go index 526f2c17a..79ed440e7 100644 --- a/syncapi/internal/keychange_test.go +++ b/syncapi/internal/keychange_test.go @@ -53,11 +53,6 @@ type mockRoomserverAPI struct { roomIDToJoinedMembers map[string][]string } -func (s *mockRoomserverAPI) QueryMembershipAtEvent(ctx context.Context, request *api.QueryMembersipAtEventRequest, response *api.QueryMembersipAtEventResponse) error { - //TODO implement me - panic("implement me") -} - // QueryRoomsForUser retrieves a list of room IDs matching the given query. func (s *mockRoomserverAPI) QueryRoomsForUser(ctx context.Context, req *api.QueryRoomsForUserRequest, res *api.QueryRoomsForUserResponse) error { return nil diff --git a/syncapi/storage/postgres/output_room_events_table.go b/syncapi/storage/postgres/output_room_events_table.go index 0a58235ae..ddef27383 100644 --- a/syncapi/storage/postgres/output_room_events_table.go +++ b/syncapi/storage/postgres/output_room_events_table.go @@ -166,13 +166,6 @@ const selectContextAfterEventSQL = "" + " AND ( $7::text[] IS NULL OR NOT(type LIKE ANY($7)) )" + " ORDER BY id ASC LIMIT $3" -const selectTopologicalEventSQL = "" + - "SELECT se.headered_event_json, st.topological_position, st.stream_position " + - " FROM syncapi_output_room_events_topology st " + - " JOIN syncapi_output_room_events se ON se.event_id = st.event_id " + - " WHERE st.room_id = $1 AND st.topological_position < $2 AND se.type = $3 " + - " ORDER BY st.topological_position DESC LIMIT 1" - type outputRoomEventsStatements struct { insertEventStmt *sql.Stmt selectEventsStmt *sql.Stmt @@ -187,7 +180,6 @@ type outputRoomEventsStatements struct { selectContextEventStmt *sql.Stmt selectContextBeforeEventStmt *sql.Stmt selectContextAfterEventStmt *sql.Stmt - selectTopologicalEventStmt *sql.Stmt } func NewPostgresEventsTable(db *sql.DB) (tables.Events, error) { @@ -210,7 +202,6 @@ func NewPostgresEventsTable(db *sql.DB) (tables.Events, error) { {&s.selectContextEventStmt, selectContextEventSQL}, {&s.selectContextBeforeEventStmt, selectContextBeforeEventSQL}, {&s.selectContextAfterEventStmt, selectContextAfterEventSQL}, - {&s.selectTopologicalEventStmt, selectTopologicalEventSQL}, }.Prepare(db) } @@ -600,32 +591,6 @@ func (s *outputRoomEventsStatements) SelectContextAfterEvent( return lastID, evts, rows.Err() } -// SelectTopologicalEvent selects an event before and including the given position by eventType and roomID. Returns the found event and the topology token. -// If not event was found, returns nil and sql.ErrNoRows. -func (s *outputRoomEventsStatements) SelectTopologicalEvent( - ctx context.Context, txn *sql.Tx, topologicalPosition int, eventType, roomID string, -) (*gomatrixserverlib.HeaderedEvent, types.TopologyToken, error) { - var ( - eventBytes []byte - token types.TopologyToken - ) - - err := sqlutil.TxStmtContext(ctx, txn, s.selectTopologicalEventStmt). - QueryRowContext(ctx, roomID, topologicalPosition, eventType). - Scan(&eventBytes, &token.Depth, &token.PDUPosition) - - if err != nil { - return nil, types.TopologyToken{}, err - } - - var res *gomatrixserverlib.HeaderedEvent - if err = json.Unmarshal(eventBytes, &res); err != nil { - return nil, types.TopologyToken{}, err - } - - return res, token, nil -} - func rowsToStreamEvents(rows *sql.Rows) ([]types.StreamEvent, error) { var result []types.StreamEvent for rows.Next() { diff --git a/syncapi/storage/sqlite3/output_room_events_table.go b/syncapi/storage/sqlite3/output_room_events_table.go index 978385593..b3dcb44cb 100644 --- a/syncapi/storage/sqlite3/output_room_events_table.go +++ b/syncapi/storage/sqlite3/output_room_events_table.go @@ -115,13 +115,6 @@ const selectContextAfterEventSQL = "" + // WHEN, ORDER BY and LIMIT are appended by prepareWithFilters -const selectTopologicalEventSQL = "" + - "SELECT headered_event_json, topological_position, stream_position " + - " FROM syncapi_output_room_events_topology " + - " JOIN syncapi_output_room_events ON syncapi_output_room_events.event_id = syncapi_output_room_events_topology.event_id " + - " WHERE syncapi_output_room_events_topology.room_id = $1 AND topological_position < $2 AND type = $3 " + - " ORDER BY topological_position DESC LIMIT 1" - type outputRoomEventsStatements struct { db *sql.DB streamIDStatements *StreamIDStatements @@ -132,7 +125,6 @@ type outputRoomEventsStatements struct { selectContextEventStmt *sql.Stmt selectContextBeforeEventStmt *sql.Stmt selectContextAfterEventStmt *sql.Stmt - selectTopologicalEventStmt *sql.Stmt } func NewSqliteEventsTable(db *sql.DB, streamID *StreamIDStatements) (tables.Events, error) { @@ -152,7 +144,6 @@ func NewSqliteEventsTable(db *sql.DB, streamID *StreamIDStatements) (tables.Even {&s.selectContextEventStmt, selectContextEventSQL}, {&s.selectContextBeforeEventStmt, selectContextBeforeEventSQL}, {&s.selectContextAfterEventStmt, selectContextAfterEventSQL}, - {&s.selectTopologicalEventStmt, selectTopologicalEventSQL}, }.Prepare(db) } @@ -622,31 +613,6 @@ func (s *outputRoomEventsStatements) SelectContextAfterEvent( return lastID, evts, rows.Err() } -// SelectTopologicalEvent selects an event before and including the given position by eventType and roomID. Returns the found event and the topology token. -// If not event was found, returns nil and sql.ErrNoRows. -func (s *outputRoomEventsStatements) SelectTopologicalEvent( - ctx context.Context, txn *sql.Tx, topologicalPosition int, eventType, roomID string, -) (*gomatrixserverlib.HeaderedEvent, types.TopologyToken, error) { - var ( - eventBytes []byte - token types.TopologyToken - ) - err := sqlutil.TxStmtContext(ctx, txn, s.selectTopologicalEventStmt). - QueryRowContext(ctx, roomID, topologicalPosition, eventType). - Scan(&eventBytes, &token.Depth, &token.PDUPosition) - - if err != nil { - return nil, types.TopologyToken{}, err - } - - var res *gomatrixserverlib.HeaderedEvent - if err = json.Unmarshal(eventBytes, &res); err != nil { - return nil, types.TopologyToken{}, err - } - - return res, token, nil -} - func unmarshalStateIDs(addIDsJSON, delIDsJSON string) (addIDs []string, delIDs []string, err error) { if len(addIDsJSON) > 0 { if err = json.Unmarshal([]byte(addIDsJSON), &addIDs); err != nil { diff --git a/syncapi/storage/sqlite3/output_room_events_topology_table.go b/syncapi/storage/sqlite3/output_room_events_topology_table.go index 3ea317601..b2fb77417 100644 --- a/syncapi/storage/sqlite3/output_room_events_topology_table.go +++ b/syncapi/storage/sqlite3/output_room_events_topology_table.go @@ -190,28 +190,3 @@ func (s *outputRoomEventsTopologyStatements) SelectMaxPositionInTopology( err = stmt.QueryRowContext(ctx, roomID).Scan(&pos, &spos) return } - -// SelectTopologicalEvent selects an event before and including the given position by eventType and roomID. Returns the found event and the topology token. -// If not event was found, returns nil and sql.ErrNoRows. -func (s *outputRoomEventsTopologyStatements) SelectTopologicalEvent( - ctx context.Context, txn *sql.Tx, topologicalPosition int, eventType, roomID string, -) (*gomatrixserverlib.HeaderedEvent, types.TopologyToken, error) { - var ( - eventBytes []byte - token types.TopologyToken - ) - err := sqlutil.TxStmtContext(ctx, txn, s.selectTopologicalEventStmt). - QueryRowContext(ctx, roomID, topologicalPosition, eventType). - Scan(&eventBytes, &token.Depth, &token.PDUPosition) - - if err != nil { - return nil, types.TopologyToken{}, err - } - - var res *gomatrixserverlib.HeaderedEvent - if err = json.Unmarshal(eventBytes, &res); err != nil { - return nil, types.TopologyToken{}, err - } - - return res, token, nil -} diff --git a/syncapi/storage/tables/interface.go b/syncapi/storage/tables/interface.go index 99e2e0274..3a99ac797 100644 --- a/syncapi/storage/tables/interface.go +++ b/syncapi/storage/tables/interface.go @@ -74,7 +74,6 @@ type Events interface { SelectContextEvent(ctx context.Context, txn *sql.Tx, roomID, eventID string) (int, gomatrixserverlib.HeaderedEvent, error) SelectContextBeforeEvent(ctx context.Context, txn *sql.Tx, id int, roomID string, filter *gomatrixserverlib.RoomEventFilter) ([]*gomatrixserverlib.HeaderedEvent, error) SelectContextAfterEvent(ctx context.Context, txn *sql.Tx, id int, roomID string, filter *gomatrixserverlib.RoomEventFilter) (int, []*gomatrixserverlib.HeaderedEvent, error) - SelectTopologicalEvent(ctx context.Context, txn *sql.Tx, topologicalPosition int, eventType, roomID string) (*gomatrixserverlib.HeaderedEvent, types.TopologyToken, error) } // Topology keeps track of the depths and stream positions for all events. diff --git a/syncapi/syncapi_test.go b/syncapi/syncapi_test.go index d2a8c51ae..17b9eaac4 100644 --- a/syncapi/syncapi_test.go +++ b/syncapi/syncapi_test.go @@ -21,7 +21,6 @@ import ( userapi "github.com/matrix-org/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/nats-io/nats.go" - "github.com/sirupsen/logrus" "github.com/tidwall/gjson" ) @@ -61,23 +60,6 @@ func (s *syncRoomserverAPI) QueryMembershipForUser(ctx context.Context, req *rsa } func (s *syncRoomserverAPI) QueryMembershipAtEvent(ctx context.Context, req *rsapi.QueryMembersipAtEventRequest, res *rsapi.QueryMembersipAtEventResponse) error { - var roomEvents []*gomatrixserverlib.HeaderedEvent - for _, room := range s.rooms { - if room.ID == req.RoomID { - roomEvents = room.Events() - break - } - } - - res.Memberships = make(map[string][]*gomatrixserverlib.HeaderedEvent) - for _, ev := range roomEvents { - logrus.Infof("roomEvents: %s", string(ev.JSON())) - if ev.Type() == gomatrixserverlib.MRoomMember && ev.StateKeyEquals(req.UserID) { - logrus.Infof("Adding membership event") - res.Memberships[ev.EventID()] = append(res.Memberships[ev.EventID()], ev) - } - } - return nil }