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): simplify sorting

Browse Source
This commit is contained in:
Jakob Borg 2024-09-10 11:51:07 +02:00
parent f9b72330a8
commit 5c2fcbfd19
No known key found for this signature in database
2 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/stdiscosrv/apisrv.go
View File

@ -22,7 +22,7 @@ import (
"net" "net"
"net/http" "net/http"
"net/url" "net/url"
"sort" "slices"
"strconv" "strconv"
"strings" "strings"
"sync" "sync"
@ -311,7 +311,7 @@ func (s *apiSrv) handleAnnounce(deviceID protocol.DeviceID, addresses []string)
// The address slice must always be sorted for database merges to work // The address slice must always be sorted for database merges to work
// properly. // properly.
sort.Sort(databaseAddressOrder(dbAddrs)) slices.SortFunc(dbAddrs, DatabaseAddress.Cmp)
seen := now.UnixNano() seen := now.UnixNano()
if s.repl != nil { if s.repl != nil {

41
cmd/stdiscosrv/database.go
View File

@ -11,6 +11,7 @@ package main
import ( import (
"bufio" "bufio"
"cmp"
"context" "context"
"encoding/binary" "encoding/binary"
"io" "io"
@ -19,7 +20,7 @@ import (
"net/url" "net/url"
"os" "os"
"path" "path"
"sort" "slices"
"time" "time"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
@ -326,6 +327,7 @@ func (s *inMemoryStore) read() error {
continue continue
} }
slices.SortFunc(rec.Addresses, DatabaseAddress.Cmp)
s.m.Store(key, DatabaseRecord{ s.m.Store(key, DatabaseRecord{
Addresses: rec.Addresses, Addresses: rec.Addresses,
Seen: rec.Seen, Seen: rec.Seen,
@ -339,15 +341,6 @@ func (s *inMemoryStore) read() error {
// chosen for any duplicates. // chosen for any duplicates.
func merge(a, b DatabaseRecord) DatabaseRecord { func merge(a, b DatabaseRecord) DatabaseRecord {
// Both lists must be sorted for this to work. // Both lists must be sorted for this to work.
if !sort.IsSorted(databaseAddressOrder(a.Addresses)) {
log.Println("Warning: bug: addresses not correctly sorted in merge")
a.Addresses = sortedAddressCopy(a.Addresses)
}
if !sort.IsSorted(databaseAddressOrder(b.Addresses)) {
// no warning because this is the side we read from disk and it may
// legitimately predate correct sorting.
b.Addresses = sortedAddressCopy(b.Addresses)
}
res := DatabaseRecord{ res := DatabaseRecord{
Addresses: make([]DatabaseAddress, 0, max(len(a.Addresses), len(b.Addresses))), Addresses: make([]DatabaseAddress, 0, max(len(a.Addresses), len(b.Addresses))),
@ -425,27 +418,6 @@ func expire(addrs []DatabaseAddress, now int64) []DatabaseAddress {
return addrs return addrs
} }
func sortedAddressCopy(addrs []DatabaseAddress) []DatabaseAddress {
sorted := make([]DatabaseAddress, len(addrs))
copy(sorted, addrs)
sort.Sort(databaseAddressOrder(sorted))
return sorted
}
type databaseAddressOrder []DatabaseAddress
func (s databaseAddressOrder) Less(a, b int) bool {
return s[a].Address < s[b].Address
}
func (s databaseAddressOrder) Swap(a, b int) {
s[a], s[b] = s[b], s[a]
}
func (s databaseAddressOrder) Len() int {
return len(s)
}
func s3Upload(r io.Reader) error { func s3Upload(r io.Reader) error {
sess, err := session.NewSession(&aws.Config{ sess, err := session.NewSession(&aws.Config{
Region: aws.String("fr-par"), Region: aws.String("fr-par"),
@ -478,3 +450,10 @@ func s3Download(w io.WriterAt) error {
}) })
return err return err
} }
func (d DatabaseAddress) Cmp(other DatabaseAddress) (n int) {
if c := cmp.Compare(d.Address, other.Address); c != 0 {
return c
}
return cmp.Compare(d.Expires, other.Expires)
}