mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-21 13:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add tests and fix maxOffset bug

Browse source
This commit is contained in:
Kegan Dougal 2020-07-28 15:06:14 +01:00
parent 5fe0f0eccd
commit 2ea06dacd8
3 changed files with 61 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
keyserver/storage/postgres/key_changes_table.go
View file

@ -83,15 +83,14 @@ func (s *keyChangesStatements) SelectKeyChanges(
return nil, 0, err return nil, 0, err
} }
defer internal.CloseAndLogIfError(ctx, rows, "selectKeyChangesStmt: rows.close() failed") defer internal.CloseAndLogIfError(ctx, rows, "selectKeyChangesStmt: rows.close() failed")
var maxOffset int64
for rows.Next() { for rows.Next() {
var userID string var userID string
var offset int64 var offset int64
if err := rows.Scan(&userID, &offset); err != nil { if err := rows.Scan(&userID, &offset); err != nil {
return nil, 0, err return nil, 0, err
} }
if offset > maxOffset { if offset > latestOffset {
maxOffset = offset latestOffset = offset
} }
userIDs = append(userIDs, userID) userIDs = append(userIDs, userID)
} }

5
keyserver/storage/sqlite3/key_changes_table.go
View file

@ -83,15 +83,14 @@ func (s *keyChangesStatements) SelectKeyChanges(
return nil, 0, err return nil, 0, err
} }
defer internal.CloseAndLogIfError(ctx, rows, "selectKeyChangesStmt: rows.close() failed") defer internal.CloseAndLogIfError(ctx, rows, "selectKeyChangesStmt: rows.close() failed")
var maxOffset int64
for rows.Next() { for rows.Next() {
var userID string var userID string
var offset int64 var offset int64
if err := rows.Scan(&userID, &offset); err != nil { if err := rows.Scan(&userID, &offset); err != nil {
return nil, 0, err return nil, 0, err
} }
if offset > maxOffset { if offset > latestOffset {
maxOffset = offset latestOffset = offset
} }
userIDs = append(userIDs, userID) userIDs = append(userIDs, userID)
} }

57
keyserver/storage/storage_test.go Normal file
View file

@ -0,0 +1,57 @@
package storage
import (
"context"
"reflect"
"testing"
)
var ctx = context.Background()
func MustNotError(t *testing.T, err error) {
t.Helper()
if err == nil {
return
}
t.Fatalf("operation failed: %s", err)
}
func TestKeyChanges(t *testing.T) {
db, err := NewDatabase("file::memory:", nil)
if err != nil {
t.Fatalf("Failed to NewDatabase: %s", err)
}
MustNotError(t, db.StoreKeyChange(ctx, 0, 0, "@alice:localhost"))
MustNotError(t, db.StoreKeyChange(ctx, 0, 1, "@bob:localhost"))
MustNotError(t, db.StoreKeyChange(ctx, 0, 2, "@charlie:localhost"))
userIDs, latest, err := db.KeyChanges(ctx, 0, 1)
if err != nil {
t.Fatalf("Failed to KeyChanges: %s", err)
}
if latest != 2 {
t.Fatalf("KeyChanges: got latest=%d want 2", latest)
}
if !reflect.DeepEqual(userIDs, []string{"@charlie:localhost"}) {
t.Fatalf("KeyChanges: wrong user_ids: %v", userIDs)
}
}
func TestKeyChangesNoDupes(t *testing.T) {
db, err := NewDatabase("file::memory:", nil)
if err != nil {
t.Fatalf("Failed to NewDatabase: %s", err)
}
MustNotError(t, db.StoreKeyChange(ctx, 0, 0, "@alice:localhost"))
MustNotError(t, db.StoreKeyChange(ctx, 0, 1, "@alice:localhost"))
MustNotError(t, db.StoreKeyChange(ctx, 0, 2, "@alice:localhost"))
userIDs, latest, err := db.KeyChanges(ctx, 0, 0)
if err != nil {
t.Fatalf("Failed to KeyChanges: %s", err)
}
if latest != 2 {
t.Fatalf("KeyChanges: got latest=%d want 2", latest)
}
if !reflect.DeepEqual(userIDs, []string{"@alice:localhost"}) {
t.Fatalf("KeyChanges: wrong user_ids: %v", userIDs)
}
}