mirror of
https://github.com/matrix-org/dendrite.git
synced 2024-11-22 14:21:55 -06:00
9897959731
As stated in https://github.com/matrix-org/dendrite/issues/3358 the search response contains both original and edited message. This PR fixes it by removing of the original message from the fulltext index after indexing the edit message event. I also made some cosmetic changes/fixes i found in the code Signed-off-by: `Alexander Dubovikov <d.lexand@gmail.com>`
101 lines
3.8 KiB
Go
101 lines
3.8 KiB
Go
// Copyright 2022 The Matrix.org Foundation C.I.C.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package testrig
|
|
|
|
import (
|
|
"fmt"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/matrix-org/dendrite/setup/config"
|
|
"github.com/matrix-org/dendrite/setup/process"
|
|
"github.com/matrix-org/dendrite/test"
|
|
)
|
|
|
|
func CreateConfig(t *testing.T, dbType test.DBType) (*config.Dendrite, *process.ProcessContext, func()) {
|
|
var cfg config.Dendrite
|
|
cfg.Defaults(config.DefaultOpts{
|
|
Generate: false,
|
|
SingleDatabase: true,
|
|
})
|
|
cfg.Global.JetStream.InMemory = true
|
|
cfg.FederationAPI.KeyPerspectives = nil
|
|
ctx := process.NewProcessContext()
|
|
switch dbType {
|
|
case test.DBTypePostgres:
|
|
cfg.Global.Defaults(config.DefaultOpts{ // autogen a signing key
|
|
Generate: true,
|
|
SingleDatabase: true,
|
|
})
|
|
cfg.MediaAPI.Defaults(config.DefaultOpts{ // autogen a media path
|
|
Generate: true,
|
|
SingleDatabase: true,
|
|
})
|
|
cfg.SyncAPI.Fulltext.Defaults(config.DefaultOpts{ // use in memory fts
|
|
Generate: true,
|
|
SingleDatabase: true,
|
|
})
|
|
cfg.Global.ServerName = "test"
|
|
// use a distinct prefix else concurrent postgres/sqlite runs will clash since NATS will use
|
|
// the file system event with InMemory=true :(
|
|
cfg.Global.JetStream.TopicPrefix = fmt.Sprintf("Test_%d_", dbType)
|
|
cfg.SyncAPI.Fulltext.InMemory = true
|
|
|
|
connStr, closeDb := test.PrepareDBConnectionString(t, dbType)
|
|
cfg.Global.DatabaseOptions = config.DatabaseOptions{
|
|
ConnectionString: config.DataSource(connStr),
|
|
MaxOpenConnections: 10,
|
|
MaxIdleConnections: 2,
|
|
ConnMaxLifetimeSeconds: 60,
|
|
}
|
|
return &cfg, ctx, func() {
|
|
ctx.ShutdownDendrite()
|
|
ctx.WaitForShutdown()
|
|
closeDb()
|
|
}
|
|
case test.DBTypeSQLite:
|
|
cfg.Defaults(config.DefaultOpts{
|
|
Generate: true,
|
|
SingleDatabase: false,
|
|
})
|
|
cfg.Global.ServerName = "test"
|
|
cfg.SyncAPI.Fulltext.Enabled = true
|
|
cfg.SyncAPI.Fulltext.InMemory = true
|
|
// use a distinct prefix else concurrent postgres/sqlite runs will clash since NATS will use
|
|
// the file system event with InMemory=true :(
|
|
cfg.Global.JetStream.TopicPrefix = fmt.Sprintf("Test_%d_", dbType)
|
|
|
|
// Use a temp dir provided by go for tests, this will be cleanup by a call to t.CleanUp()
|
|
tempDir := t.TempDir()
|
|
cfg.FederationAPI.Database.ConnectionString = config.DataSource(filepath.Join("file://", tempDir, "federationapi.db"))
|
|
cfg.KeyServer.Database.ConnectionString = config.DataSource(filepath.Join("file://", tempDir, "keyserver.db"))
|
|
cfg.MSCs.Database.ConnectionString = config.DataSource(filepath.Join("file://", tempDir, "mscs.db"))
|
|
cfg.MediaAPI.Database.ConnectionString = config.DataSource(filepath.Join("file://", tempDir, "mediaapi.db"))
|
|
cfg.RoomServer.Database.ConnectionString = config.DataSource(filepath.Join("file://", tempDir, "roomserver.db"))
|
|
cfg.SyncAPI.Database.ConnectionString = config.DataSource(filepath.Join("file://", tempDir, "syncapi.db"))
|
|
cfg.UserAPI.AccountDatabase.ConnectionString = config.DataSource(filepath.Join("file://", tempDir, "userapi.db"))
|
|
cfg.RelayAPI.Database.ConnectionString = config.DataSource(filepath.Join("file://", tempDir, "relayapi.db"))
|
|
|
|
return &cfg, ctx, func() {
|
|
ctx.ShutdownDendrite()
|
|
ctx.WaitForShutdown()
|
|
t.Cleanup(func() {}) // removes t.TempDir, where all database files are created
|
|
}
|
|
default:
|
|
t.Fatalf("unknown db type: %v", dbType)
|
|
}
|
|
return &config.Dendrite{}, nil, func() {}
|
|
}
|