Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove global load position #156

Merged
merged 9 commits into from
Jun 15, 2023
Merged

Remove global load position #156

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
600c58a
Load loadPositions on conn startup
kegsay Jun 9, 2023
3b1a130
Use loadPositions in more places; reduce use of loadPosition
kegsay Jun 9, 2023
c8d0c7a
Rename confusing var name; use hasLoaded flag instead of loadPosition
kegsay Jun 13, 2023
efaf264
Merge branch 'main' into kegan/accurate-load-positions
kegsay Jun 13, 2023
5d619fd
Add LatestEvents struct and use it
kegsay Jun 13, 2023
9f8c914
Remove last usages of global load pos, replace with anchor pos
kegsay Jun 13, 2023
fdefa1a
Comments
kegsay Jun 13, 2023
702f778
Review comments
kegsay Jun 15, 2023
2a94a5a
Unbreak tests
kegsay Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions sync3/handler/connstate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ type ConnState struct {
// not yet seen room X's latest NID (it'll be sitting in the live buffer). This is why it's important
// that ConnState DOES NOT ignore events based on this value - it must ignore events based on the real
// load position for the room.
// If this value is negative or 0, it means that this connection has not been loaded yet.
anchorLoadPosition int64
// roomID -> latest load pos
loadPositions map[string]int64
Expand Down Expand Up @@ -99,9 +100,7 @@ func (s *ConnState) load(ctx context.Context, req *sync3.Request) error {
if err != nil {
return err
}
for roomID, nid := range loadPositions {
s.loadPositions[roomID] = nid
}
s.loadPositions = loadPositions
kegsay marked this conversation as resolved.
Show resolved Hide resolved
rooms := make([]sync3.RoomConnMetadata, len(joinedRooms))
i := 0
for _, metadata := range joinedRooms {
Expand Down