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

Rename Prepare to NewStateResolution

Browse source
This commit is contained in:
Neil Alexander 2020-03-19 18:06:37 +00:00
parent 5fcb394cb6
commit f6b1861c40
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roomserver/input/events.go
View file

@ -157,7 +157,7 @@ func calculateAndSetState(
event gomatrixserverlib.Event, event gomatrixserverlib.Event,
) error { ) error {
var err error var err error
roomState := state.Prepare(db) roomState := state.NewStateResolution(db)
if input.HasState { if input.HasState {
// We've been told what the state at the event is so we don't need to calculate it. // We've been told what the state at the event is so we don't need to calculate it.

2
roomserver/input/latest_events.go
View file

@ -178,7 +178,7 @@ func (u *latestEventsUpdater) doUpdateLatestEvents() error {
func (u *latestEventsUpdater) latestState() error { func (u *latestEventsUpdater) latestState() error {
var err error var err error
roomState := state.Prepare(u.db) roomState := state.NewStateResolution(u.db)
latestStateAtEvents := make([]types.StateAtEvent, len(u.latest)) latestStateAtEvents := make([]types.StateAtEvent, len(u.latest))
for i := range u.latest { for i := range u.latest {

10
roomserver/query/query.go
View file

@ -112,7 +112,7 @@ func (r *RoomserverQueryAPI) QueryLatestEventsAndState(
return nil return nil
} }
roomState := state.Prepare(r.DB) roomState := state.NewStateResolution(r.DB)
response.QueryLatestEventsAndStateRequest = *request response.QueryLatestEventsAndStateRequest = *request
roomNID, err := r.DB.RoomNID(ctx, request.RoomID) roomNID, err := r.DB.RoomNID(ctx, request.RoomID)
@ -163,7 +163,7 @@ func (r *RoomserverQueryAPI) QueryStateAfterEvents(
return nil return nil
} }
roomState := state.Prepare(r.DB) roomState := state.NewStateResolution(r.DB)
response.QueryStateAfterEventsRequest = *request response.QueryStateAfterEventsRequest = *request
roomNID, err := r.DB.RoomNID(ctx, request.RoomID) roomNID, err := r.DB.RoomNID(ctx, request.RoomID)
@ -354,7 +354,7 @@ func (r *RoomserverQueryAPI) QueryMembershipsForRoom(
func (r *RoomserverQueryAPI) getMembershipsBeforeEventNID( func (r *RoomserverQueryAPI) getMembershipsBeforeEventNID(
ctx context.Context, eventNID types.EventNID, joinedOnly bool, ctx context.Context, eventNID types.EventNID, joinedOnly bool,
) ([]types.Event, error) { ) ([]types.Event, error) {
roomState := state.Prepare(r.DB) roomState := state.NewStateResolution(r.DB)
events := []types.Event{} events := []types.Event{}
// Lookup the event NID // Lookup the event NID
eIDs, err := r.DB.EventIDs(ctx, []types.EventNID{eventNID}) eIDs, err := r.DB.EventIDs(ctx, []types.EventNID{eventNID})
@ -456,7 +456,7 @@ func (r *RoomserverQueryAPI) QueryServerAllowedToSeeEvent(
func (r *RoomserverQueryAPI) checkServerAllowedToSeeEvent( func (r *RoomserverQueryAPI) checkServerAllowedToSeeEvent(
ctx context.Context, eventID string, serverName gomatrixserverlib.ServerName, ctx context.Context, eventID string, serverName gomatrixserverlib.ServerName,
) (bool, error) { ) (bool, error) {
roomState := state.Prepare(r.DB) roomState := state.NewStateResolution(r.DB)
stateEntries, err := roomState.LoadStateAtEvent(ctx, eventID) stateEntries, err := roomState.LoadStateAtEvent(ctx, eventID)
if err != nil { if err != nil {
return false, err return false, err
@ -676,7 +676,7 @@ func (r *RoomserverQueryAPI) QueryStateAndAuthChain(
} }
func (r *RoomserverQueryAPI) loadStateAtEventIDs(ctx context.Context, eventIDs []string) ([]gomatrixserverlib.Event, error) { func (r *RoomserverQueryAPI) loadStateAtEventIDs(ctx context.Context, eventIDs []string) ([]gomatrixserverlib.Event, error) {
roomState := state.Prepare(r.DB) roomState := state.NewStateResolution(r.DB)
prevStates, err := r.DB.StateAtEventIDs(ctx, eventIDs) prevStates, err := r.DB.StateAtEventIDs(ctx, eventIDs)
if err != nil { if err != nil {
switch err.(type) { switch err.(type) {

1
roomserver/state/shared/shared.go Normal file
View file

@ -0,0 +1 @@
package shared

2
roomserver/state/state.go
View file

@ -35,7 +35,7 @@ type StateResolution struct {
db database.RoomStateDatabase db database.RoomStateDatabase
} }
func Prepare(db database.RoomStateDatabase) StateResolution { func NewStateResolution(db database.RoomStateDatabase) StateResolution {
return StateResolution{ return StateResolution{
db: db, db: db,
} }