Use limit for incremental sync

This commit is contained in:
Neil Alexander 2021-01-07 15:58:48 +00:00
parent 076ef91a48
commit ac525fba47
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944

View file

@ -97,7 +97,6 @@ func (p *PDUStreamProvider) IncrementalSync(
newPos = to newPos = to
var err error var err error
//var events []types.StreamEvent
var stateDeltas []types.StateDelta var stateDeltas []types.StateDelta
var joinedRooms []string var joinedRooms []string
@ -106,10 +105,12 @@ func (p *PDUStreamProvider) IncrementalSync(
if req.WantFullState { if req.WantFullState {
if stateDeltas, joinedRooms, err = p.DB.GetStateDeltasForFullStateSync(ctx, req.Device, r, req.Device.UserID, &stateFilter); err != nil { if stateDeltas, joinedRooms, err = p.DB.GetStateDeltasForFullStateSync(ctx, req.Device, r, req.Device.UserID, &stateFilter); err != nil {
req.Log.WithError(err).Error("p.DB.GetStateDeltasForFullStateSync failed")
return return
} }
} else { } else {
if stateDeltas, joinedRooms, err = p.DB.GetStateDeltas(ctx, req.Device, r, req.Device.UserID, &stateFilter); err != nil { if stateDeltas, joinedRooms, err = p.DB.GetStateDeltas(ctx, req.Device, r, req.Device.UserID, &stateFilter); err != nil {
req.Log.WithError(err).Error("p.DB.GetStateDeltas failed")
return return
} }
} }
@ -119,9 +120,9 @@ func (p *PDUStreamProvider) IncrementalSync(
} }
for _, delta := range stateDeltas { for _, delta := range stateDeltas {
err = p.addRoomDeltaToResponse(ctx, req.Device, r, delta, 20, req.Response) if err = p.addRoomDeltaToResponse(ctx, req.Device, r, delta, req.Limit, req.Response); err != nil {
if err != nil { req.Log.WithError(err).Error("d.addRoomDeltaToResponse failed")
return newPos // nil, fmt.Errorf("d.addRoomDeltaToResponse: %w", err) return newPos
} }
} }