arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

feat: add lapsed time to SQL logger, to help detect SQL bottlenecks

Browse Source
This commit is contained in:
Deluan
2020-02-05 08:47:32 -05:00
parent 5fbde33b97
commit e0308acef3
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
persistence/sql_base_repository.go
+13 -8
View File
@@ -4,6 +4,7 @@ import (
"context" "context"
"fmt" "fmt"
"strings" "strings"
"time"
. "github.com/Masterminds/squirrel" . "github.com/Masterminds/squirrel"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
@@ -68,9 +69,10 @@ func (r sqlRepository) executeSQL(sq Sqlizer) (int64, error) {
if err != nil { if err != nil {
return 0, err return 0, err
} }
start := time.Now()
res, err := r.ormer.Raw(query, args...).Exec() res, err := r.ormer.Raw(query, args...).Exec()
c, _ := res.RowsAffected() c, _ := res.RowsAffected()
r.logSQL(query, args, err, c) r.logSQL(query, args, err, c, start)
if err != nil { if err != nil {
if err.Error() != "LastInsertId is not supported by this driver" { if err.Error() != "LastInsertId is not supported by this driver" {
return 0, err return 0, err
@@ -84,12 +86,13 @@ func (r sqlRepository) queryOne(sq Sqlizer, response interface{}) error {
if err != nil { if err != nil {
return err return err
} }
start := time.Now()
err = r.ormer.Raw(query, args...).QueryRow(response) err = r.ormer.Raw(query, args...).QueryRow(response)
if err == orm.ErrNoRows { if err == orm.ErrNoRows {
r.logSQL(query, args, nil, 1) r.logSQL(query, args, nil, 1, start)
return model.ErrNotFound return model.ErrNotFound
} }
r.logSQL(query, args, err, 1) r.logSQL(query, args, err, 1, start)
return err return err
} }
@@ -98,12 +101,13 @@ func (r sqlRepository) queryAll(sq Sqlizer, response interface{}) error {
if err != nil { if err != nil {
return err return err
} }
start := time.Now()
c, err := r.ormer.Raw(query, args...).QueryRows(response) c, err := r.ormer.Raw(query, args...).QueryRows(response)
if err == orm.ErrNoRows { if err == orm.ErrNoRows {
r.logSQL(query, args, nil, c) r.logSQL(query, args, nil, c, start)
return model.ErrNotFound return model.ErrNotFound
} }
r.logSQL(query, args, nil, c) r.logSQL(query, args, nil, c, start)
return err return err
} }
@@ -154,7 +158,8 @@ func (r sqlRepository) delete(cond Sqlizer) error {
return err return err
} }
func (r sqlRepository) logSQL(sql string, args []interface{}, err error, rowsAffected int64) { func (r sqlRepository) logSQL(sql string, args []interface{}, err error, rowsAffected int64, start time.Time) {
lapsed := time.Since(start)
var fmtArgs []string var fmtArgs []string
for i := range args { for i := range args {
var f string var f string
@@ -167,9 +172,9 @@ func (r sqlRepository) logSQL(sql string, args []interface{}, err error, rowsAff
fmtArgs = append(fmtArgs, f) fmtArgs = append(fmtArgs, f)
} }
if err != nil { if err != nil {
log.Error(r.ctx, "SQL: `"+sql+"`", "args", `[`+strings.Join(fmtArgs, ",")+`]`, "rowsAffected", rowsAffected, err) log.Error(r.ctx, "SQL: `"+sql+"`", "args", `[`+strings.Join(fmtArgs, ",")+`]`, "rowsAffected", rowsAffected, "lapsedTime", lapsed, err)
} else { } else {
log.Trace(r.ctx, "SQL: `"+sql+"`", "args", `[`+strings.Join(fmtArgs, ",")+`]`, "rowsAffected", rowsAffected) log.Trace(r.ctx, "SQL: `"+sql+"`", "args", `[`+strings.Join(fmtArgs, ",")+`]`, "rowsAffected", rowsAffected, "lapsedTime", lapsed)
} }
} }