octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-17 18:45:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(stdiscosrv): use order-preserving expire

Browse Source
This commit is contained in:
Jakob Borg 2024-09-10 12:22:37 +02:00
parent 5c2fcbfd19
commit 66fb65b01f
No known key found for this signature in database
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/stdiscosrv/database.go
View File

@ -29,7 +29,6 @@ import (
"github.com/aws/aws-sdk-go/service/s3/s3manager" "github.com/aws/aws-sdk-go/service/s3/s3manager"
"github.com/puzpuzpuz/xsync/v3" "github.com/puzpuzpuz/xsync/v3"
"github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/protocol"
"github.com/syncthing/syncthing/lib/sliceutil"
) )
type clock interface { type clock interface {
@ -405,12 +404,14 @@ loop:
// expire returns the list of addresses after removing expired entries. // expire returns the list of addresses after removing expired entries.
// Expiration happen in place, so the slice given as the parameter is // Expiration happen in place, so the slice given as the parameter is
// destroyed. Internal order is not preserved. // destroyed. Internal order is preserved.
func expire(addrs []DatabaseAddress, now int64) []DatabaseAddress { func expire(addrs []DatabaseAddress, now int64) []DatabaseAddress {
i := 0 i := 0
for i < len(addrs) { for i < len(addrs) {
if addrs[i].Expires < now { if addrs[i].Expires < now {
addrs = sliceutil.RemoveAndZero(addrs, i) copy(addrs[i:], addrs[i+1:])
addrs[len(addrs)-1] = DatabaseAddress{}
addrs = addrs[:len(addrs)-1]
continue continue
} }
i++ i++