mirror of
https://gitee.com/johng/gf
synced 2026-06-06 02:25:47 +08:00
This pull request standardizes the use of the Go 1.18+ `any` type alias
instead of `interface{}` throughout the codebase. The change improves
code readability and aligns with modern Go best practices. The update
touches many files, including core data structures, code generation
templates, logging utilities, and test data, ensuring consistency across
all usages.
**Type alias migration to `any`:**
* Replaced all instances of `interface{}` with `any` in core data
structures such as `garray` and in generated model structs (e.g.,
`TableUser`, `User1`, `User2`) to modernize type usage.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[3]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[4]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[5]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[6]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
* Updated function signatures, method parameters, and return types from
`interface{}` to `any` in various parts of the codebase, including code
generation, service logic, and logging utilities (e.g., `mlog`).
[[1]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[2]](diffhunk://#diff-2b1953fb78cf3593d8c2c7d911e95b65fd0b847c30ed0b4d167d16fe6d781235L54-R74)
[[3]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[4]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
[[5]](diffhunk://#diff-c5d51d56f487779a2b6207c7ad26c7a20bbadcc846ce094fe60ab4cabff58c51L107-R107)
[[6]](diffhunk://#diff-f96e6a9fdb416eb1804ceaba1fe0ac637bff22c43837f8bb849c2366ce72d4a1L116-R121)
[[7]](diffhunk://#diff-f94c83a1b08ae060d9346f4a6031fc4a7b9a0b894e02d9afaa09018b6598eac0L112-R112)
[[8]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L36-R36)
[[9]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L74-R74)
[[10]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L96-R96)
**Generated code and templates:**
* Adjusted generated files and code generation templates to output `any`
instead of `interface{}` for relevant struct fields and function
signatures, ensuring that new code generation aligns with the updated
convention.
[[1]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[2]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[3]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[4]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[5]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
[[6]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[7]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[8]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
**Container and utility updates:**
* Refactored the `garray` container implementation and related
constructors/methods to use `[]any` instead of `[]interface{}`, along
with corresponding function signatures.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L52-R52)
[[3]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L62-R62)
[[4]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L73-R86)
[[5]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L96-R97)
[[6]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L107-R114)
[[7]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L124-R124)
[[8]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L135-R143)
[[9]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L167-R167)
These changes collectively modernize the codebase and prepare it for
future Go developments by using the idiomatic `any` type.
143 lines
5.6 KiB
Go
143 lines
5.6 KiB
Go
// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
|
|
//
|
|
// This Source Code Form is subject to the terms of the MIT License.
|
|
// If a copy of the MIT was not distributed with this file,
|
|
// You can obtain one at https://github.com/gogf/gf.
|
|
|
|
package gredis
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"time"
|
|
|
|
"github.com/gogf/gf/v2/container/gmap"
|
|
"github.com/gogf/gf/v2/errors/gcode"
|
|
"github.com/gogf/gf/v2/errors/gerror"
|
|
"github.com/gogf/gf/v2/internal/intlog"
|
|
"github.com/gogf/gf/v2/util/gconv"
|
|
)
|
|
|
|
// Config is redis configuration.
|
|
type Config struct {
|
|
// Address It supports single and cluster redis server. Multiple addresses joined with char ','. Eg: 192.168.1.1:6379, 192.168.1.2:6379.
|
|
Address string `json:"address"`
|
|
Db int `json:"db"` // Redis db.
|
|
User string `json:"user"` // Username for AUTH.
|
|
Pass string `json:"pass"` // Password for AUTH.
|
|
SentinelUser string `json:"sentinel_user"` // Username for sentinel AUTH.
|
|
SentinelPass string `json:"sentinel_pass"` // Password for sentinel AUTH.
|
|
MinIdle int `json:"minIdle"` // Minimum number of connections allowed to be idle (default is 0)
|
|
MaxIdle int `json:"maxIdle"` // Maximum number of connections allowed to be idle (default is 10)
|
|
MaxActive int `json:"maxActive"` // Maximum number of connections limit (default is 0 means no limit).
|
|
MaxConnLifetime time.Duration `json:"maxConnLifetime"` // Maximum lifetime of the connection (default is 30 seconds, not allowed to be set to 0)
|
|
IdleTimeout time.Duration `json:"idleTimeout"` // Maximum idle time for connection (default is 10 seconds, not allowed to be set to 0)
|
|
WaitTimeout time.Duration `json:"waitTimeout"` // Timed out duration waiting to get a connection from the connection pool.
|
|
DialTimeout time.Duration `json:"dialTimeout"` // Dial connection timeout for TCP.
|
|
ReadTimeout time.Duration `json:"readTimeout"` // Read timeout for TCP. DO NOT set it if not necessary.
|
|
WriteTimeout time.Duration `json:"writeTimeout"` // Write timeout for TCP.
|
|
MasterName string `json:"masterName"` // Used in Redis Sentinel mode.
|
|
TLS bool `json:"tls"` // Specifies whether TLS should be used when connecting to the server.
|
|
TLSSkipVerify bool `json:"tlsSkipVerify"` // Disables server name verification when connecting over TLS.
|
|
TLSConfig *tls.Config `json:"-"` // TLS Config to use. When set TLS will be negotiated.
|
|
SlaveOnly bool `json:"slaveOnly"` // Route all commands to slave read-only nodes.
|
|
Cluster bool `json:"cluster"` // Specifies whether cluster mode be used.
|
|
Protocol int `json:"protocol"` // Specifies the RESP version (Protocol 2 or 3.)
|
|
}
|
|
|
|
const (
|
|
DefaultGroupName = "default" // Default configuration group name.
|
|
)
|
|
|
|
var (
|
|
// Configuration groups.
|
|
localConfigMap = gmap.NewStrAnyMap(true)
|
|
)
|
|
|
|
// SetConfig sets the global configuration for specified group.
|
|
// If `name` is not passed, it sets configuration for the default group name.
|
|
func SetConfig(config *Config, name ...string) {
|
|
group := DefaultGroupName
|
|
if len(name) > 0 {
|
|
group = name[0]
|
|
}
|
|
localConfigMap.Set(group, config)
|
|
|
|
intlog.Printf(context.TODO(), `SetConfig for group "%s": %+v`, group, config)
|
|
}
|
|
|
|
// SetConfigByMap sets the global configuration for specified group with map.
|
|
// If `name` is not passed, it sets configuration for the default group name.
|
|
func SetConfigByMap(m map[string]any, name ...string) error {
|
|
group := DefaultGroupName
|
|
if len(name) > 0 {
|
|
group = name[0]
|
|
}
|
|
config, err := ConfigFromMap(m)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
localConfigMap.Set(group, config)
|
|
return nil
|
|
}
|
|
|
|
// ConfigFromMap parses and returns config from given map.
|
|
func ConfigFromMap(m map[string]any) (config *Config, err error) {
|
|
config = &Config{}
|
|
if err = gconv.Scan(m, config); err != nil {
|
|
err = gerror.NewCodef(gcode.CodeInvalidConfiguration, `invalid redis configuration: %#v`, m)
|
|
}
|
|
if config.DialTimeout < time.Second {
|
|
config.DialTimeout = config.DialTimeout * time.Second
|
|
}
|
|
if config.WaitTimeout < time.Second {
|
|
config.WaitTimeout = config.WaitTimeout * time.Second
|
|
}
|
|
if config.WriteTimeout < time.Second {
|
|
config.WriteTimeout = config.WriteTimeout * time.Second
|
|
}
|
|
if config.ReadTimeout < time.Second {
|
|
config.ReadTimeout = config.ReadTimeout * time.Second
|
|
}
|
|
if config.IdleTimeout < time.Second {
|
|
config.IdleTimeout = config.IdleTimeout * time.Second
|
|
}
|
|
if config.MaxConnLifetime < time.Second {
|
|
config.MaxConnLifetime = config.MaxConnLifetime * time.Second
|
|
}
|
|
if config.Protocol != 2 && config.Protocol != 3 {
|
|
config.Protocol = 3
|
|
}
|
|
return
|
|
}
|
|
|
|
// GetConfig returns the global configuration with specified group name.
|
|
// If `name` is not passed, it returns configuration of the default group name.
|
|
func GetConfig(name ...string) (config *Config, ok bool) {
|
|
group := DefaultGroupName
|
|
if len(name) > 0 {
|
|
group = name[0]
|
|
}
|
|
if v := localConfigMap.Get(group); v != nil {
|
|
return v.(*Config), true
|
|
}
|
|
return &Config{}, false
|
|
}
|
|
|
|
// RemoveConfig removes the global configuration with specified group.
|
|
// If `name` is not passed, it removes configuration of the default group name.
|
|
func RemoveConfig(name ...string) {
|
|
group := DefaultGroupName
|
|
if len(name) > 0 {
|
|
group = name[0]
|
|
}
|
|
localConfigMap.Remove(group)
|
|
|
|
intlog.Printf(context.TODO(), `RemoveConfig: %s`, group)
|
|
}
|
|
|
|
// ClearConfig removes all configurations of redis.
|
|
func ClearConfig() {
|
|
localConfigMap.Clear()
|
|
}
|