TRKJ/EdgeNode
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeNode.git synced 2025-11-10 04:20:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
刘祥超
2023-08-09 11:17:13 +08:00
parent c61ae6c8ba
commit 9931d057a9
4 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.golangci.yaml
View File

@@ -70,4 +70,5 @@ linters:
- musttag - musttag
- forcetypeassert - forcetypeassert
- whitespace - whitespace
- noctx - noctx
- rowserrcheck

3
internal/caches/list_file_db.go
View File

@@ -285,9 +285,6 @@ func (this *FileListDB) ListExpiredItems(count int) (hashList []string, err erro
if err != nil { if err != nil {
return nil, err return nil, err
} }
if rows.Err() != nil {
return nil, rows.Err()
}
defer func() { defer func() {
_ = rows.Close() _ = rows.Close()
}() }()

8
internal/utils/dbs/db.go
View File

@@ -123,7 +123,7 @@ func (this *DB) Prepare(query string) (*Stmt, error) {
return s, nil return s, nil
} }
func (this *DB) ExecContext(ctx context.Context, query string, args ...interface{}) (sql.Result, error) { func (this *DB) ExecContext(ctx context.Context, query string, args ...any) (sql.Result, error) {
// check database status // check database status
if this.BeginUpdating() { if this.BeginUpdating() {
defer this.EndUpdating() defer this.EndUpdating()
@@ -138,7 +138,7 @@ func (this *DB) ExecContext(ctx context.Context, query string, args ...interface
return this.rawDB.ExecContext(ctx, query, args...) return this.rawDB.ExecContext(ctx, query, args...)
} }
func (this *DB) Exec(query string, args ...interface{}) (sql.Result, error) { func (this *DB) Exec(query string, args ...any) (sql.Result, error) {
// check database status // check database status
if this.BeginUpdating() { if this.BeginUpdating() {
defer this.EndUpdating() defer this.EndUpdating()
@@ -152,14 +152,14 @@ func (this *DB) Exec(query string, args ...interface{}) (sql.Result, error) {
return this.rawDB.Exec(query, args...) return this.rawDB.Exec(query, args...)
} }
func (this *DB) Query(query string, args ...interface{}) (*sql.Rows, error) { func (this *DB) Query(query string, args ...any) (*sql.Rows, error) {
if this.enableStat { if this.enableStat {
defer SharedQueryStatManager.AddQuery(query).End() defer SharedQueryStatManager.AddQuery(query).End()
} }
return this.rawDB.Query(query, args...) return this.rawDB.Query(query, args...)
} }
func (this *DB) QueryRow(query string, args ...interface{}) *sql.Row { func (this *DB) QueryRow(query string, args ...any) *sql.Row {
if this.enableStat { if this.enableStat {
defer SharedQueryStatManager.AddQuery(query).End() defer SharedQueryStatManager.AddQuery(query).End()
} }

23
internal/utils/dbs/stmt.go
View File

@@ -27,7 +27,7 @@ func (this *Stmt) EnableStat() {
this.enableStat = true this.enableStat = true
} }
func (this *Stmt) ExecContext(ctx context.Context, args ...interface{}) (sql.Result, error) { func (this *Stmt) ExecContext(ctx context.Context, args ...any) (sql.Result, error) {
// check database status // check database status
if this.db.BeginUpdating() { if this.db.BeginUpdating() {
defer this.db.EndUpdating() defer this.db.EndUpdating()
@@ -41,7 +41,7 @@ func (this *Stmt) ExecContext(ctx context.Context, args ...interface{}) (sql.Res
return this.rawStmt.ExecContext(ctx, args...) return this.rawStmt.ExecContext(ctx, args...)
} }
func (this *Stmt) Exec(args ...interface{}) (sql.Result, error) { func (this *Stmt) Exec(args ...any) (sql.Result, error) {
// check database status // check database status
if this.db.BeginUpdating() { if this.db.BeginUpdating() {
defer this.db.EndUpdating() defer this.db.EndUpdating()
@@ -55,28 +55,37 @@ func (this *Stmt) Exec(args ...interface{}) (sql.Result, error) {
return this.rawStmt.Exec(args...) return this.rawStmt.Exec(args...)
} }
func (this *Stmt) QueryContext(ctx context.Context, args ...interface{}) (*sql.Rows, error) { func (this *Stmt) QueryContext(ctx context.Context, args ...any) (*sql.Rows, error) {
if this.enableStat { if this.enableStat {
defer SharedQueryStatManager.AddQuery(this.query).End() defer SharedQueryStatManager.AddQuery(this.query).End()
} }
return this.rawStmt.QueryContext(ctx, args...) return this.rawStmt.QueryContext(ctx, args...)
} }
func (this *Stmt) Query(args ...interface{}) (*sql.Rows, error) { func (this *Stmt) Query(args ...any) (*sql.Rows, error) {
if this.enableStat { if this.enableStat {
defer SharedQueryStatManager.AddQuery(this.query).End() defer SharedQueryStatManager.AddQuery(this.query).End()
} }
return this.rawStmt.Query(args...) rows, err := this.rawStmt.Query(args...)
if err != nil {
return nil, err
}
var rowsErr = rows.Err()
if rowsErr != nil {
_ = rows.Close()
return nil, rowsErr
}
return rows, nil
} }
func (this *Stmt) QueryRowContext(ctx context.Context, args ...interface{}) *sql.Row { func (this *Stmt) QueryRowContext(ctx context.Context, args ...any) *sql.Row {
if this.enableStat { if this.enableStat {
defer SharedQueryStatManager.AddQuery(this.query).End() defer SharedQueryStatManager.AddQuery(this.query).End()
} }
return this.rawStmt.QueryRowContext(ctx, args...) return this.rawStmt.QueryRowContext(ctx, args...)
} }
func (this *Stmt) QueryRow(args ...interface{}) *sql.Row { func (this *Stmt) QueryRow(args ...any) *sql.Row {
if this.enableStat { if this.enableStat {
defer SharedQueryStatManager.AddQuery(this.query).End() defer SharedQueryStatManager.AddQuery(this.query).End()
} }