sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Add EventJSONTable tests

Browse source
This commit is contained in:
Till Faelligen 2022-05-05 10:53:19 +02:00
parent 3c940c428d
commit c714914655
5 changed files with 93 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roomserver/storage/postgres/event_json_table.go
View file

@ -59,12 +59,12 @@ type eventJSONStatements struct {
bulkSelectEventJSONStmt *sql.Stmt
}
func createEventJSONTable(db *sql.DB) error {
func CreateEventJSONTable(db *sql.DB) error {
_, err := db.Exec(eventJSONSchema)
return err
}
func prepareEventJSONTable(db *sql.DB) (tables.EventJSON, error) {
func PrepareEventJSONTable(db *sql.DB) (tables.EventJSON, error) {
s := &eventJSONStatements{}
return s, sqlutil.StatementList{

4
roomserver/storage/postgres/storage.go
View file

@ -74,7 +74,7 @@ func (d *Database) create(db *sql.DB) error {
if err := createEventTypesTable(db); err != nil {
return err
}
if err := createEventJSONTable(db); err != nil {
if err := CreateEventJSONTable(db); err != nil {
return err
}
if err := createEventsTable(db); err != nil {
@ -120,7 +120,7 @@ func (d *Database) prepare(db *sql.DB, writer sqlutil.Writer, cache caching.Room
if err != nil {
return err
}
eventJSON, err := prepareEventJSONTable(db)
eventJSON, err := PrepareEventJSONTable(db)
if err != nil {
return err
}

4
roomserver/storage/sqlite3/event_json_table.go
View file

@ -52,12 +52,12 @@ type eventJSONStatements struct {
bulkSelectEventJSONStmt *sql.Stmt
}
func createEventJSONTable(db *sql.DB) error {
func CreateEventJSONTable(db *sql.DB) error {
_, err := db.Exec(eventJSONSchema)
return err
}
func prepareEventJSONTable(db *sql.DB) (tables.EventJSON, error) {
func PrepareEventJSONTable(db *sql.DB) (tables.EventJSON, error) {
s := &eventJSONStatements{
db: db,
}

4
roomserver/storage/sqlite3/storage.go
View file

@ -83,7 +83,7 @@ func (d *Database) create(db *sql.DB) error {
if err := createEventTypesTable(db); err != nil {
return err
}
if err := createEventJSONTable(db); err != nil {
if err := CreateEventJSONTable(db); err != nil {
return err
}
if err := createEventsTable(db); err != nil {
@ -129,7 +129,7 @@ func (d *Database) prepare(db *sql.DB, writer sqlutil.Writer, cache caching.Room
if err != nil {
return err
}
eventJSON, err := prepareEventJSONTable(db)
eventJSON, err := PrepareEventJSONTable(db)
if err != nil {
return err
}

85
roomserver/storage/tables/event_json_table_test.go Normal file
View file

@ -0,0 +1,85 @@
package tables_test
import (
"context"
"fmt"
"reflect"
"testing"
"github.com/matrix-org/dendrite/internal/sqlutil"
"github.com/matrix-org/dendrite/roomserver/storage/postgres"
"github.com/matrix-org/dendrite/roomserver/storage/sqlite3"
"github.com/matrix-org/dendrite/roomserver/storage/tables"
"github.com/matrix-org/dendrite/roomserver/types"
"github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/test"
)
func mustCreateEventJSONTable(t *testing.T, dbType test.DBType) (tables.EventJSON, func()) {
t.Helper()
connStr, close := test.PrepareDBConnectionString(t, dbType)
db, err := sqlutil.Open(&config.DatabaseOptions{
ConnectionString: config.DataSource(connStr),
}, sqlutil.NewExclusiveWriter())
if err != nil {
t.Fatalf("failed to open db: %s", err)
}
var (
tab tables.EventJSON
)
switch dbType {
case test.DBTypePostgres:
err = postgres.CreateEventJSONTable(db)
if err != nil {
t.Fatalf("failed to create table: %v", err)
}
tab, err = postgres.PrepareEventJSONTable(db)
if err != nil {
t.Fatalf("failed to prepare statements: %v", err)
}
case test.DBTypeSQLite:
err = sqlite3.CreateEventJSONTable(db)
if err != nil {
t.Fatalf("failed to create table: %v", err)
}
tab, err = sqlite3.PrepareEventJSONTable(db)
if err != nil {
t.Fatalf("failed to prepare statements: %v", err)
}
}
if err != nil {
t.Fatalf("failed to make new table: %s", err)
}
return tab, close
}
func TestEventJSONTable(t *testing.T) {
ctx := context.Background()
test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
tab, close := mustCreateEventJSONTable(t, dbType)
defer close()
// insert some dummy data
for i := 0; i < 10; i++ {
err := tab.InsertEventJSON(ctx, nil, types.EventNID(i), []byte(fmt.Sprintf(`{"value": %d }`, i)))
if err != nil {
t.Fatalf("failed to insert event json: %v", err)
}
}
// and fetch them again
eventJSONPair, err := tab.BulkSelectEventJSON(ctx, nil, types.EventNIDs{1, 2, 3, 4, 5})
if err != nil {
t.Fatalf("failed to get event json: %v", err)
}
if len(eventJSONPair) != 5 {
t.Fatalf("expected 5 events, got %d", len(eventJSONPair))
}
for _, x := range eventJSONPair {
want := []byte(fmt.Sprintf(`{"value": %d }`, x.EventNID))
if !reflect.DeepEqual(x.EventJSON, want) {
t.Fatalf("unexpected eventJSON %v, want %v", string(x.EventJSON), string(want))
}
}
})
}