mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-23 06:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove RoomNID and replace with RoomInfo

Browse source
This commit is contained in:
Kegan Dougal 2020-08-28 18:29:11 +01:00
parent b1fe8ae2f5
commit 63c0819e65
6 changed files with 30 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roomserver/internal/perform_backfill.go
View file

@ -293,11 +293,11 @@ func joinEventsFromHistoryVisibility(
return nil, nil return nil, nil
} }
// get joined members // get joined members
roomNID, err := db.RoomNID(ctx, roomID) info, err := db.RoomInfo(ctx, roomID)
if err != nil { if err != nil {
return nil, err return nil, err
} }
joinEventNIDs, err := db.GetMembershipEventNIDsForRoom(ctx, roomNID, true, false) joinEventNIDs, err := db.GetMembershipEventNIDsForRoom(ctx, info.RoomNID, true, false)
if err != nil { if err != nil {
return nil, err return nil, err
} }

34
roomserver/internal/perform_invite.go
View file

@ -26,12 +26,17 @@ func (r *RoomserverInternalAPI) PerformInvite(
roomID := event.RoomID() roomID := event.RoomID()
targetUserID := *event.StateKey() 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{ log.WithFields(log.Fields{
"event_id": event.EventID(), "event_id": event.EventID(),
"room_id": roomID, "room_id": roomID,
"room_version": req.RoomVersion, "room_version": req.RoomVersion,
"target_user_id": targetUserID, "target_user_id": targetUserID,
"room_info_exists": info != nil,
}).Info("processing invite event") }).Info("processing invite event")
_, domain, _ := gomatrixserverlib.SplitID('@', targetUserID) _, domain, _ := gomatrixserverlib.SplitID('@', targetUserID)
@ -39,25 +44,25 @@ func (r *RoomserverInternalAPI) PerformInvite(
isOriginLocal := event.Origin() == r.Cfg.Matrix.ServerName isOriginLocal := event.Origin() == r.Cfg.Matrix.ServerName
inviteState := req.InviteRoomState inviteState := req.InviteRoomState
if len(inviteState) == 0 { if len(inviteState) == 0 && info != nil {
if is, err := buildInviteStrippedState(ctx, r.DB, req); err == nil { var is []gomatrixserverlib.InviteV2StrippedState
if is, err = buildInviteStrippedState(ctx, r.DB, info, req); err == nil {
inviteState = is inviteState = is
} }
} }
if len(inviteState) == 0 { 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) return fmt.Errorf("event.SetUnsignedField: %w", err)
} }
} else { } 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) return fmt.Errorf("event.SetUnsignedField: %w", err)
} }
} }
var isAlreadyJoined bool var isAlreadyJoined bool
roomNID, err := r.DB.RoomNID(ctx, roomID) if info != nil {
if err == nil { _, isAlreadyJoined, err = r.DB.GetMembership(ctx, info.RoomNID, *event.StateKey())
_, isAlreadyJoined, err = r.DB.GetMembership(ctx, roomNID, *event.StateKey())
if err != nil { if err != nil {
return fmt.Errorf("r.DB.GetMembership: %w", err) return fmt.Errorf("r.DB.GetMembership: %w", err)
} }
@ -187,12 +192,9 @@ func (r *RoomserverInternalAPI) PerformInvite(
func buildInviteStrippedState( func buildInviteStrippedState(
ctx context.Context, ctx context.Context,
db storage.Database, db storage.Database,
info *types.RoomInfo,
input *api.PerformInviteRequest, input *api.PerformInviteRequest,
) ([]gomatrixserverlib.InviteV2StrippedState, error) { ) ([]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{} 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." // "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 // https://matrix.org/docs/spec/client_server/r0.6.0#m-room-member
@ -206,7 +208,7 @@ func buildInviteStrippedState(
StateKey: "", StateKey: "",
}) })
} }
_, currentStateSnapshotNID, _, err := db.LatestEventIDs(ctx, roomNID) _, currentStateSnapshotNID, _, err := db.LatestEventIDs(ctx, info.RoomNID)
if err != nil { if err != nil {
return nil, err return nil, err
} }

6
roomserver/internal/perform_leave.go
View file

@ -172,9 +172,9 @@ func (r *RoomserverInternalAPI) isInvitePending(
roomID, userID string, roomID, userID string,
) (bool, string, string, error) { ) (bool, string, string, error) {
// Look up the room NID for the supplied room ID. // 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 { 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. // 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 // 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 // we do then it will contain a server name that we can direct the
// send_leave to. // 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 { if err != nil {
return false, "", "", fmt.Errorf("r.DB.GetInvitesForUser: %w", err) return false, "", "", fmt.Errorf("r.DB.GetInvitesForUser: %w", err)
} }

14
roomserver/internal/query.go
View file

@ -210,12 +210,12 @@ func (r *RoomserverInternalAPI) QueryMembershipForUser(
request *api.QueryMembershipForUserRequest, request *api.QueryMembershipForUserRequest,
response *api.QueryMembershipForUserResponse, response *api.QueryMembershipForUserResponse,
) error { ) error {
roomNID, err := r.DB.RoomNID(ctx, request.RoomID) info, err := r.DB.RoomInfo(ctx, request.RoomID)
if err != nil { if err != nil {
return err 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 { if err != nil {
return err return err
} }
@ -247,12 +247,12 @@ func (r *RoomserverInternalAPI) QueryMembershipsForRoom(
request *api.QueryMembershipsForRoomRequest, request *api.QueryMembershipsForRoomRequest,
response *api.QueryMembershipsForRoomResponse, response *api.QueryMembershipsForRoomResponse,
) error { ) error {
roomNID, err := r.DB.RoomNID(ctx, request.RoomID) info, err := r.DB.RoomInfo(ctx, request.RoomID)
if err != nil { if err != nil {
return err 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 { if err != nil {
return err return err
} }
@ -270,7 +270,7 @@ func (r *RoomserverInternalAPI) QueryMembershipsForRoom(
var stateEntries []types.StateEntry var stateEntries []types.StateEntry
if stillInRoom { if stillInRoom {
var eventNIDs []types.EventNID 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 { if err != nil {
return err 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) { 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 { if err != nil {
return false, err 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 { if err != nil {
return false, err return false, err
} }

4
roomserver/storage/interface.go
View file

@ -96,10 +96,6 @@ type Database interface {
// This is used to determine if the room event is processed/processing already. // This is used to determine if the room event is processed/processing already.
// Returns an empty string if no such event exists. // Returns an empty string if no such event exists.
GetTransactionEventID(ctx context.Context, transactionID string, sessionID int64, userID string) (string, error) 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. // 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 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. // Returns an error if there was a problem talking to the database.

12
roomserver/storage/shared/storage.go
View file

@ -198,18 +198,6 @@ func (d *Database) EventsFromIDs(ctx context.Context, eventIDs []string) ([]type
return d.Events(ctx, nids) 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( func (d *Database) LatestEventIDs(
ctx context.Context, roomNID types.RoomNID, ctx context.Context, roomNID types.RoomNID,
) (references []gomatrixserverlib.EventReference, currentStateSnapshotNID types.StateSnapshotNID, depth int64, err error) { ) (references []gomatrixserverlib.EventReference, currentStateSnapshotNID types.StateSnapshotNID, depth int64, err error) {