diff --git a/_examples/simple/main.go b/_examples/simple/main.go index dbb3308316e5742191a35a608ada75cf0408096f..5b3e4eb27fa36953412d393843e442b11f52642c 100644 --- a/_examples/simple/main.go +++ b/_examples/simple/main.go @@ -19,7 +19,7 @@ import ( "gitee.com/go-libs/console" "gitee.com/go-libs/db-xorm/db/commands/gen_model" "gitee.com/go-libs/db-xorm/db/commands/gen_service" - "gitee.com/go-wares/log" + "gitee.com/go-libs/log" ) func main() { diff --git a/db/commands/gen_model/provider.go b/db/commands/gen_model/provider.go index 52e8c794091213de3037e1c54b6a86bf06c1bac9..de1fcaa59e023942f98770a2ed389156e27b2284 100644 --- a/db/commands/gen_model/provider.go +++ b/db/commands/gen_model/provider.go @@ -20,7 +20,6 @@ import ( "gitee.com/go-libs/console" "gitee.com/go-libs/db-xorm/db/commands" "gitee.com/go-libs/db-xorm/db/commands/base" - "gitee.com/go-wares/log" ) const ( @@ -39,7 +38,7 @@ type Provider struct { // Before // is a before runner hook handler for command. func (o *Provider) Before(_ context.Context, _ *console.Container, command *console.Command) (err error) { - log.Config().SetLevel("error") + // log.Config().SetLevel("error") // Read and validate // options value. diff --git a/db/commands/gen_service/provider.go b/db/commands/gen_service/provider.go index d848773971d5c029f04799636e71ca71f286c9c0..7cad1bca43a62ec389178bc02ed09e936897d984 100644 --- a/db/commands/gen_service/provider.go +++ b/db/commands/gen_service/provider.go @@ -20,7 +20,6 @@ import ( "gitee.com/go-libs/console" "gitee.com/go-libs/db-xorm/db/commands" "gitee.com/go-libs/db-xorm/db/commands/base" - "gitee.com/go-wares/log" ) const ( @@ -39,7 +38,7 @@ type Provider struct { // Before // is a before runner hook handler for command. func (o *Provider) Before(_ context.Context, _ *console.Container, command *console.Command) (err error) { - log.Config().SetLevel("error") + // log.Config().SetLevel("error") // Read and validate // options value. diff --git a/db/src/config.go b/db/src/config.go index 1ba3d4aac41b483d7d6ad7e69f0c0674a7e6a140..2c98086840faefe26b84d010dded465f9c8ef1d5 100644 --- a/db/src/config.go +++ b/db/src/config.go @@ -16,15 +16,15 @@ package src import ( - "context" - "fmt" - "gitee.com/go-libs/config" - "gitee.com/go-wares/log" - "sync" - "time" - "xorm.io/xorm" - - _ "github.com/go-sql-driver/mysql" + "context" + "fmt" + "gitee.com/go-libs/config" + "gitee.com/go-libs/log" + "sync" + "time" + "xorm.io/xorm" + + _ "github.com/go-sql-driver/mysql" ) // Config @@ -32,227 +32,227 @@ import ( var Config Configuration type ( - // Configuration - // is an interface for connections. - Configuration interface { - // Add - // adds a database mapping to configuration. - Add(key string, database *Database) (err error) - - // Del - // deletes database from mapping and activated engine group. - Del(key string) - - // Get - // returns a shared database configuration. - Get(keys ...string) (database *Database, exists bool) - - // GetEngine - // returns a shared xorm engine group, creates a new when called - // at first time. - GetEngine(keys ...string) (*EngineGroup, error) - - // GetMaster - // returns a shared xorm master session of a connection. - GetMaster(ctx context.Context, keys ...string) (session *Session, err error) - - // GetSlave - // returns a shared xorm slave session of a connection. - GetSlave(ctx context.Context, keys ...string) (session *Session, err error) - } - - configuration struct { - // Databases - // scanned from config file db.yml or db.yaml. - Databases map[string]*Database `yaml:"databases"` - - engines map[string]*EngineGroup - err error - mu *sync.RWMutex - } + // Configuration + // is an interface for connections. + Configuration interface { + // Add + // adds a database mapping to configuration. + Add(key string, database *Database) (err error) + + // Del + // deletes database from mapping and activated engine group. + Del(key string) + + // Get + // returns a shared database configuration. + Get(keys ...string) (database *Database, exists bool) + + // GetEngine + // returns a shared xorm engine group, creates a new when called + // at first time. + GetEngine(keys ...string) (*EngineGroup, error) + + // GetMaster + // returns a shared xorm master session of a connection. + GetMaster(ctx context.Context, keys ...string) (session *Session, err error) + + // GetSlave + // returns a shared xorm slave session of a connection. + GetSlave(ctx context.Context, keys ...string) (session *Session, err error) + } + + configuration struct { + // Databases + // scanned from config file db.yml or db.yaml. + Databases map[string]*Database `yaml:"databases"` + + engines map[string]*EngineGroup + err error + mu *sync.RWMutex + } ) // Add // adds a database mapping to configuration. func (o *configuration) Add(key string, database *Database) (err error) { - // Return error - // if key is blank string. - if key == "" { - err = fmt.Errorf(`database mapping key can not be blank`) - return - } - - // Return error - // if connection is nil. - if database == nil { - err = fmt.Errorf(`database configuration can not be nil`) - return - } - - // Lock - // in mutex and unlock when done. - o.mu.Lock() - defer o.mu.Unlock() - - // Return error - // if database existed. - if _, ok := o.Databases[key]; ok { - err = fmt.Errorf(`database mapping key is existed: %s`, key) - return - } - - // Reset - // database mapping. - database.After() - - // Update - // database mapping. - o.Databases[key] = database - return + // Return error + // if key is blank string. + if key == "" { + err = fmt.Errorf(`database mapping key can not be blank`) + return + } + + // Return error + // if connection is nil. + if database == nil { + err = fmt.Errorf(`database configuration can not be nil`) + return + } + + // Lock + // in mutex and unlock when done. + o.mu.Lock() + defer o.mu.Unlock() + + // Return error + // if database existed. + if _, ok := o.Databases[key]; ok { + err = fmt.Errorf(`database mapping key is existed: %s`, key) + return + } + + // Reset + // database mapping. + database.After() + + // Update + // database mapping. + o.Databases[key] = database + return } // Del // deletes database from mapping and activated engine group. func (o *configuration) Del(key string) { - // Do nothing - // if mapping key is blank string. - if key == "" { - return - } - - // Lock - // in mutex and unlock when done. - o.mu.Lock() - defer o.mu.Unlock() - - // Update mapping. - if _, ok := o.Databases[key]; ok { - delete(o.Databases, key) - } - - // Remove - // used engine group. - if v, ok := o.engines[key]; ok { - delete(o.engines, key) - - // Close engine group and active sessions. - if err := v.Close(); err != nil { - log.Errorf(`close engine group failed: %s`, err) - } - } + // Do nothing + // if mapping key is blank string. + if key == "" { + return + } + + // Lock + // in mutex and unlock when done. + o.mu.Lock() + defer o.mu.Unlock() + + // Update mapping. + if _, ok := o.Databases[key]; ok { + delete(o.Databases, key) + } + + // Remove + // used engine group. + if v, ok := o.engines[key]; ok { + delete(o.engines, key) + + // Close engine group and active sessions. + if err := v.Close(); err != nil { + log.Errorf(`close engine group failed: %s`, err) + } + } } // Get // returns a shared database configuration. func (o *configuration) Get(keys ...string) (database *Database, exists bool) { - var key = DefaultKey - - // Use - // custom key. - if len(keys) > 0 && keys[0] != "" { - key = keys[0] - } - - // Lock - // in mutex and unlock when done. - o.mu.RLock() - defer o.mu.RUnlock() - - // Read - // from mapping with given key. - database, exists = o.Databases[key] - return + var key = DefaultKey + + // Use + // custom key. + if len(keys) > 0 && keys[0] != "" { + key = keys[0] + } + + // Lock + // in mutex and unlock when done. + o.mu.RLock() + defer o.mu.RUnlock() + + // Read + // from mapping with given key. + database, exists = o.Databases[key] + return } // GetEngine // returns a shared xorm engine group. func (o *configuration) GetEngine(keys ...string) (group *EngineGroup, err error) { - var ( - cfg *Database - key = DefaultKey - ok bool - ) - - // Return error - // if initialize failed. - if o.err != nil { - err = o.err - return - } - - // Use - // custom key. - if len(keys) > 0 && keys[0] != "" { - key = keys[0] - } - - // Lock - // in mutex and unlock when done. - o.mu.Lock() - defer o.mu.Unlock() - - // Reuse - // latest engine. - if group, ok = o.engines[key]; ok { - return - } - - // Return error - // if specified database not configured or not added. - if cfg, ok = o.Databases[key]; !ok { - err = fmt.Errorf(`database not in mapping: %s`, key) - return - } - - // Create - // engine group. - if group, err = xorm.NewEngineGroup(cfg.Driver, cfg.Dsn); err != nil { - return - } - - // Build - // initial mapper type on database, table and field name. - group.SetMapper(cfg.mapper) - - // Build - // connection pool attributes. - group.SetMaxIdleConns(cfg.MaxIdle) - group.SetMaxOpenConns(cfg.MaxOpen) - group.SetConnMaxLifetime(time.Duration(cfg.MaxLifetime) * time.Second) - - // Build - // additional attributes. - group.EnableSessionID(*cfg.EnableSession) - group.ShowSQL(*cfg.EnableLogger) - - // Build - // logger adapter. - group.SetLogger(&logger{cfg: cfg, key: key}) - - // Update - // engine mapping. - o.engines[key] = group - return + var ( + cfg *Database + key = DefaultKey + ok bool + ) + + // Return error + // if initialize failed. + if o.err != nil { + err = o.err + return + } + + // Use + // custom key. + if len(keys) > 0 && keys[0] != "" { + key = keys[0] + } + + // Lock + // in mutex and unlock when done. + o.mu.Lock() + defer o.mu.Unlock() + + // Reuse + // latest engine. + if group, ok = o.engines[key]; ok { + return + } + + // Return error + // if specified database not configured or not added. + if cfg, ok = o.Databases[key]; !ok { + err = fmt.Errorf(`database not in mapping: %s`, key) + return + } + + // Create + // engine group. + if group, err = xorm.NewEngineGroup(cfg.Driver, cfg.Dsn); err != nil { + return + } + + // Build + // initial mapper type on database, table and field name. + group.SetMapper(cfg.mapper) + + // Build + // connection pool attributes. + group.SetMaxIdleConns(cfg.MaxIdle) + group.SetMaxOpenConns(cfg.MaxOpen) + group.SetConnMaxLifetime(time.Duration(cfg.MaxLifetime) * time.Second) + + // Build + // additional attributes. + group.EnableSessionID(*cfg.EnableSession) + group.ShowSQL(*cfg.EnableLogger) + + // Build + // logger adapter. + group.SetLogger(&logger{cfg: cfg, key: key}) + + // Update + // engine mapping. + o.engines[key] = group + return } // GetMaster // returns a shared xorm master session of a connection. func (o *configuration) GetMaster(ctx context.Context, keys ...string) (session *Session, err error) { - var group *EngineGroup - if group, err = o.GetEngine(keys...); err == nil { - session = group.Master().Context(ctx) - } - return + var group *EngineGroup + if group, err = o.GetEngine(keys...); err == nil { + session = group.Master().Context(ctx) + } + return } // GetSlave // returns a shared xorm slave session of a connection. func (o *configuration) GetSlave(ctx context.Context, keys ...string) (session *Session, err error) { - var group *EngineGroup - if group, err = o.GetEngine(keys...); err == nil { - session = group.Slave().Context(ctx) - } - return + var group *EngineGroup + if group, err = o.GetEngine(keys...); err == nil { + session = group.Slave().Context(ctx) + } + return } // +---------------------------------------------------------------------------+ @@ -262,16 +262,16 @@ func (o *configuration) GetSlave(ctx context.Context, keys ...string) (session * // After // this method is called by config hook. Do not call it directly. func (o *configuration) After() { - // Initialize. - if o.Databases == nil { - o.Databases = make(map[string]*Database) - } - - // Call - // database after method to set default values. - for _, x := range o.Databases { - x.After() - } + // Initialize. + if o.Databases == nil { + o.Databases = make(map[string]*Database) + } + + // Call + // database after method to set default values. + for _, x := range o.Databases { + x.After() + } } // +---------------------------------------------------------------------------+ @@ -279,8 +279,8 @@ func (o *configuration) After() { // +---------------------------------------------------------------------------+ func (o *configuration) init() *configuration { - o.err = config.Seek("db.yml", "db.yaml").ScanYaml(o) - o.engines = make(map[string]*EngineGroup) - o.mu = &sync.RWMutex{} - return o + o.err = config.Seek("db.yml", "db.yaml").ScanYaml(o) + o.engines = make(map[string]*EngineGroup) + o.mu = &sync.RWMutex{} + return o } diff --git a/db/src/logger.go b/db/src/logger.go index da954616fcdce6759dd6a324e854025860090ca4..9bebcc5f107a51ca4249a04317eacdc3249e153f 100644 --- a/db/src/logger.go +++ b/db/src/logger.go @@ -16,55 +16,55 @@ package src import ( - "fmt" - "gitee.com/go-wares/log" - xl "xorm.io/xorm/log" + "fmt" + "gitee.com/go-libs/log" + xl "xorm.io/xorm/log" ) type logger struct { - xl.DiscardLogger - cfg *Database - key string + xl.DiscardLogger + cfg *Database + key string } // AfterSQL // is a hook function that called when sql execute completed. func (o *logger) AfterSQL(c xl.LogContext) { - // Do nothing - // if logger not enabled. - if !*o.cfg.EnableLogger { - return - } + // Do nothing + // if logger not enabled. + if !*o.cfg.EnableLogger { + return + } - // Logger - // basic message. - prefix := fmt.Sprintf(`%s="%s", db-name="%s"`, o.cfg.Driver, o.key, o.cfg.data) + // Logger + // basic message. + prefix := fmt.Sprintf(`%s="%s", db-name="%s"`, o.cfg.Driver, o.key, o.cfg.data) - // Append - // session id on logger. - if *o.cfg.EnableSession { - if s := c.Ctx.Value(xl.SessionIDKey); s != nil { - prefix += fmt.Sprintf(`, db-sid="%s"`, s) - } - } + // Append + // session id on logger. + if *o.cfg.EnableSession { + if s := c.Ctx.Value(xl.SessionIDKey); s != nil { + prefix += fmt.Sprintf(`, db-sid="%s"`, s) + } + } - // Logger - // sql statement. - if c.Args != nil && len(c.Args) > 0 { - // With - // arguments. - log.Infofc(c.Ctx, `%s, db-cost-ms="%v", sql="%s", args: %v`, prefix, c.ExecuteTime.Milliseconds(), c.SQL, c.Args) - } else { - // Without - // any argument. - log.Infofc(c.Ctx, `%s, db-cost-ms="%v", sql="%s"`, prefix, c.ExecuteTime.Milliseconds(), c.SQL) - } + // Logger + // sql statement. + if c.Args != nil && len(c.Args) > 0 { + // With + // arguments. + log.Infofc(c.Ctx, `%s, db-cost-ms="%v", sql="%s", args: %v`, prefix, c.ExecuteTime.Milliseconds(), c.SQL, c.Args) + } else { + // Without + // any argument. + log.Infofc(c.Ctx, `%s, db-cost-ms="%v", sql="%s"`, prefix, c.ExecuteTime.Milliseconds(), c.SQL) + } - // Logger - // error level message. - if c.Err != nil { - log.Errorfc(c.Ctx, fmt.Sprintf("%v", c.Err)) - } + // Logger + // error level message. + if c.Err != nil { + log.Errorfc(c.Ctx, fmt.Sprintf("%v", c.Err)) + } } func (o *logger) BeforeSQL(_ xl.LogContext) {} diff --git a/db/src/transaction.go b/db/src/transaction.go index ac0817942a637e9d9d88e1dc387c56ef452389ea..c4f39297d2721ff99845001db1fca60bd619f332 100644 --- a/db/src/transaction.go +++ b/db/src/transaction.go @@ -16,69 +16,69 @@ package src import ( - "context" - "fmt" - "gitee.com/go-wares/log" + "context" + "fmt" + "gitee.com/go-libs/log" ) type ( - TransactionHandler func(ctx context.Context, session *Session) error + TransactionHandler func(ctx context.Context, session *Session) error ) func Transaction(ctx context.Context, handlers ...TransactionHandler) (err error) { - var session *Session + var session *Session - // Creates - // a master connect session. - if session, err = Config.GetMaster(ctx); err != nil { - return - } + // Creates + // a master connect session. + if session, err = Config.GetMaster(ctx); err != nil { + return + } - // Close - // session when done. - defer func() { - if se := session.Close(); se != nil { - log.Infofc(ctx, `transaction session close error: %v`, se) - } - }() + // Close + // session when done. + defer func() { + if se := session.Close(); se != nil { + log.Infofc(ctx, `transaction session close error: %v`, se) + } + }() - // Schedule to executor with a master session. - err = TransactionWithSession(ctx, session, handlers...) - return + // Schedule to executor with a master session. + err = TransactionWithSession(ctx, session, handlers...) + return } func TransactionWithSession(ctx context.Context, session *Session, handlers ...TransactionHandler) (err error) { - // Open transaction. - if err = session.Begin(); err != nil { - return - } + // Open transaction. + if err = session.Begin(); err != nil { + return + } - // Executed when process done. - defer func() { - // Catch - // runtime panic and recover it. - if r := recover(); r != nil { - log.Fatalfc(ctx, `transaction panic: %v`, r) - err = fmt.Errorf(`r`) - } + // Executed when process done. + defer func() { + // Catch + // runtime panic and recover it. + if r := recover(); r != nil { + log.Fatalfc(ctx, `transaction panic: %v`, r) + err = fmt.Errorf(`r`) + } - // End transaction with rollback or commit. - if err != nil { - if se := session.Rollback(); se != nil { - log.Errorfc(ctx, "transaction rollback error: %v", se) - } - } else { - if se := session.Commit(); se != nil { - log.Errorfc(ctx, "transaction commit error: %v", se) - } - } - }() + // End transaction with rollback or commit. + if err != nil { + if se := session.Rollback(); se != nil { + log.Errorfc(ctx, "transaction rollback error: %v", se) + } + } else { + if se := session.Commit(); se != nil { + log.Errorfc(ctx, "transaction commit error: %v", se) + } + } + }() - // Range handlers. - for _, handler := range handlers { - if err = handler(ctx, session); err != nil { - break - } - } - return + // Range handlers. + for _, handler := range handlers { + if err = handler(ctx, session); err != nil { + break + } + } + return } diff --git a/go.mod b/go.mod index d9a3ed346d96418b87f6523af4e9b2c2adcbafed..2cd2a2a537260e1c6e0d73a63eb31def7baf7022 100644 --- a/go.mod +++ b/go.mod @@ -5,40 +5,26 @@ go 1.20 require ( gitee.com/go-libs/config v1.0.3 gitee.com/go-libs/console v1.0.5 - gitee.com/go-wares/log v0.1.10 + gitee.com/go-libs/log v1.1.0 github.com/go-sql-driver/mysql v1.7.0 xorm.io/xorm v1.3.9 ) require ( - github.com/IBM/sarama v1.43.1 // indirect - github.com/andybalholm/brotli v1.1.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/eapache/go-resiliency v1.6.0 // indirect - github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect - github.com/eapache/queue v1.1.0 // indirect github.com/elastic/go-elasticsearch/v7 v7.17.10 // indirect github.com/goccy/go-json v0.8.1 // indirect github.com/golang/snappy v0.0.4 // indirect - github.com/hashicorp/errwrap v1.0.0 // indirect - github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/hashicorp/go-uuid v1.0.3 // indirect - github.com/jcmturner/aescts/v2 v2.0.0 // indirect - github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect - github.com/jcmturner/gofork v1.7.6 // indirect - github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect - github.com/jcmturner/rpc/v2 v2.0.3 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.7 // indirect + github.com/kr/pretty v0.3.0 // indirect github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/pierrec/lz4/v4 v4.1.21 // indirect - github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect + github.com/rogpeppe/go-internal v1.12.0 // indirect + github.com/stretchr/testify v1.9.0 // indirect github.com/syndtr/goleveldb v1.0.0 // indirect - github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/valyala/fasthttp v1.52.0 // indirect - golang.org/x/crypto v0.21.0 // indirect golang.org/x/net v0.22.0 // indirect + golang.org/x/sys v0.18.0 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect + gopkg.in/yaml.v2 v2.2.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect ) diff --git a/go.sum b/go.sum index f98645b90d6c57addd572325590a2ed9644733e0..ada5bc5a4e0df2c36feb9160581e082d25a4735b 100644 --- a/go.sum +++ b/go.sum @@ -4,25 +4,15 @@ gitee.com/go-libs/config v1.0.3 h1:dxNXDqelPxTxjmxc27lJCdQA+/IkYV8wOdd0qIhQeJM= gitee.com/go-libs/config v1.0.3/go.mod h1:azzGgnpQ4cTP7EXl7uctzfZ0L+y+v7JGYf65qfSwsXs= gitee.com/go-libs/console v1.0.5 h1:ud6WhIjc/t6erFNkUQEdzSdn+hq9hqGHfFNd2vMvhCY= gitee.com/go-libs/console v1.0.5/go.mod h1:eN44hXeaCd8y52FNnini/016cT3u3XI1DWM5arcXP28= -gitee.com/go-wares/log v0.1.10 h1:DGvvH6DOF8YXLcBTqABGGhkrwe+OhmD3sV9W6NHcB4E= -gitee.com/go-wares/log v0.1.10/go.mod h1:HDs8rnqgyYDGzrUM+SNJx6/R1MK7JpKG5jqAY1HIW/o= -github.com/IBM/sarama v1.43.1 h1:Z5uz65Px7f4DhI/jQqEm/tV9t8aU+JUdTyW/K/fCXpA= -github.com/IBM/sarama v1.43.1/go.mod h1:GG5q1RURtDNPz8xxJs3mgX6Ytak8Z9eLhAkJPObe2xE= -github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= -github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= +gitee.com/go-libs/log v1.1.0 h1:pcMcETSVpPSHy58U3YN6QnjNkVJaUTziDpoLmEyITZc= +gitee.com/go-libs/log v1.1.0/go.mod h1:6gyg7RqwTb4eJHNaiPl5FKe16lUFUe1oaoHIVuzCHuU= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= -github.com/eapache/go-resiliency v1.6.0 h1:CqGDTLtpwuWKn6Nj3uNUdflaq+/kIPsg0gfNzHton30= -github.com/eapache/go-resiliency v1.6.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= -github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4ALJ04o5Qqpdz8XLIpNA3WM/iSIXqxtqo7UGVws= -github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= -github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/elastic/go-elasticsearch/v7 v7.17.10 h1:TCQ8i4PmIJuBunvBS6bwT2ybzVFxxUhhltAs3Gyu1yo= github.com/elastic/go-elasticsearch/v7 v7.17.10/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4= -github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= @@ -34,36 +24,19 @@ github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= -github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= -github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= -github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= -github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= -github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= -github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= -github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= -github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg= -github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo= -github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o= -github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= -github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8= -github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= -github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= -github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= -github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= -github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= @@ -75,73 +48,34 @@ github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= -github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= -github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= -github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= -github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.52.0 h1:wqBQpxH71XW0e2g+Og4dzQM8pk34aFYlA1Ga8db7gU0= -github.com/valyala/fasthttp v1.52.0/go.mod h1:hf5C4QnVMkNXMspnsUlfM3WitlgYflyhHYoKol/szxQ= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= +golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= @@ -149,7 +83,6 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI=