mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 18:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove interface again, add comment about the closing Bleve

Browse source
This commit is contained in:
Till Faelligen 2023-03-17 11:47:36 +01:00
parent 368bba23cb
commit 96590e4b52
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
41 changed files with 48 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
federationapi/storage/postgres/storage.go
View file

@ -36,7 +36,7 @@ type Database struct {
} }
// NewDatabase opens a new database // NewDatabase opens a new database
func NewDatabase(ctx context.Context, conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions, cache caching.FederationCache, isLocalServerName func(gomatrixserverlib.ServerName) bool) (*Database, error) { func NewDatabase(ctx context.Context, conMan sqlutil.Connections, dbProperties *config.DatabaseOptions, cache caching.FederationCache, isLocalServerName func(gomatrixserverlib.ServerName) bool) (*Database, error) {
var d Database var d Database
var err error var err error
if d.db, d.writer, err = conMan.Connection(dbProperties); err != nil { if d.db, d.writer, err = conMan.Connection(dbProperties); err != nil {

2
federationapi/storage/sqlite3/storage.go
View file

@ -34,7 +34,7 @@ type Database struct {
} }
// NewDatabase opens a new database // NewDatabase opens a new database
func NewDatabase(ctx context.Context, conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions, cache caching.FederationCache, isLocalServerName func(gomatrixserverlib.ServerName) bool) (*Database, error) { func NewDatabase(ctx context.Context, conMan sqlutil.Connections, dbProperties *config.DatabaseOptions, cache caching.FederationCache, isLocalServerName func(gomatrixserverlib.ServerName) bool) (*Database, error) {
var d Database var d Database
var err error var err error
if d.db, d.writer, err = conMan.Connection(dbProperties); err != nil { if d.db, d.writer, err = conMan.Connection(dbProperties); err != nil {

2
federationapi/storage/storage.go
View file

@ -30,7 +30,7 @@ import (
) )
// NewDatabase opens a new database // NewDatabase opens a new database
func NewDatabase(ctx context.Context, conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions, cache caching.FederationCache, isLocalServerName func(gomatrixserverlib.ServerName) bool) (Database, error) { func NewDatabase(ctx context.Context, conMan sqlutil.Connections, dbProperties *config.DatabaseOptions, cache caching.FederationCache, isLocalServerName func(gomatrixserverlib.ServerName) bool) (Database, error) {
switch { switch {
case dbProperties.ConnectionString.IsSQLite(): case dbProperties.ConnectionString.IsSQLite():
return sqlite3.NewDatabase(ctx, conMan, dbProperties, cache, isLocalServerName) return sqlite3.NewDatabase(ctx, conMan, dbProperties, cache, isLocalServerName)

2
federationapi/storage/storage_test.go
View file

@ -21,7 +21,7 @@ func mustCreateFederationDatabase(t *testing.T, dbType test.DBType) (storage.Dat
connStr, dbClose := test.PrepareDBConnectionString(t, dbType) connStr, dbClose := test.PrepareDBConnectionString(t, dbType)
ctx := context.Background() ctx := context.Background()
cm := sqlutil.NewConnectionManager() cm := sqlutil.NewConnectionManager()
db, err := storage.NewDatabase(ctx, &cm, &config.DatabaseOptions{ db, err := storage.NewDatabase(ctx, cm, &config.DatabaseOptions{
ConnectionString: config.DataSource(connStr), ConnectionString: config.DataSource(connStr),
}, caches, func(server gomatrixserverlib.ServerName) bool { return server == "localhost" }) }, caches, func(server gomatrixserverlib.ServerName) bool { return server == "localhost" })
if err != nil { if err != nil {

2
federationapi/storage/storage_wasm.go
View file

@ -26,7 +26,7 @@ import (
) )
// NewDatabase opens a new database // NewDatabase opens a new database
func NewDatabase(ctx context.Context, conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions, cache caching.FederationCache, isLocalServerName func(gomatrixserverlib.ServerName) bool) (Database, error) { func NewDatabase(ctx context.Context, conMan sqlutil.Connections, dbProperties *config.DatabaseOptions, cache caching.FederationCache, isLocalServerName func(gomatrixserverlib.ServerName) bool) (Database, error) {
switch { switch {
case dbProperties.ConnectionString.IsSQLite(): case dbProperties.ConnectionString.IsSQLite():
return sqlite3.NewDatabase(ctx, conMan, dbProperties, cache, isLocalServerName) return sqlite3.NewDatabase(ctx, conMan, dbProperties, cache, isLocalServerName)

2
internal/fulltext/bleve.go
View file

@ -91,6 +91,8 @@ func New(ctx context.Context, cfg config.Fulltext) (fts *Search, err error) {
return nil, err return nil, err
} }
go func() { go func() {
// Wait for the context (should be from process.ProcessContext) to be
// done, indicating that Dendrite is shutting down.
<-ctx.Done() <-ctx.Done()
_ = fts.Close() _ = fts.Close()
}() }()

4
internal/sqlutil/connection_manager.go
View file

@ -21,10 +21,6 @@ import (
"github.com/matrix-org/dendrite/setup/config" "github.com/matrix-org/dendrite/setup/config"
) )
type ConnectionManager interface {
Connection(dbProperties *config.DatabaseOptions) (*sql.DB, Writer, error)
}
type Connections struct { type Connections struct {
db *sql.DB db *sql.DB
writer Writer writer Writer

2
mediaapi/routing/upload_test.go
View file

@ -51,7 +51,7 @@ func Test_uploadRequest_doUpload(t *testing.T) {
_ = os.Mkdir(testdataPath, os.ModePerm) _ = os.Mkdir(testdataPath, os.ModePerm)
defer fileutils.RemoveDir(types.Path(testdataPath), nil) defer fileutils.RemoveDir(types.Path(testdataPath), nil)
cm := sqlutil.NewConnectionManager() cm := sqlutil.NewConnectionManager()
db, err := storage.NewMediaAPIDatasource(&cm, &config.DatabaseOptions{ db, err := storage.NewMediaAPIDatasource(cm, &config.DatabaseOptions{
ConnectionString: "file::memory:?cache=shared", ConnectionString: "file::memory:?cache=shared",
MaxOpenConnections: 100, MaxOpenConnections: 100,
MaxIdleConnections: 2, MaxIdleConnections: 2,

2
mediaapi/storage/postgres/mediaapi.go
View file

@ -24,7 +24,7 @@ import (
) )
// NewDatabase opens a postgres database. // NewDatabase opens a postgres database.
func NewDatabase(conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions) (*shared.Database, error) { func NewDatabase(conMan sqlutil.Connections, dbProperties *config.DatabaseOptions) (*shared.Database, error) {
db, writer, err := conMan.Connection(dbProperties) db, writer, err := conMan.Connection(dbProperties)
if err != nil { if err != nil {
return nil, err return nil, err

2
mediaapi/storage/sqlite3/mediaapi.go
View file

@ -23,7 +23,7 @@ import (
) )
// NewDatabase opens a SQLIte database. // NewDatabase opens a SQLIte database.
func NewDatabase(conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions) (*shared.Database, error) { func NewDatabase(conMan sqlutil.Connections, dbProperties *config.DatabaseOptions) (*shared.Database, error) {
db, writer, err := conMan.Connection(dbProperties) db, writer, err := conMan.Connection(dbProperties)
if err != nil { if err != nil {
return nil, err return nil, err

2
mediaapi/storage/storage.go
View file

@ -27,7 +27,7 @@ import (
) )
// NewMediaAPIDatasource opens a database connection. // NewMediaAPIDatasource opens a database connection.
func NewMediaAPIDatasource(conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions) (Database, error) { func NewMediaAPIDatasource(conMan sqlutil.Connections, dbProperties *config.DatabaseOptions) (Database, error) {
switch { switch {
case dbProperties.ConnectionString.IsSQLite(): case dbProperties.ConnectionString.IsSQLite():
return sqlite3.NewDatabase(conMan, dbProperties) return sqlite3.NewDatabase(conMan, dbProperties)

2
mediaapi/storage/storage_test.go
View file

@ -15,7 +15,7 @@ import (
func mustCreateDatabase(t *testing.T, dbType test.DBType) (storage.Database, func()) { func mustCreateDatabase(t *testing.T, dbType test.DBType) (storage.Database, func()) {
connStr, close := test.PrepareDBConnectionString(t, dbType) connStr, close := test.PrepareDBConnectionString(t, dbType)
cm := sqlutil.NewConnectionManager() cm := sqlutil.NewConnectionManager()
db, err := storage.NewMediaAPIDatasource(&cm, &config.DatabaseOptions{ db, err := storage.NewMediaAPIDatasource(cm, &config.DatabaseOptions{
ConnectionString: config.DataSource(connStr), ConnectionString: config.DataSource(connStr),
}) })
if err != nil { if err != nil {

2
mediaapi/storage/storage_wasm.go
View file

@ -23,7 +23,7 @@ import (
) )
// Open opens a postgres database. // Open opens a postgres database.
func NewMediaAPIDatasource(conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions) (Database, error) { func NewMediaAPIDatasource(conMan sqlutil.Connections, dbProperties *config.DatabaseOptions) (Database, error) {
switch { switch {
case dbProperties.ConnectionString.IsSQLite(): case dbProperties.ConnectionString.IsSQLite():
return sqlite3.NewDatabase(conMan, dbProperties) return sqlite3.NewDatabase(conMan, dbProperties)

2
relayapi/storage/postgres/storage.go
View file

@ -33,7 +33,7 @@ type Database struct {
// NewDatabase opens a new database // NewDatabase opens a new database
func NewDatabase( func NewDatabase(
conMan sqlutil.ConnectionManager, conMan sqlutil.Connections,
dbProperties *config.DatabaseOptions, dbProperties *config.DatabaseOptions,
cache caching.FederationCache, cache caching.FederationCache,
isLocalServerName func(gomatrixserverlib.ServerName) bool, isLocalServerName func(gomatrixserverlib.ServerName) bool,

2
relayapi/storage/sqlite3/storage.go
View file

@ -33,7 +33,7 @@ type Database struct {
// NewDatabase opens a new database // NewDatabase opens a new database
func NewDatabase( func NewDatabase(
conMan sqlutil.ConnectionManager, conMan sqlutil.Connections,
dbProperties *config.DatabaseOptions, dbProperties *config.DatabaseOptions,
cache caching.FederationCache, cache caching.FederationCache,
isLocalServerName func(gomatrixserverlib.ServerName) bool, isLocalServerName func(gomatrixserverlib.ServerName) bool,

2
relayapi/storage/storage.go
View file

@ -30,7 +30,7 @@ import (
// NewDatabase opens a new database // NewDatabase opens a new database
func NewDatabase( func NewDatabase(
conMan sqlutil.ConnectionManager, conMan sqlutil.Connections,
dbProperties *config.DatabaseOptions, dbProperties *config.DatabaseOptions,
cache caching.FederationCache, cache caching.FederationCache,
isLocalServerName func(gomatrixserverlib.ServerName) bool, isLocalServerName func(gomatrixserverlib.ServerName) bool,

2
relayapi/storage/storage_wasm.go
View file

@ -26,7 +26,7 @@ import (
// NewDatabase opens a new database // NewDatabase opens a new database
func NewDatabase( func NewDatabase(
conMan sqlutil.ConnectionManager, conMan sqlutil.Connections,
dbProperties *config.DatabaseOptions, dbProperties *config.DatabaseOptions,
cache caching.FederationCache, cache caching.FederationCache,
isLocalServerName func(gomatrixserverlib.ServerName) bool, isLocalServerName func(gomatrixserverlib.ServerName) bool,

2
roomserver/internal/helpers/helpers_test.go
View file

@ -20,7 +20,7 @@ func mustCreateDatabase(t *testing.T, dbType test.DBType) (storage.Database, fun
conStr, close := test.PrepareDBConnectionString(t, dbType) conStr, close := test.PrepareDBConnectionString(t, dbType)
caches := caching.NewRistrettoCache(8*1024*1024, time.Hour, caching.DisableMetrics) caches := caching.NewRistrettoCache(8*1024*1024, time.Hour, caching.DisableMetrics)
cm := sqlutil.NewConnectionManager() cm := sqlutil.NewConnectionManager()
db, err := storage.Open(context.Background(), &cm, &config.DatabaseOptions{ConnectionString: config.DataSource(conStr)}, caches) db, err := storage.Open(context.Background(), cm, &config.DatabaseOptions{ConnectionString: config.DataSource(conStr)}, caches)
if err != nil { if err != nil {
t.Fatalf("failed to create Database: %v", err) t.Fatalf("failed to create Database: %v", err)
} }

2
roomserver/internal/input/input_test.go
View file

@ -51,7 +51,7 @@ func TestSingleTransactionOnInput(t *testing.T) {
} }
cm := sqlutil.NewConnectionManager() cm := sqlutil.NewConnectionManager()
db, err := storage.Open( db, err := storage.Open(
context.Background(), &cm, context.Background(), cm,
&config.DatabaseOptions{ &config.DatabaseOptions{
ConnectionString: "", ConnectionString: "",
MaxOpenConnections: 1, MaxOpenConnections: 1,

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

@ -37,7 +37,7 @@ type Database struct {
} }
// Open a postgres database. // Open a postgres database.
func Open(ctx context.Context, conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions, cache caching.RoomServerCaches) (*Database, error) { func Open(ctx context.Context, conMan sqlutil.Connections, dbProperties *config.DatabaseOptions, cache caching.RoomServerCaches) (*Database, error) {
var d Database var d Database
var err error var err error
db, writer, err := conMan.Connection(dbProperties) db, writer, err := conMan.Connection(dbProperties)

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

@ -37,7 +37,7 @@ type Database struct {
} }
// Open a sqlite database. // Open a sqlite database.
func Open(ctx context.Context, conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions, cache caching.RoomServerCaches) (*Database, error) { func Open(ctx context.Context, conMan sqlutil.Connections, dbProperties *config.DatabaseOptions, cache caching.RoomServerCaches) (*Database, error) {
var d Database var d Database
var err error var err error
db, writer, err := conMan.Connection(dbProperties) db, writer, err := conMan.Connection(dbProperties)

2
roomserver/storage/storage.go
View file

@ -29,7 +29,7 @@ import (
) )
// Open opens a database connection. // Open opens a database connection.
func Open(ctx context.Context, conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions, cache caching.RoomServerCaches) (Database, error) { func Open(ctx context.Context, conMan sqlutil.Connections, dbProperties *config.DatabaseOptions, cache caching.RoomServerCaches) (Database, error) {
switch { switch {
case dbProperties.ConnectionString.IsSQLite(): case dbProperties.ConnectionString.IsSQLite():
return sqlite3.Open(ctx, conMan, dbProperties, cache) return sqlite3.Open(ctx, conMan, dbProperties, cache)

2
roomserver/storage/storage_wasm.go
View file

@ -25,7 +25,7 @@ import (
) )
// NewPublicRoomsServerDatabase opens a database connection. // NewPublicRoomsServerDatabase opens a database connection.
func Open(ctx context.Context, conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions, cache caching.RoomServerCaches) (Database, error) { func Open(ctx context.Context, conMan sqlutil.Connections, dbProperties *config.DatabaseOptions, cache caching.RoomServerCaches) (Database, error) {
switch { switch {
case dbProperties.ConnectionString.IsSQLite(): case dbProperties.ConnectionString.IsSQLite():
return sqlite3.Open(ctx, conMan, dbProperties, cache) return sqlite3.Open(ctx, conMan, dbProperties, cache)

4
setup/base/base.go
View file

@ -68,7 +68,7 @@ type BaseDendrite struct {
NATS *jetstream.NATSInstance NATS *jetstream.NATSInstance
Cfg *config.Dendrite Cfg *config.Dendrite
DNSCache *gomatrixserverlib.DNSCache DNSCache *gomatrixserverlib.DNSCache
ConnectionManager sqlutil.ConnectionManager ConnectionManager sqlutil.Connections
EnableMetrics bool EnableMetrics bool
startupLock sync.Mutex startupLock sync.Mutex
} }
@ -178,7 +178,7 @@ func NewBaseDendrite(cfg *config.Dendrite, options ...BaseDendriteOptions) *Base
DNSCache: dnsCache, DNSCache: dnsCache,
Routers: httputil.NewRouters(), Routers: httputil.NewRouters(),
NATS: &jetstream.NATSInstance{}, NATS: &jetstream.NATSInstance{},
ConnectionManager: &cm, ConnectionManager: cm,
EnableMetrics: enableMetrics, EnableMetrics: enableMetrics,
} }
} }

2
setup/mscs/msc2836/msc2836_test.go
View file

@ -559,7 +559,7 @@ func injectEvents(t *testing.T, userAPI userapi.UserInternalAPI, rsAPI roomserve
base := &base.BaseDendrite{ base := &base.BaseDendrite{
Cfg: cfg, Cfg: cfg,
Routers: httputil.NewRouters(), Routers: httputil.NewRouters(),
ConnectionManager: &cm, ConnectionManager: cm,
} }
err := msc2836.Enable(base, rsAPI, nil, userAPI, nil) err := msc2836.Enable(base, rsAPI, nil, userAPI, nil)

6
setup/mscs/msc2836/storage.go
View file

@ -58,14 +58,14 @@ type DB struct {
} }
// NewDatabase loads the database for msc2836 // NewDatabase loads the database for msc2836
func NewDatabase(conMan sqlutil.ConnectionManager, dbOpts *config.DatabaseOptions) (Database, error) { func NewDatabase(conMan sqlutil.Connections, dbOpts *config.DatabaseOptions) (Database, error) {
if dbOpts.ConnectionString.IsPostgres() { if dbOpts.ConnectionString.IsPostgres() {
return newPostgresDatabase(conMan, dbOpts) return newPostgresDatabase(conMan, dbOpts)
} }
return newSQLiteDatabase(conMan, dbOpts) return newSQLiteDatabase(conMan, dbOpts)
} }
func newPostgresDatabase(conMan sqlutil.ConnectionManager, dbOpts *config.DatabaseOptions) (Database, error) { func newPostgresDatabase(conMan sqlutil.Connections, dbOpts *config.DatabaseOptions) (Database, error) {
d := DB{} d := DB{}
var err error var err error
if d.db, d.writer, err = conMan.Connection(dbOpts); err != nil { if d.db, d.writer, err = conMan.Connection(dbOpts); err != nil {
@ -143,7 +143,7 @@ func newPostgresDatabase(conMan sqlutil.ConnectionManager, dbOpts *config.Databa
return &d, err return &d, err
} }
func newSQLiteDatabase(conMan sqlutil.ConnectionManager, dbOpts *config.DatabaseOptions) (Database, error) { func newSQLiteDatabase(conMan sqlutil.Connections, dbOpts *config.DatabaseOptions) (Database, error) {
d := DB{} d := DB{}
var err error var err error
if d.db, d.writer, err = conMan.Connection(dbOpts); err != nil { if d.db, d.writer, err = conMan.Connection(dbOpts); err != nil {

2
syncapi/storage/postgres/syncserver.go
View file

@ -36,7 +36,7 @@ type SyncServerDatasource struct {
} }
// NewDatabase creates a new sync server database // NewDatabase creates a new sync server database
func NewDatabase(ctx context.Context, cm sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions) (*SyncServerDatasource, error) { func NewDatabase(ctx context.Context, cm sqlutil.Connections, dbProperties *config.DatabaseOptions) (*SyncServerDatasource, error) {
var d SyncServerDatasource var d SyncServerDatasource
var err error var err error
if d.db, d.writer, err = cm.Connection(dbProperties); err != nil { if d.db, d.writer, err = cm.Connection(dbProperties); err != nil {

2
syncapi/storage/sqlite3/syncserver.go
View file

@ -36,7 +36,7 @@ type SyncServerDatasource struct {
// NewDatabase creates a new sync server database // NewDatabase creates a new sync server database
// nolint: gocyclo // nolint: gocyclo
func NewDatabase(ctx context.Context, conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions) (*SyncServerDatasource, error) { func NewDatabase(ctx context.Context, conMan sqlutil.Connections, dbProperties *config.DatabaseOptions) (*SyncServerDatasource, error) {
var d SyncServerDatasource var d SyncServerDatasource
var err error var err error

2
syncapi/storage/storage.go
View file

@ -28,7 +28,7 @@ import (
) )
// NewSyncServerDatasource opens a database connection. // NewSyncServerDatasource opens a database connection.
func NewSyncServerDatasource(ctx context.Context, conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions) (Database, error) { func NewSyncServerDatasource(ctx context.Context, conMan sqlutil.Connections, dbProperties *config.DatabaseOptions) (Database, error) {
switch { switch {
case dbProperties.ConnectionString.IsSQLite(): case dbProperties.ConnectionString.IsSQLite():
return sqlite3.NewDatabase(ctx, conMan, dbProperties) return sqlite3.NewDatabase(ctx, conMan, dbProperties)

2
syncapi/storage/storage_test.go
View file

@ -23,7 +23,7 @@ var ctx = context.Background()
func MustCreateDatabase(t *testing.T, dbType test.DBType) (storage.Database, func()) { func MustCreateDatabase(t *testing.T, dbType test.DBType) (storage.Database, func()) {
connStr, close := test.PrepareDBConnectionString(t, dbType) connStr, close := test.PrepareDBConnectionString(t, dbType)
cm := sqlutil.NewConnectionManager() cm := sqlutil.NewConnectionManager()
db, err := storage.NewSyncServerDatasource(context.Background(), &cm, &config.DatabaseOptions{ db, err := storage.NewSyncServerDatasource(context.Background(), cm, &config.DatabaseOptions{
ConnectionString: config.DataSource(connStr), ConnectionString: config.DataSource(connStr),
}) })
if err != nil { if err != nil {

2
syncapi/storage/storage_wasm.go
View file

@ -24,7 +24,7 @@ import (
) )
// NewPublicRoomsServerDatabase opens a database connection. // NewPublicRoomsServerDatabase opens a database connection.
func NewSyncServerDatasource(ctx context.Context, conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions) (Database, error) { func NewSyncServerDatasource(ctx context.Context, conMan sqlutil.Connections, dbProperties *config.DatabaseOptions) (Database, error) {
switch { switch {
case dbProperties.ConnectionString.IsSQLite(): case dbProperties.ConnectionString.IsSQLite():
return sqlite3.NewDatabase(ctx, conMan, dbProperties) return sqlite3.NewDatabase(ctx, conMan, dbProperties)

2
userapi/consumers/roomserver_test.go
View file

@ -22,7 +22,7 @@ func mustCreateDatabase(t *testing.T, dbType test.DBType) (storage.UserDatabase,
t.Helper() t.Helper()
connStr, close := test.PrepareDBConnectionString(t, dbType) connStr, close := test.PrepareDBConnectionString(t, dbType)
cm := sqlutil.NewConnectionManager() cm := sqlutil.NewConnectionManager()
db, err := storage.NewUserDatabase(context.Background(), &cm, &config.DatabaseOptions{ db, err := storage.NewUserDatabase(context.Background(), cm, &config.DatabaseOptions{
ConnectionString: config.DataSource(connStr), ConnectionString: config.DataSource(connStr),
}, "", 4, 0, 0, "") }, "", 4, 0, 0, "")
if err != nil { if err != nil {

2
userapi/internal/device_list_update_test.go
View file

@ -365,7 +365,7 @@ func mustCreateKeyserverDB(t *testing.T, dbType test.DBType) (storage.KeyDatabas
connStr, clearDB := test.PrepareDBConnectionString(t, dbType) connStr, clearDB := test.PrepareDBConnectionString(t, dbType)
cm := sqlutil.NewConnectionManager() cm := sqlutil.NewConnectionManager()
db, err := storage.NewKeyDatabase(&cm, &config.DatabaseOptions{ConnectionString: config.DataSource(connStr)}) db, err := storage.NewKeyDatabase(cm, &config.DatabaseOptions{ConnectionString: config.DataSource(connStr)})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

2
userapi/internal/key_api_test.go
View file

@ -17,7 +17,7 @@ func mustCreateDatabase(t *testing.T, dbType test.DBType) (storage.KeyDatabase,
t.Helper() t.Helper()
connStr, close := test.PrepareDBConnectionString(t, dbType) connStr, close := test.PrepareDBConnectionString(t, dbType)
cm := sqlutil.NewConnectionManager() cm := sqlutil.NewConnectionManager()
db, err := storage.NewKeyDatabase(&cm, &config.DatabaseOptions{ db, err := storage.NewKeyDatabase(cm, &config.DatabaseOptions{
ConnectionString: config.DataSource(connStr), ConnectionString: config.DataSource(connStr),
}) })
if err != nil { if err != nil {

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

@ -32,7 +32,7 @@ import (
) )
// NewDatabase creates a new accounts and profiles database // NewDatabase creates a new accounts and profiles database
func NewDatabase(ctx context.Context, conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions, serverName gomatrixserverlib.ServerName, bcryptCost int, openIDTokenLifetimeMS int64, loginTokenLifetime time.Duration, serverNoticesLocalpart string) (*shared.Database, error) { func NewDatabase(ctx context.Context, conMan sqlutil.Connections, dbProperties *config.DatabaseOptions, serverName gomatrixserverlib.ServerName, bcryptCost int, openIDTokenLifetimeMS int64, loginTokenLifetime time.Duration, serverNoticesLocalpart string) (*shared.Database, error) {
db, writer, err := conMan.Connection(dbProperties) db, writer, err := conMan.Connection(dbProperties)
if err != nil { if err != nil {
return nil, err return nil, err
@ -136,7 +136,7 @@ func NewDatabase(ctx context.Context, conMan sqlutil.ConnectionManager, dbProper
}, nil }, nil
} }
func NewKeyDatabase(conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions) (*shared.KeyDatabase, error) { func NewKeyDatabase(conMan sqlutil.Connections, dbProperties *config.DatabaseOptions) (*shared.KeyDatabase, error) {
db, writer, err := conMan.Connection(dbProperties) db, writer, err := conMan.Connection(dbProperties)
if err != nil { if err != nil {
return nil, err return nil, err

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

@ -30,7 +30,7 @@ import (
) )
// NewUserDatabase creates a new accounts and profiles database // NewUserDatabase creates a new accounts and profiles database
func NewUserDatabase(ctx context.Context, conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions, serverName gomatrixserverlib.ServerName, bcryptCost int, openIDTokenLifetimeMS int64, loginTokenLifetime time.Duration, serverNoticesLocalpart string) (*shared.Database, error) { func NewUserDatabase(ctx context.Context, conMan sqlutil.Connections, dbProperties *config.DatabaseOptions, serverName gomatrixserverlib.ServerName, bcryptCost int, openIDTokenLifetimeMS int64, loginTokenLifetime time.Duration, serverNoticesLocalpart string) (*shared.Database, error) {
db, writer, err := conMan.Connection(dbProperties) db, writer, err := conMan.Connection(dbProperties)
if err != nil { if err != nil {
return nil, err return nil, err
@ -134,7 +134,7 @@ func NewUserDatabase(ctx context.Context, conMan sqlutil.ConnectionManager, dbPr
}, nil }, nil
} }
func NewKeyDatabase(conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions) (*shared.KeyDatabase, error) { func NewKeyDatabase(conMan sqlutil.Connections, dbProperties *config.DatabaseOptions) (*shared.KeyDatabase, error) {
db, writer, err := conMan.Connection(dbProperties) db, writer, err := conMan.Connection(dbProperties)
if err != nil { if err != nil {
return nil, err return nil, err

4
userapi/storage/storage.go
View file

@ -34,7 +34,7 @@ import (
// and sets postgres connection parameters // and sets postgres connection parameters
func NewUserDatabase( func NewUserDatabase(
ctx context.Context, ctx context.Context,
conMan sqlutil.ConnectionManager, conMan sqlutil.Connections,
dbProperties *config.DatabaseOptions, dbProperties *config.DatabaseOptions,
serverName gomatrixserverlib.ServerName, serverName gomatrixserverlib.ServerName,
bcryptCost int, bcryptCost int,
@ -54,7 +54,7 @@ func NewUserDatabase(
// NewKeyDatabase opens a new Postgres or Sqlite database (base on dataSourceName) scheme) // NewKeyDatabase opens a new Postgres or Sqlite database (base on dataSourceName) scheme)
// and sets postgres connection parameters. // and sets postgres connection parameters.
func NewKeyDatabase(conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions) (KeyDatabase, error) { func NewKeyDatabase(conMan sqlutil.Connections, dbProperties *config.DatabaseOptions) (KeyDatabase, error) {
switch { switch {
case dbProperties.ConnectionString.IsSQLite(): case dbProperties.ConnectionString.IsSQLite():
return sqlite3.NewKeyDatabase(conMan, dbProperties) return sqlite3.NewKeyDatabase(conMan, dbProperties)

2
userapi/storage/storage_test.go
View file

@ -36,7 +36,7 @@ var (
func mustCreateUserDatabase(t *testing.T, dbType test.DBType) (storage.UserDatabase, func()) { func mustCreateUserDatabase(t *testing.T, dbType test.DBType) (storage.UserDatabase, func()) {
connStr, close := test.PrepareDBConnectionString(t, dbType) connStr, close := test.PrepareDBConnectionString(t, dbType)
cm := sqlutil.NewConnectionManager() cm := sqlutil.NewConnectionManager()
db, err := storage.NewUserDatabase(context.Background(), &cm, &config.DatabaseOptions{ db, err := storage.NewUserDatabase(context.Background(), cm, &config.DatabaseOptions{
ConnectionString: config.DataSource(connStr), ConnectionString: config.DataSource(connStr),
}, "localhost", bcrypt.MinCost, openIDLifetimeMS, loginTokenLifetime, "_server") }, "localhost", bcrypt.MinCost, openIDLifetimeMS, loginTokenLifetime, "_server")
if err != nil { if err != nil {

4
userapi/storage/storage_wasm.go
View file

@ -27,7 +27,7 @@ import (
func NewUserDatabase( func NewUserDatabase(
ctx context.Context, ctx context.Context,
conMan sqlutil.ConnectionManager, conMan sqlutil.Connections,
dbProperties *config.DatabaseOptions, dbProperties *config.DatabaseOptions,
serverName gomatrixserverlib.ServerName, serverName gomatrixserverlib.ServerName,
bcryptCost int, bcryptCost int,
@ -47,7 +47,7 @@ func NewUserDatabase(
// NewKeyDatabase opens a new Postgres or Sqlite database (base on dataSourceName) scheme) // NewKeyDatabase opens a new Postgres or Sqlite database (base on dataSourceName) scheme)
// and sets postgres connection parameters. // and sets postgres connection parameters.
func NewKeyDatabase(conMan sqlutil.ConnectionManager, dbProperties *config.DatabaseOptions) (KeyDatabase, error) { func NewKeyDatabase(conMan sqlutil.Connections, dbProperties *config.DatabaseOptions) (KeyDatabase, error) {
switch { switch {
case dbProperties.ConnectionString.IsSQLite(): case dbProperties.ConnectionString.IsSQLite():
return sqlite3.NewKeyDatabase(conMan, dbProperties) return sqlite3.NewKeyDatabase(conMan, dbProperties)

2
userapi/userapi_test.go
View file

@ -76,7 +76,7 @@ func MustMakeInternalAPI(t *testing.T, opts apiTestOpts, dbType test.DBType, pub
} }
cm := sqlutil.NewConnectionManager() cm := sqlutil.NewConnectionManager()
ctx := context.Background() ctx := context.Background()
accountDB, err := storage.NewUserDatabase(ctx, &cm, &config.DatabaseOptions{ accountDB, err := storage.NewUserDatabase(ctx, cm, &config.DatabaseOptions{
ConnectionString: config.DataSource(connStr), ConnectionString: config.DataSource(connStr),
}, sName, bcrypt.MinCost, config.DefaultOpenIDTokenLifetimeMS, opts.loginTokenLifetime, "") }, sName, bcrypt.MinCost, config.DefaultOpenIDTokenLifetimeMS, opts.loginTokenLifetime, "")
if err != nil { if err != nil {

2
userapi/util/notify_test.go
View file

@ -78,7 +78,7 @@ func TestNotifyUserCountsAsync(t *testing.T) {
connStr, close := test.PrepareDBConnectionString(t, dbType) connStr, close := test.PrepareDBConnectionString(t, dbType)
defer close() defer close()
cm := sqlutil.NewConnectionManager() cm := sqlutil.NewConnectionManager()
db, err := storage.NewUserDatabase(ctx, &cm, &config.DatabaseOptions{ db, err := storage.NewUserDatabase(ctx, cm, &config.DatabaseOptions{
ConnectionString: config.DataSource(connStr), ConnectionString: config.DataSource(connStr),
}, "test", bcrypt.MinCost, 0, 0, "") }, "test", bcrypt.MinCost, 0, 0, "")
if err != nil { if err != nil {