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

Refactor TransactionWriter in media API

Browse source
This commit is contained in:
Neil Alexander 2020-08-20 17:32:32 +01:00
parent 7f89298615
commit 9f3e7384fa
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
4 changed files with 33 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mediaapi/storage/sqlite3/media_repository_table.go
View file

@ -67,9 +67,9 @@ type mediaStatements struct {
selectMediaStmt *sql.Stmt selectMediaStmt *sql.Stmt
} }
func (s *mediaStatements) prepare(db *sql.DB) (err error) { func (s *mediaStatements) prepare(db *sql.DB, writer sqlutil.TransactionWriter) (err error) {
s.db = db s.db = db
s.writer = sqlutil.NewTransactionWriter() s.writer = writer
_, err = db.Exec(mediaSchema) _, err = db.Exec(mediaSchema)
if err != nil { if err != nil {

8
mediaapi/storage/sqlite3/sql.go
View file

@ -17,6 +17,8 @@ package sqlite3
import ( import (
"database/sql" "database/sql"
"github.com/matrix-org/dendrite/internal/sqlutil"
) )
type statements struct { type statements struct {
@ -24,11 +26,11 @@ type statements struct {
thumbnail thumbnailStatements thumbnail thumbnailStatements
} }
func (s *statements) prepare(db *sql.DB) (err error) { func (s *statements) prepare(db *sql.DB, writer sqlutil.TransactionWriter) (err error) {
if err = s.media.prepare(db); err != nil { if err = s.media.prepare(db, writer); err != nil {
return return
} }
if err = s.thumbnail.prepare(db); err != nil { if err = s.thumbnail.prepare(db, writer); err != nil {
return return
} }

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

@ -31,16 +31,19 @@ import (
type Database struct { type Database struct {
statements statements statements statements
db *sql.DB db *sql.DB
writer sqlutil.TransactionWriter
} }
// Open opens a postgres database. // Open opens a postgres database.
func Open(dbProperties *config.DatabaseOptions) (*Database, error) { func Open(dbProperties *config.DatabaseOptions) (*Database, error) {
var d Database d := Database{
writer: sqlutil.NewTransactionWriter(),
}
var err error var err error
if d.db, err = sqlutil.Open(dbProperties); err != nil { if d.db, err = sqlutil.Open(dbProperties); err != nil {
return nil, err return nil, err
} }
if err = d.statements.prepare(d.db); err != nil { if err = d.statements.prepare(d.db, d.writer); err != nil {
return nil, err return nil, err
} }
return &d, nil return &d, nil

34
mediaapi/storage/sqlite3/thumbnail_table.go
View file

@ -21,6 +21,7 @@ import (
"time" "time"
"github.com/matrix-org/dendrite/internal" "github.com/matrix-org/dendrite/internal"
"github.com/matrix-org/dendrite/internal/sqlutil"
"github.com/matrix-org/dendrite/mediaapi/types" "github.com/matrix-org/dendrite/mediaapi/types"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
) )
@ -57,16 +58,20 @@ SELECT content_type, file_size_bytes, creation_ts, width, height, resize_method
` `
type thumbnailStatements struct { type thumbnailStatements struct {
db *sql.DB
writer sqlutil.TransactionWriter
insertThumbnailStmt *sql.Stmt insertThumbnailStmt *sql.Stmt
selectThumbnailStmt *sql.Stmt selectThumbnailStmt *sql.Stmt
selectThumbnailsStmt *sql.Stmt selectThumbnailsStmt *sql.Stmt
} }
func (s *thumbnailStatements) prepare(db *sql.DB) (err error) { func (s *thumbnailStatements) prepare(db *sql.DB, writer sqlutil.TransactionWriter) (err error) {
_, err = db.Exec(thumbnailSchema) _, err = db.Exec(thumbnailSchema)
if err != nil { if err != nil {
return return
} }
s.db = db
s.writer = writer
return statementList{ return statementList{
{&s.insertThumbnailStmt, insertThumbnailSQL}, {&s.insertThumbnailStmt, insertThumbnailSQL},
@ -79,18 +84,21 @@ func (s *thumbnailStatements) insertThumbnail(
ctx context.Context, thumbnailMetadata *types.ThumbnailMetadata, ctx context.Context, thumbnailMetadata *types.ThumbnailMetadata,
) error { ) error {
thumbnailMetadata.MediaMetadata.CreationTimestamp = types.UnixMs(time.Now().UnixNano() / 1000000) thumbnailMetadata.MediaMetadata.CreationTimestamp = types.UnixMs(time.Now().UnixNano() / 1000000)
_, err := s.insertThumbnailStmt.ExecContext( return s.writer.Do(s.db, nil, func(txn *sql.Tx) error {
ctx, stmt := sqlutil.TxStmt(txn, s.insertThumbnailStmt)
thumbnailMetadata.MediaMetadata.MediaID, _, err := stmt.ExecContext(
thumbnailMetadata.MediaMetadata.Origin, ctx,
thumbnailMetadata.MediaMetadata.ContentType, thumbnailMetadata.MediaMetadata.MediaID,
thumbnailMetadata.MediaMetadata.FileSizeBytes, thumbnailMetadata.MediaMetadata.Origin,
thumbnailMetadata.MediaMetadata.CreationTimestamp, thumbnailMetadata.MediaMetadata.ContentType,
thumbnailMetadata.ThumbnailSize.Width, thumbnailMetadata.MediaMetadata.FileSizeBytes,
thumbnailMetadata.ThumbnailSize.Height, thumbnailMetadata.MediaMetadata.CreationTimestamp,
thumbnailMetadata.ThumbnailSize.ResizeMethod, thumbnailMetadata.ThumbnailSize.Width,
) thumbnailMetadata.ThumbnailSize.Height,
return err thumbnailMetadata.ThumbnailSize.ResizeMethod,
)
return err
})
} }
func (s *thumbnailStatements) selectThumbnail( func (s *thumbnailStatements) selectThumbnail(