mirror of
https://github.com/hoernschen/dendrite.git
synced 2025-07-31 21:32:46 +00:00
Add roomserver tests (1/?) (#2434)
* Add EventJSONTable tests * Add eventJSON tests * Add EventStateKeysTable tests * Add EventTypesTable tests * Add Events Table tests Move variable declaration outside loops Switch to testify/assert for tests * Move variable declaration outside loop * Remove random data * Fix issue where the EventReferenceSHA256 is not set * Add more tests * Revert "Fix issue where the EventReferenceSHA256 is not set" This reverts commit 8ae34c4e5f78584f0edb479f5a893556d2b95d19. * Update GMSL * Add tests for duplicate entries * Test what happens if we select non-existing NIDs * Add test for non-existing eventType * Really update GMSL
This commit is contained in:
Till
GitHub
parent
09d754cfbf
commit
f69ebc6af2
17 changed files with 499 additions and 88 deletions
95
roomserver/storage/tables/event_json_table_test.go
Normal file
95
roomserver/storage/tables/event_json_table_test.go
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
package tables_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"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"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
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())
|
||||
assert.NoError(t, err)
|
||||
var tab tables.EventJSON
|
||||
switch dbType {
|
||||
case test.DBTypePostgres:
|
||||
err = postgres.CreateEventJSONTable(db)
|
||||
assert.NoError(t, err)
|
||||
tab, err = postgres.PrepareEventJSONTable(db)
|
||||
case test.DBTypeSQLite:
|
||||
err = sqlite3.CreateEventJSONTable(db)
|
||||
assert.NoError(t, err)
|
||||
tab, err = sqlite3.PrepareEventJSONTable(db)
|
||||
}
|
||||
assert.NoError(t, err)
|
||||
|
||||
return tab, close
|
||||
}
|
||||
|
||||
func Test_EventJSONTable(t *testing.T) {
|
||||
test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
|
||||
tab, close := mustCreateEventJSONTable(t, dbType)
|
||||
defer close()
|
||||
|
||||
// create some dummy data
|
||||
for i := 0; i < 10; i++ {
|
||||
err := tab.InsertEventJSON(
|
||||
context.Background(), nil, types.EventNID(i),
|
||||
[]byte(fmt.Sprintf(`{"value":%d"}`, i)),
|
||||
)
|
||||
assert.NoError(t, err)
|
||||
}
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
args []types.EventNID
|
||||
wantCount int
|
||||
}{
|
||||
{
|
||||
name: "select subset of existing NIDs",
|
||||
args: []types.EventNID{1, 2, 3, 4, 5},
|
||||
wantCount: 5,
|
||||
},
|
||||
{
|
||||
name: "select subset of existing/non-existing NIDs",
|
||||
args: []types.EventNID{1, 2, 12, 50},
|
||||
wantCount: 2,
|
||||
},
|
||||
{
|
||||
name: "select single existing NID",
|
||||
args: []types.EventNID{1},
|
||||
wantCount: 1,
|
||||
},
|
||||
{
|
||||
name: "select single non-existing NID",
|
||||
args: []types.EventNID{13},
|
||||
wantCount: 0,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range tests {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
// select a subset of the data
|
||||
values, err := tab.BulkSelectEventJSON(context.Background(), nil, tc.args)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, tc.wantCount, len(values))
|
||||
for i, v := range values {
|
||||
assert.Equal(t, v.EventNID, types.EventNID(i+1))
|
||||
assert.Equal(t, []byte(fmt.Sprintf(`{"value":%d"}`, i+1)), v.EventJSON)
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
79
roomserver/storage/tables/event_state_keys_table_test.go
Normal file
79
roomserver/storage/tables/event_state_keys_table_test.go
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
package tables_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"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"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func mustCreateEventStateKeysTable(t *testing.T, dbType test.DBType) (tables.EventStateKeys, func()) {
|
||||
t.Helper()
|
||||
connStr, close := test.PrepareDBConnectionString(t, dbType)
|
||||
db, err := sqlutil.Open(&config.DatabaseOptions{
|
||||
ConnectionString: config.DataSource(connStr),
|
||||
}, sqlutil.NewExclusiveWriter())
|
||||
assert.NoError(t, err)
|
||||
var tab tables.EventStateKeys
|
||||
switch dbType {
|
||||
case test.DBTypePostgres:
|
||||
err = postgres.CreateEventStateKeysTable(db)
|
||||
assert.NoError(t, err)
|
||||
tab, err = postgres.PrepareEventStateKeysTable(db)
|
||||
case test.DBTypeSQLite:
|
||||
err = sqlite3.CreateEventStateKeysTable(db)
|
||||
assert.NoError(t, err)
|
||||
tab, err = sqlite3.PrepareEventStateKeysTable(db)
|
||||
}
|
||||
assert.NoError(t, err)
|
||||
|
||||
return tab, close
|
||||
}
|
||||
|
||||
func Test_EventStateKeysTable(t *testing.T) {
|
||||
test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
|
||||
tab, close := mustCreateEventStateKeysTable(t, dbType)
|
||||
defer close()
|
||||
ctx := context.Background()
|
||||
var stateKeyNID, gotEventStateKey types.EventStateKeyNID
|
||||
var err error
|
||||
// create some dummy data
|
||||
for i := 0; i < 10; i++ {
|
||||
stateKey := fmt.Sprintf("@user%d:localhost", i)
|
||||
stateKeyNID, err = tab.InsertEventStateKeyNID(ctx, nil, stateKey)
|
||||
assert.NoError(t, err)
|
||||
gotEventStateKey, err = tab.SelectEventStateKeyNID(ctx, nil, stateKey)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, stateKeyNID, gotEventStateKey)
|
||||
}
|
||||
// This should fail, since @user0:localhost already exists
|
||||
stateKey := fmt.Sprintf("@user%d:localhost", 0)
|
||||
_, err = tab.InsertEventStateKeyNID(ctx, nil, stateKey)
|
||||
assert.Error(t, err)
|
||||
|
||||
stateKeyNIDsMap, err := tab.BulkSelectEventStateKeyNID(ctx, nil, []string{"@user0:localhost", "@user1:localhost"})
|
||||
assert.NoError(t, err)
|
||||
wantStateKeyNIDs := make([]types.EventStateKeyNID, 0, len(stateKeyNIDsMap))
|
||||
for _, nid := range stateKeyNIDsMap {
|
||||
wantStateKeyNIDs = append(wantStateKeyNIDs, nid)
|
||||
}
|
||||
stateKeyNIDs, err := tab.BulkSelectEventStateKey(ctx, nil, wantStateKeyNIDs)
|
||||
assert.NoError(t, err)
|
||||
// verify that BulkSelectEventStateKeyNID and BulkSelectEventStateKey return the same values
|
||||
for userID, nid := range stateKeyNIDsMap {
|
||||
if v, ok := stateKeyNIDs[nid]; ok {
|
||||
assert.Equal(t, v, userID)
|
||||
} else {
|
||||
t.Fatalf("unable to find %d in result set", nid)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
79
roomserver/storage/tables/event_types_table_test.go
Normal file
79
roomserver/storage/tables/event_types_table_test.go
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
package tables_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"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"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func mustCreateEventTypesTable(t *testing.T, dbType test.DBType) (tables.EventTypes, func()) {
|
||||
t.Helper()
|
||||
connStr, close := test.PrepareDBConnectionString(t, dbType)
|
||||
db, err := sqlutil.Open(&config.DatabaseOptions{
|
||||
ConnectionString: config.DataSource(connStr),
|
||||
}, sqlutil.NewExclusiveWriter())
|
||||
assert.NoError(t, err)
|
||||
var tab tables.EventTypes
|
||||
switch dbType {
|
||||
case test.DBTypePostgres:
|
||||
err = postgres.CreateEventTypesTable(db)
|
||||
assert.NoError(t, err)
|
||||
tab, err = postgres.PrepareEventTypesTable(db)
|
||||
case test.DBTypeSQLite:
|
||||
err = sqlite3.CreateEventTypesTable(db)
|
||||
assert.NoError(t, err)
|
||||
tab, err = sqlite3.PrepareEventTypesTable(db)
|
||||
}
|
||||
assert.NoError(t, err)
|
||||
|
||||
return tab, close
|
||||
}
|
||||
|
||||
func Test_EventTypesTable(t *testing.T) {
|
||||
test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
|
||||
tab, close := mustCreateEventTypesTable(t, dbType)
|
||||
defer close()
|
||||
ctx := context.Background()
|
||||
var eventTypeNID, gotEventTypeNID types.EventTypeNID
|
||||
var err error
|
||||
// create some dummy data
|
||||
eventTypeMap := make(map[string]types.EventTypeNID)
|
||||
for i := 0; i < 10; i++ {
|
||||
eventType := fmt.Sprintf("dummyEventType%d", i)
|
||||
eventTypeNID, err = tab.InsertEventTypeNID(ctx, nil, eventType)
|
||||
assert.NoError(t, err)
|
||||
eventTypeMap[eventType] = eventTypeNID
|
||||
gotEventTypeNID, err = tab.SelectEventTypeNID(ctx, nil, eventType)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, eventTypeNID, gotEventTypeNID)
|
||||
}
|
||||
// This should fail, since the dummyEventType0 already exists
|
||||
eventType := fmt.Sprintf("dummyEventType%d", 0)
|
||||
_, err = tab.InsertEventTypeNID(ctx, nil, eventType)
|
||||
assert.Error(t, err)
|
||||
|
||||
// This should return an error, as this eventType does not exist
|
||||
_, err = tab.SelectEventTypeNID(ctx, nil, "dummyEventType13")
|
||||
assert.Error(t, err)
|
||||
|
||||
eventTypeNIDs, err := tab.BulkSelectEventTypeNID(ctx, nil, []string{"dummyEventType0", "dummyEventType3"})
|
||||
assert.NoError(t, err)
|
||||
// verify that BulkSelectEventTypeNID and InsertEventTypeNID return the same values
|
||||
for eventType, nid := range eventTypeNIDs {
|
||||
if v, ok := eventTypeMap[eventType]; ok {
|
||||
assert.Equal(t, v, nid)
|
||||
} else {
|
||||
t.Fatalf("unable to find %d in result set", nid)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
157
roomserver/storage/tables/events_table_test.go
Normal file
157
roomserver/storage/tables/events_table_test.go
Normal file
|
|
@ -0,0 +1,157 @@
|
|||
package tables_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"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"
|
||||
"github.com/matrix-org/gomatrixserverlib"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func mustCreateEventsTable(t *testing.T, dbType test.DBType) (tables.Events, func()) {
|
||||
t.Helper()
|
||||
connStr, close := test.PrepareDBConnectionString(t, dbType)
|
||||
db, err := sqlutil.Open(&config.DatabaseOptions{
|
||||
ConnectionString: config.DataSource(connStr),
|
||||
}, sqlutil.NewExclusiveWriter())
|
||||
assert.NoError(t, err)
|
||||
var tab tables.Events
|
||||
switch dbType {
|
||||
case test.DBTypePostgres:
|
||||
err = postgres.CreateEventsTable(db)
|
||||
assert.NoError(t, err)
|
||||
tab, err = postgres.PrepareEventsTable(db)
|
||||
case test.DBTypeSQLite:
|
||||
err = sqlite3.CreateEventsTable(db)
|
||||
assert.NoError(t, err)
|
||||
tab, err = sqlite3.PrepareEventsTable(db)
|
||||
}
|
||||
assert.NoError(t, err)
|
||||
|
||||
return tab, close
|
||||
}
|
||||
|
||||
func Test_EventsTable(t *testing.T) {
|
||||
alice := test.NewUser()
|
||||
room := test.NewRoom(t, alice)
|
||||
ctx := context.Background()
|
||||
test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
|
||||
tab, close := mustCreateEventsTable(t, dbType)
|
||||
defer close()
|
||||
// create some dummy data
|
||||
eventIDs := make([]string, 0, len(room.Events()))
|
||||
wantStateAtEvent := make([]types.StateAtEvent, 0, len(room.Events()))
|
||||
wantEventReferences := make([]gomatrixserverlib.EventReference, 0, len(room.Events()))
|
||||
wantStateAtEventAndRefs := make([]types.StateAtEventAndReference, 0, len(room.Events()))
|
||||
for _, ev := range room.Events() {
|
||||
eventNID, snapNID, err := tab.InsertEvent(ctx, nil, 1, 1, 1, ev.EventID(), ev.EventReference().EventSHA256, nil, ev.Depth(), false)
|
||||
assert.NoError(t, err)
|
||||
gotEventNID, gotSnapNID, err := tab.SelectEvent(ctx, nil, ev.EventID())
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, eventNID, gotEventNID)
|
||||
assert.Equal(t, snapNID, gotSnapNID)
|
||||
eventID, err := tab.SelectEventID(ctx, nil, eventNID)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, eventID, ev.EventID())
|
||||
|
||||
// The events shouldn't be sent to output yet
|
||||
sentToOutput, err := tab.SelectEventSentToOutput(ctx, nil, gotEventNID)
|
||||
assert.NoError(t, err)
|
||||
assert.False(t, sentToOutput)
|
||||
|
||||
err = tab.UpdateEventSentToOutput(ctx, nil, gotEventNID)
|
||||
assert.NoError(t, err)
|
||||
|
||||
// Now they should be sent to output
|
||||
sentToOutput, err = tab.SelectEventSentToOutput(ctx, nil, gotEventNID)
|
||||
assert.NoError(t, err)
|
||||
assert.True(t, sentToOutput)
|
||||
|
||||
eventIDs = append(eventIDs, ev.EventID())
|
||||
wantEventReferences = append(wantEventReferences, ev.EventReference())
|
||||
|
||||
// Set the stateSnapshot to 2 for some events to verify they are returned later
|
||||
stateSnapshot := 0
|
||||
if eventNID < 3 {
|
||||
stateSnapshot = 2
|
||||
err = tab.UpdateEventState(ctx, nil, eventNID, 2)
|
||||
assert.NoError(t, err)
|
||||
}
|
||||
stateAtEvent := types.StateAtEvent{
|
||||
Overwrite: false,
|
||||
BeforeStateSnapshotNID: types.StateSnapshotNID(stateSnapshot),
|
||||
IsRejected: false,
|
||||
StateEntry: types.StateEntry{
|
||||
EventNID: eventNID,
|
||||
StateKeyTuple: types.StateKeyTuple{
|
||||
EventTypeNID: 1,
|
||||
EventStateKeyNID: 1,
|
||||
},
|
||||
},
|
||||
}
|
||||
wantStateAtEvent = append(wantStateAtEvent, stateAtEvent)
|
||||
wantStateAtEventAndRefs = append(wantStateAtEventAndRefs, types.StateAtEventAndReference{
|
||||
StateAtEvent: stateAtEvent,
|
||||
EventReference: ev.EventReference(),
|
||||
})
|
||||
}
|
||||
|
||||
stateEvents, err := tab.BulkSelectStateEventByID(ctx, nil, eventIDs)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, len(stateEvents), len(eventIDs))
|
||||
nids := make([]types.EventNID, 0, len(stateEvents))
|
||||
for _, ev := range stateEvents {
|
||||
nids = append(nids, ev.EventNID)
|
||||
}
|
||||
stateEvents2, err := tab.BulkSelectStateEventByNID(ctx, nil, nids, nil)
|
||||
assert.NoError(t, err)
|
||||
// somehow SQLite doesn't return the values ordered as requested by the query
|
||||
assert.ElementsMatch(t, stateEvents, stateEvents2)
|
||||
|
||||
roomNIDs, err := tab.SelectRoomNIDsForEventNIDs(ctx, nil, nids)
|
||||
assert.NoError(t, err)
|
||||
// We only inserted one room, so the RoomNID should be the same for all evendNIDs
|
||||
for _, roomNID := range roomNIDs {
|
||||
assert.Equal(t, types.RoomNID(1), roomNID)
|
||||
}
|
||||
|
||||
stateAtEvent, err := tab.BulkSelectStateAtEventByID(ctx, nil, eventIDs)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, len(eventIDs), len(stateAtEvent))
|
||||
|
||||
assert.ElementsMatch(t, wantStateAtEvent, stateAtEvent)
|
||||
|
||||
evendNIDMap, err := tab.BulkSelectEventID(ctx, nil, nids)
|
||||
assert.NoError(t, err)
|
||||
t.Logf("%+v", evendNIDMap)
|
||||
assert.Equal(t, len(evendNIDMap), len(nids))
|
||||
|
||||
nidMap, err := tab.BulkSelectEventNID(ctx, nil, eventIDs)
|
||||
assert.NoError(t, err)
|
||||
// check that we got all expected eventNIDs
|
||||
for _, eventID := range eventIDs {
|
||||
_, ok := nidMap[eventID]
|
||||
assert.True(t, ok)
|
||||
}
|
||||
|
||||
references, err := tab.BulkSelectEventReference(ctx, nil, nids)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, wantEventReferences, references)
|
||||
|
||||
stateAndRefs, err := tab.BulkSelectStateAtEventAndReference(ctx, nil, nids)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, wantStateAtEventAndRefs, stateAndRefs)
|
||||
|
||||
// check we get the expected event depth
|
||||
maxDepth, err := tab.SelectMaxEventDepth(ctx, nil, nids)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, int64(len(room.Events())+1), maxDepth)
|
||||
})
|
||||
}
|
||||
|
|
@ -10,9 +10,8 @@ import (
|
|||
)
|
||||
|
||||
type EventJSONPair struct {
|
||||
EventNID types.EventNID
|
||||
RoomVersion gomatrixserverlib.RoomVersion
|
||||
EventJSON []byte
|
||||
EventNID types.EventNID
|
||||
EventJSON []byte
|
||||
}
|
||||
|
||||
type EventJSON interface {
|
||||
|
|
@ -36,7 +35,8 @@ type EventStateKeys interface {
|
|||
|
||||
type Events interface {
|
||||
InsertEvent(
|
||||
ctx context.Context, txn *sql.Tx, i types.RoomNID, j types.EventTypeNID, k types.EventStateKeyNID, eventID string,
|
||||
ctx context.Context, txn *sql.Tx, roomNID types.RoomNID, eventTypeNID types.EventTypeNID,
|
||||
eventStateKeyNID types.EventStateKeyNID, eventID string,
|
||||
referenceSHA256 []byte, authEventNIDs []types.EventNID, depth int64, isRejected bool,
|
||||
) (types.EventNID, types.StateSnapshotNID, error)
|
||||
SelectEvent(ctx context.Context, txn *sql.Tx, eventID string) (types.EventNID, types.StateSnapshotNID, error)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue