* feature extend readthrough for cache module (#5116) * feature 增加readthrough * feature: add write though for cache mode (#5117) * feature: add writethough for cache mode * feature add singleflight cache (#5119) * build(deps): bump go.opentelemetry.io/otel/trace from 1.8.0 to 1.11.2 Bumps [go.opentelemetry.io/otel/trace](https://github.com/open-telemetry/opentelemetry-go) from 1.8.0 to 1.11.2. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.8.0...v1.11.2) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/trace dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * fix 5129: must set formatter after init the logger * remove beego.vip * build(deps): bump actions/stale from 5 to 7 Bumps [actions/stale](https://github.com/actions/stale) from 5 to 7. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v5...v7) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * fix 5079: only log msg when the channel is not closed (#5132) * optimize test * upgrade otel dependencies to v1.11.2 * format code * Bloom filter cache (#5126) * feature: add bloom filter cache * feature upload remove all temp file * bugfix Controller SaveToFile remove all temp file * rft: motify BeeLogger signalChan (#5139) * add non-block write log in asynchronous mode (#5150) * add non-block write log in asynchronous mode --------- Co-authored-by: chenhaokun <chenhaokun@itiger.com> * fix the docsite URL (#5173) * Unified gopkg.in/yaml version to v2 (#5169) * Unified gopkg.in/yaml version to v2 and go mod tidy * update CHANGELOG * bugfix: protect field access with lock to avoid possible data race (#5211) * fix some comments (#5194) Signed-off-by: cui fliter <imcusg@gmail.com> * build(deps): bump github.com/prometheus/client_golang (#5213) Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.14.0 to 1.15.1. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.14.0...v1.15.1) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump go.etcd.io/etcd/client/v3 from 3.5.4 to 3.5.9 (#5209) Bumps [go.etcd.io/etcd/client/v3](https://github.com/etcd-io/etcd) from 3.5.4 to 3.5.9. - [Release notes](https://github.com/etcd-io/etcd/releases) - [Commits](https://github.com/etcd-io/etcd/compare/v3.5.4...v3.5.9) --- updated-dependencies: - dependency-name: go.etcd.io/etcd/client/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * cache: fix typo and optimize the naming * Release 2.1.0 change log * bugfix: beegoAppConfig String and Strings function has bug * httplib: fix unstable test, do not use httplib.org * chore: pkg imported more than once * chore: fmt modify * chore: Use github.com/go-kit/log * chore: unnecessary use of fmt.Sprintf * fix: golangci-lint error * orm: refactor ORM introducing internal/models pkg * remove adapter package * build(deps): bump github.com/bits-and-blooms/bloom/v3 Bumps [github.com/bits-and-blooms/bloom/v3](https://github.com/bits-and-blooms/bloom) from 3.3.1 to 3.5.0. - [Release notes](https://github.com/bits-and-blooms/bloom/releases) - [Commits](https://github.com/bits-and-blooms/bloom/compare/v3.3.1...v3.5.0) --- updated-dependencies: - dependency-name: github.com/bits-and-blooms/bloom/v3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * feat: add write-delete cache mode * fix: unnecessary assignment to the blank identifier * fix: add change into .CHANGELOG file * build(deps): bump golang.org/x/sync from 0.1.0 to 0.3.0 Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.1.0 to 0.3.0. - [Commits](https://github.com/golang/sync/compare/v0.1.0...v0.3.0) --- updated-dependencies: - dependency-name: golang.org/x/sync dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump golang.org/x/crypto Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.0.0-20220315160706-3147a52a75dd to 0.10.0. - [Commits](https://github.com/golang/crypto/commits/v0.10.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * remove golang--lint-ci * Beego web.Run() runs the server twice * fix 5255: Check the rows.Err() if rows.Next() is false * closes 5254: %COL% should be a common placeholder * build(deps): bump github.com/prometheus/client_golang Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.15.1 to 1.16.0. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.15.1...v1.16.0) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * fix: use of ioutil package (#5261) * fix ioutil.NopCloser * fix ioutil.ReadAll * fix ioutil.ReadFile * fix ioutil.WriteFile * run goimports -w -format-only ./ * update CHANGELOG.md * feature: add write-double-delete cache mode (#5263) * cache/redis: support skipEmptyPrefix option (#5264) * fix: refactor InsertValue method (#5267) * fix: refactor insertValue method and add the test * fix: exec goimports and add Licence file header * fix: modify construct method of dbBase * fix: add modify record into CHANGELOG * fix: modify InsertOrUpdate method (#5269) * fix: modify InsertOrUpdate method, Remove the isMulti variable and its associated code * fix: Delete unnecessary judgment branches * fix: add modify record into CHANGELOG * cache/redis: use redisConfig to receive incoming JSON (previously using a map) (#5268) * refactor cache/redis: Use redisConfig to receive incoming JSON (previously using a map). * refactor cache/redis: Use the string type to receive JSON parameters. --------- Co-authored-by: Tan <tanqianheng@gmail.com> * fix: refactor Delete method (#5271) * fix: refactor Delete method and add test * fix: add modify record into CHANGELOG * fix: refactor update sql (#5274) * fix: refactor UpdateSQL method and add test * fix: add modify record into CHANGELOG * fix: modify url in the CHANGELOG * fix: modify pr url in the CHANGELOG * Fix setPK function for table without primary key (#5276) --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: cui fliter <imcusg@gmail.com> Co-authored-by: Stone-afk <73482944+Stone-afk@users.noreply.github.com> Co-authored-by: hookokoko <hooko@tju.edu.cn> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: hookokoko <648646891@qq.com> Co-authored-by: Stone-afk <1711865140@qq.com> Co-authored-by: chenhaokun <chenhaokun@itiger.com> Co-authored-by: Xuing <admin@xuing.cn> Co-authored-by: cui fliter <imcusg@gmail.com> Co-authored-by: guoguangwu <guoguangwu@magic-shield.com> Co-authored-by: uzziah <uzziahlin@gmail.com> Co-authored-by: Hanjiang Yu <delacroix.yu@gmail.com> Co-authored-by: Kota <mdryzk64smsh@gmail.com> Co-authored-by: Uzziah <120019273+uzziahlin@users.noreply.github.com> Co-authored-by: Handkerchiefs-t <59816423+Handkerchiefs-t@users.noreply.github.com> Co-authored-by: Tan <tanqianheng@gmail.com> Co-authored-by: mlgd <mlgd17@gmail.com>
228 lines
6.2 KiB
Go
228 lines
6.2 KiB
Go
// Copyright 2014 beego Author. All Rights Reserved.
|
|
//
|
|
// 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 orm
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"fmt"
|
|
"io"
|
|
"log"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/beego/beego/v2/client/orm/internal/logs"
|
|
)
|
|
|
|
type Log = logs.Log
|
|
|
|
// NewLog set io.Writer to create a Logger.
|
|
func NewLog(out io.Writer) *logs.Log {
|
|
d := new(logs.Log)
|
|
d.Logger = log.New(out, "[ORM]", log.LstdFlags)
|
|
return d
|
|
}
|
|
|
|
// LogFunc costomer log func
|
|
var LogFunc func(query map[string]interface{})
|
|
|
|
func debugLogQueies(alias *alias, operaton, query string, t time.Time, err error, args ...interface{}) {
|
|
logMap := make(map[string]interface{})
|
|
sub := time.Since(t) / 1e5
|
|
elsp := float64(int(sub)) / 10.0
|
|
logMap["cost_time"] = elsp
|
|
flag := " OK"
|
|
if err != nil {
|
|
flag = "FAIL"
|
|
}
|
|
logMap["flag"] = flag
|
|
con := fmt.Sprintf(" -[Queries/%s] - [%s / %11s / %7.1fms] - [%s]", alias.Name, flag, operaton, elsp, query)
|
|
cons := make([]string, 0, len(args))
|
|
for _, arg := range args {
|
|
cons = append(cons, fmt.Sprintf("%v", arg))
|
|
}
|
|
if len(cons) > 0 {
|
|
con += fmt.Sprintf(" - `%s`", strings.Join(cons, "`, `"))
|
|
}
|
|
if err != nil {
|
|
con += " - " + err.Error()
|
|
}
|
|
logMap["sql"] = fmt.Sprintf("%s-`%s`", query, strings.Join(cons, "`, `"))
|
|
if LogFunc != nil {
|
|
LogFunc(logMap)
|
|
}
|
|
logs.DebugLog.Println(con)
|
|
}
|
|
|
|
// statement query logger struct.
|
|
// if dev mode, use stmtQueryLog, or use stmtQuerier.
|
|
type stmtQueryLog struct {
|
|
alias *alias
|
|
query string
|
|
stmt stmtQuerier
|
|
}
|
|
|
|
var _ stmtQuerier = new(stmtQueryLog)
|
|
|
|
func (d *stmtQueryLog) Close() error {
|
|
a := time.Now()
|
|
err := d.stmt.Close()
|
|
debugLogQueies(d.alias, "st.Close", d.query, a, err)
|
|
return err
|
|
}
|
|
|
|
func (d *stmtQueryLog) Exec(args ...interface{}) (sql.Result, error) {
|
|
return d.ExecContext(context.Background(), args...)
|
|
}
|
|
|
|
func (d *stmtQueryLog) ExecContext(ctx context.Context, args ...interface{}) (sql.Result, error) {
|
|
a := time.Now()
|
|
res, err := d.stmt.ExecContext(ctx, args...)
|
|
debugLogQueies(d.alias, "st.Exec", d.query, a, err, args...)
|
|
return res, err
|
|
}
|
|
|
|
func (d *stmtQueryLog) Query(args ...interface{}) (*sql.Rows, error) {
|
|
return d.QueryContext(context.Background(), args...)
|
|
}
|
|
|
|
func (d *stmtQueryLog) QueryContext(ctx context.Context, args ...interface{}) (*sql.Rows, error) {
|
|
a := time.Now()
|
|
res, err := d.stmt.QueryContext(ctx, args...)
|
|
debugLogQueies(d.alias, "st.Query", d.query, a, err, args...)
|
|
return res, err
|
|
}
|
|
|
|
func (d *stmtQueryLog) QueryRow(args ...interface{}) *sql.Row {
|
|
return d.QueryRowContext(context.Background(), args...)
|
|
}
|
|
|
|
func (d *stmtQueryLog) QueryRowContext(ctx context.Context, args ...interface{}) *sql.Row {
|
|
a := time.Now()
|
|
res := d.stmt.QueryRow(args...)
|
|
debugLogQueies(d.alias, "st.QueryRow", d.query, a, nil, args...)
|
|
return res
|
|
}
|
|
|
|
func newStmtQueryLog(alias *alias, stmt stmtQuerier, query string) stmtQuerier {
|
|
d := new(stmtQueryLog)
|
|
d.stmt = stmt
|
|
d.alias = alias
|
|
d.query = query
|
|
return d
|
|
}
|
|
|
|
// database query logger struct.
|
|
// if dev mode, use dbQueryLog, or use dbQuerier.
|
|
type dbQueryLog struct {
|
|
alias *alias
|
|
db dbQuerier
|
|
tx txer
|
|
txe txEnder
|
|
}
|
|
|
|
var (
|
|
_ dbQuerier = new(dbQueryLog)
|
|
_ txer = new(dbQueryLog)
|
|
_ txEnder = new(dbQueryLog)
|
|
)
|
|
|
|
func (d *dbQueryLog) Prepare(query string) (*sql.Stmt, error) {
|
|
return d.PrepareContext(context.Background(), query)
|
|
}
|
|
|
|
func (d *dbQueryLog) PrepareContext(ctx context.Context, query string) (*sql.Stmt, error) {
|
|
a := time.Now()
|
|
stmt, err := d.db.PrepareContext(ctx, query)
|
|
debugLogQueies(d.alias, "db.Prepare", query, a, err)
|
|
return stmt, err
|
|
}
|
|
|
|
func (d *dbQueryLog) Exec(query string, args ...interface{}) (sql.Result, error) {
|
|
return d.ExecContext(context.Background(), query, args...)
|
|
}
|
|
|
|
func (d *dbQueryLog) ExecContext(ctx context.Context, query string, args ...interface{}) (sql.Result, error) {
|
|
a := time.Now()
|
|
res, err := d.db.ExecContext(ctx, query, args...)
|
|
debugLogQueies(d.alias, "db.Exec", query, a, err, args...)
|
|
return res, err
|
|
}
|
|
|
|
func (d *dbQueryLog) Query(query string, args ...interface{}) (*sql.Rows, error) {
|
|
return d.QueryContext(context.Background(), query, args...)
|
|
}
|
|
|
|
func (d *dbQueryLog) QueryContext(ctx context.Context, query string, args ...interface{}) (*sql.Rows, error) {
|
|
a := time.Now()
|
|
res, err := d.db.QueryContext(ctx, query, args...)
|
|
debugLogQueies(d.alias, "db.Query", query, a, err, args...)
|
|
return res, err
|
|
}
|
|
|
|
func (d *dbQueryLog) QueryRow(query string, args ...interface{}) *sql.Row {
|
|
return d.QueryRowContext(context.Background(), query, args...)
|
|
}
|
|
|
|
func (d *dbQueryLog) QueryRowContext(ctx context.Context, query string, args ...interface{}) *sql.Row {
|
|
a := time.Now()
|
|
res := d.db.QueryRowContext(ctx, query, args...)
|
|
debugLogQueies(d.alias, "db.QueryRow", query, a, nil, args...)
|
|
return res
|
|
}
|
|
|
|
func (d *dbQueryLog) Begin() (*sql.Tx, error) {
|
|
return d.BeginTx(context.Background(), nil)
|
|
}
|
|
|
|
func (d *dbQueryLog) BeginTx(ctx context.Context, opts *sql.TxOptions) (*sql.Tx, error) {
|
|
a := time.Now()
|
|
tx, err := d.db.(txer).BeginTx(ctx, opts)
|
|
debugLogQueies(d.alias, "db.BeginTx", "START TRANSACTION", a, err)
|
|
return tx, err
|
|
}
|
|
|
|
func (d *dbQueryLog) Commit() error {
|
|
a := time.Now()
|
|
err := d.db.(txEnder).Commit()
|
|
debugLogQueies(d.alias, "tx.Commit", "COMMIT", a, err)
|
|
return err
|
|
}
|
|
|
|
func (d *dbQueryLog) Rollback() error {
|
|
a := time.Now()
|
|
err := d.db.(txEnder).Rollback()
|
|
debugLogQueies(d.alias, "tx.Rollback", "ROLLBACK", a, err)
|
|
return err
|
|
}
|
|
|
|
func (d *dbQueryLog) RollbackUnlessCommit() error {
|
|
a := time.Now()
|
|
err := d.db.(txEnder).RollbackUnlessCommit()
|
|
debugLogQueies(d.alias, "tx.RollbackUnlessCommit", "ROLLBACK UNLESS COMMIT", a, err)
|
|
return err
|
|
}
|
|
|
|
func (d *dbQueryLog) SetDB(db dbQuerier) {
|
|
d.db = db
|
|
}
|
|
|
|
func newDbQueryLog(alias *alias, db dbQuerier) dbQuerier {
|
|
d := new(dbQueryLog)
|
|
d.alias = alias
|
|
d.db = db
|
|
return d
|
|
}
|