From 63c0819e65ab2e6d21e578ef522431b716451e40 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Fri, 28 Aug 2020 18:29:11 +0100 Subject: [PATCH] Remove RoomNID and replace with RoomInfo --- roomserver/internal/perform_backfill.go | 4 +-- roomserver/internal/perform_invite.go | 34 +++++++++++++------------ roomserver/internal/perform_leave.go | 6 ++--- roomserver/internal/query.go | 14 +++++----- roomserver/storage/interface.go | 4 --- roomserver/storage/shared/storage.go | 12 --------- 6 files changed, 30 insertions(+), 44 deletions(-) diff --git a/roomserver/internal/perform_backfill.go b/roomserver/internal/perform_backfill.go index fb8fd7e8f..65c88860c 100644 --- a/roomserver/internal/perform_backfill.go +++ b/roomserver/internal/perform_backfill.go @@ -293,11 +293,11 @@ func joinEventsFromHistoryVisibility( return nil, nil } // get joined members - roomNID, err := db.RoomNID(ctx, roomID) + info, err := db.RoomInfo(ctx, roomID) if err != nil { return nil, err } - joinEventNIDs, err := db.GetMembershipEventNIDsForRoom(ctx, roomNID, true, false) + joinEventNIDs, err := db.GetMembershipEventNIDsForRoom(ctx, info.RoomNID, true, false) if err != nil { return nil, err } diff --git a/roomserver/internal/perform_invite.go b/roomserver/internal/perform_invite.go index aab3e8a8a..f58e51713 100644 --- a/roomserver/internal/perform_invite.go +++ b/roomserver/internal/perform_invite.go @@ -26,12 +26,17 @@ func (r *RoomserverInternalAPI) PerformInvite( roomID := event.RoomID() targetUserID := *event.StateKey() + info, err := r.DB.RoomInfo(ctx, roomID) + if err != nil { + return fmt.Errorf("Failed to load RoomInfo: %w", err) + } log.WithFields(log.Fields{ - "event_id": event.EventID(), - "room_id": roomID, - "room_version": req.RoomVersion, - "target_user_id": targetUserID, + "event_id": event.EventID(), + "room_id": roomID, + "room_version": req.RoomVersion, + "target_user_id": targetUserID, + "room_info_exists": info != nil, }).Info("processing invite event") _, domain, _ := gomatrixserverlib.SplitID('@', targetUserID) @@ -39,25 +44,25 @@ func (r *RoomserverInternalAPI) PerformInvite( isOriginLocal := event.Origin() == r.Cfg.Matrix.ServerName inviteState := req.InviteRoomState - if len(inviteState) == 0 { - if is, err := buildInviteStrippedState(ctx, r.DB, req); err == nil { + if len(inviteState) == 0 && info != nil { + var is []gomatrixserverlib.InviteV2StrippedState + if is, err = buildInviteStrippedState(ctx, r.DB, info, req); err == nil { inviteState = is } } if len(inviteState) == 0 { - if err := event.SetUnsignedField("invite_room_state", struct{}{}); err != nil { + if err = event.SetUnsignedField("invite_room_state", struct{}{}); err != nil { return fmt.Errorf("event.SetUnsignedField: %w", err) } } else { - if err := event.SetUnsignedField("invite_room_state", inviteState); err != nil { + if err = event.SetUnsignedField("invite_room_state", inviteState); err != nil { return fmt.Errorf("event.SetUnsignedField: %w", err) } } var isAlreadyJoined bool - roomNID, err := r.DB.RoomNID(ctx, roomID) - if err == nil { - _, isAlreadyJoined, err = r.DB.GetMembership(ctx, roomNID, *event.StateKey()) + if info != nil { + _, isAlreadyJoined, err = r.DB.GetMembership(ctx, info.RoomNID, *event.StateKey()) if err != nil { return fmt.Errorf("r.DB.GetMembership: %w", err) } @@ -187,12 +192,9 @@ func (r *RoomserverInternalAPI) PerformInvite( func buildInviteStrippedState( ctx context.Context, db storage.Database, + info *types.RoomInfo, input *api.PerformInviteRequest, ) ([]gomatrixserverlib.InviteV2StrippedState, error) { - roomNID, err := db.RoomNID(ctx, input.Event.RoomID()) - if err != nil || roomNID == 0 { - return nil, fmt.Errorf("room %q unknown", input.Event.RoomID()) - } stateWanted := []gomatrixserverlib.StateKeyTuple{} // "If they are set on the room, at least the state for m.room.avatar, m.room.canonical_alias, m.room.join_rules, and m.room.name SHOULD be included." // https://matrix.org/docs/spec/client_server/r0.6.0#m-room-member @@ -206,7 +208,7 @@ func buildInviteStrippedState( StateKey: "", }) } - _, currentStateSnapshotNID, _, err := db.LatestEventIDs(ctx, roomNID) + _, currentStateSnapshotNID, _, err := db.LatestEventIDs(ctx, info.RoomNID) if err != nil { return nil, err } diff --git a/roomserver/internal/perform_leave.go b/roomserver/internal/perform_leave.go index 79676530f..54aec4a42 100644 --- a/roomserver/internal/perform_leave.go +++ b/roomserver/internal/perform_leave.go @@ -172,9 +172,9 @@ func (r *RoomserverInternalAPI) isInvitePending( roomID, userID string, ) (bool, string, string, error) { // Look up the room NID for the supplied room ID. - roomNID, err := r.DB.RoomNID(ctx, roomID) + info, err := r.DB.RoomInfo(ctx, roomID) if err != nil { - return false, "", "", fmt.Errorf("r.DB.RoomNID: %w", err) + return false, "", "", fmt.Errorf("r.DB.RoomInfo: %w", err) } // Look up the state key NID for the supplied user ID. @@ -190,7 +190,7 @@ func (r *RoomserverInternalAPI) isInvitePending( // Let's see if we have an event active for the user in the room. If // we do then it will contain a server name that we can direct the // send_leave to. - senderUserNIDs, eventIDs, err := r.DB.GetInvitesForUser(ctx, roomNID, targetUserNID) + senderUserNIDs, eventIDs, err := r.DB.GetInvitesForUser(ctx, info.RoomNID, targetUserNID) if err != nil { return false, "", "", fmt.Errorf("r.DB.GetInvitesForUser: %w", err) } diff --git a/roomserver/internal/query.go b/roomserver/internal/query.go index 1ddf25469..2e8e87007 100644 --- a/roomserver/internal/query.go +++ b/roomserver/internal/query.go @@ -210,12 +210,12 @@ func (r *RoomserverInternalAPI) QueryMembershipForUser( request *api.QueryMembershipForUserRequest, response *api.QueryMembershipForUserResponse, ) error { - roomNID, err := r.DB.RoomNID(ctx, request.RoomID) + info, err := r.DB.RoomInfo(ctx, request.RoomID) if err != nil { return err } - membershipEventNID, stillInRoom, err := r.DB.GetMembership(ctx, roomNID, request.UserID) + membershipEventNID, stillInRoom, err := r.DB.GetMembership(ctx, info.RoomNID, request.UserID) if err != nil { return err } @@ -247,12 +247,12 @@ func (r *RoomserverInternalAPI) QueryMembershipsForRoom( request *api.QueryMembershipsForRoomRequest, response *api.QueryMembershipsForRoomResponse, ) error { - roomNID, err := r.DB.RoomNID(ctx, request.RoomID) + info, err := r.DB.RoomInfo(ctx, request.RoomID) if err != nil { return err } - membershipEventNID, stillInRoom, err := r.DB.GetMembership(ctx, roomNID, request.Sender) + membershipEventNID, stillInRoom, err := r.DB.GetMembership(ctx, info.RoomNID, request.Sender) if err != nil { return err } @@ -270,7 +270,7 @@ func (r *RoomserverInternalAPI) QueryMembershipsForRoom( var stateEntries []types.StateEntry if stillInRoom { var eventNIDs []types.EventNID - eventNIDs, err = r.DB.GetMembershipEventNIDsForRoom(ctx, roomNID, request.JoinedOnly, false) + eventNIDs, err = r.DB.GetMembershipEventNIDsForRoom(ctx, info.RoomNID, request.JoinedOnly, false) if err != nil { return err } @@ -555,12 +555,12 @@ func (r *RoomserverInternalAPI) backfillViaFederation(ctx context.Context, req * } func (r *RoomserverInternalAPI) isServerCurrentlyInRoom(ctx context.Context, serverName gomatrixserverlib.ServerName, roomID string) (bool, error) { - roomNID, err := r.DB.RoomNID(ctx, roomID) + info, err := r.DB.RoomInfo(ctx, roomID) if err != nil { return false, err } - eventNIDs, err := r.DB.GetMembershipEventNIDsForRoom(ctx, roomNID, true, false) + eventNIDs, err := r.DB.GetMembershipEventNIDsForRoom(ctx, info.RoomNID, true, false) if err != nil { return false, err } diff --git a/roomserver/storage/interface.go b/roomserver/storage/interface.go index 7807feb8e..5f6416145 100644 --- a/roomserver/storage/interface.go +++ b/roomserver/storage/interface.go @@ -96,10 +96,6 @@ type Database interface { // This is used to determine if the room event is processed/processing already. // Returns an empty string if no such event exists. GetTransactionEventID(ctx context.Context, transactionID string, sessionID int64, userID string) (string, error) - // Look up the numeric ID for the room. - // Returns 0 if the room doesn't exists. - // Returns an error if there was a problem talking to the database. - RoomNID(ctx context.Context, roomID string) (types.RoomNID, error) // Look up event references for the latest events in the room and the current state snapshot. // Returns the latest events, the current state and the maximum depth of the latest events plus 1. // Returns an error if there was a problem talking to the database. diff --git a/roomserver/storage/shared/storage.go b/roomserver/storage/shared/storage.go index 962ac43ea..4af61be8f 100644 --- a/roomserver/storage/shared/storage.go +++ b/roomserver/storage/shared/storage.go @@ -198,18 +198,6 @@ func (d *Database) EventsFromIDs(ctx context.Context, eventIDs []string) ([]type return d.Events(ctx, nids) } -func (d *Database) RoomNID(ctx context.Context, roomID string) (types.RoomNID, error) { - if nid, ok := d.Cache.GetRoomServerRoomNID(roomID); ok { - return nid, nil - } - roomNID, err := d.RoomsTable.SelectRoomNID(ctx, nil, roomID) - if err == sql.ErrNoRows { - return 0, nil - } - d.Cache.StoreRoomServerRoomNID(roomID, roomNID) - return roomNID, err -} - func (d *Database) LatestEventIDs( ctx context.Context, roomNID types.RoomNID, ) (references []gomatrixserverlib.EventReference, currentStateSnapshotNID types.StateSnapshotNID, depth int64, err error) {