mirror of
https://gitee.com/johng/gf
synced 2026-06-06 02:25:47 +08:00
### 变更说明
本次重构将项目中用于**实例管理的容器**从 `StrAnyMap`/`IntAnyMap` 迁移到类型安全的泛型实现
`KVMapWithChecker`,同时将相关的 `glist.List` 和 `gqueue.Queue`
替换为对应的泛型版本,以提高实例管理的类型安全性。并且减少原先代码中的大量类型断言,提高性能。
### 前因
目前`goframe`中大量使用了包含`any`的容器,然后通过断言去转换类型,麻烦且影响性能,尤其是对`gdb/gredis/glog`等需要高频获取`instance`实例的组件影响较大。最近几个版本中gf完成了数据结构容器的泛型化改造,以及我最近解决了其中几个泛型容器对于`typed
nil`过滤的问题,所以可以逐步迁移这些实例容器到泛型容器,减少断言优化性能
### 主要改进
#### 1. 实例容器泛型化
以下模块的实例管理容器已迁移到泛型实现:
**核心实例管理**:
- `database/gdb`: 数据库实例容器 → `KVMap[string, DB]`
- `database/gredis`: Redis 实例容器 → `KVMap[string, *Redis]`
- `database/gredis`: Redis 配置容器 → `KVMap[string, *Config]`
- `os/gcfg`: 配置实例容器 → `KVMap[string, *Config]`
- `os/glog`: 日志实例容器 → `KVMap[string, *Logger]`
- `os/gview`: 视图实例容器 → `KVMap[string, *View]`
- `i18n/gi18n`: 国际化实例容器 → `KVMap[string, *Manager]`
**网络服务实例**:
- `net/ghttp`: HTTP 服务器容器 → `KVMap[string, *Server]`
- `net/gtcp`: TCP 服务器容器 → `KVMap[any, *Server]`
- `net/gudp`: UDP 服务器容器 → `KVMap[string, *Server]`
**其他实例容器**:
- `os/gres`: 资源实例容器 → `KVMap[string, *Resource]`
- `os/gfpool`: 文件池容器 → `KVMap[string, *Pool]`
- `os/gspath`: 路径搜索容器 → `KVMap[string, *SPath]`
- `net/gtcp`: 连接池容器 → `KVMap[string, *gpool.Pool]`
#### 2. 相关数据结构泛型化
- `os/gfsnotify`: 回调列表 → `TList[*Callback]`,事件队列 → `TQueue[*Event]`
- `os/grpool`: 任务队列 → `TList[*localPoolItem]`
- `os/gcache`: 事件队列 → `TList[*adapterMemoryEvent]`
- `net/ghttp`: 解析项列表 → `TList[*HandlerItemParsed]`
- `os/gproc`: 消息队列 → `TQueue[*MsgRequest]`
- `os/gmlock`: 锁映射 → `KVMap[string, *sync.RWMutex]`
### 技术实现
1. **引入检查器函数**: 为每个实例容器添加 `checker` 函数用于空值检测
2. **消除类型断言**: 实例获取时无需 `v.(*Type)` 转换
3. **明确函数签名**: `GetOrSetFuncLock` 的回调从 `func() any` 改为 `func() T`
### 使用示例
#### 实例容器的变更
**变更前**:
```go
// 旧的实例管理方式
var instances = gmap.NewStrAnyMap(true)
func Instance(name string) *Logger {
v := instances.GetOrSetFuncLock(name, func() any {
return New()
})
return v.(*Logger) // 需要类型断言
}
```
**变更后**:
```go
// 新的泛型实例容器
var (
checker = func(v *Logger) bool { return v == nil }
instances = gmap.NewKVMapWithChecker[string, *Logger](checker, true)
)
func Instance(name string) *Logger {
return instances.GetOrSetFuncLock(name, New) // 直接返回,无需断言
}
```
#### 队列容器的变更
**变更前**:
```go
// 旧的队列方式
events := gqueue.New()
events.Push(&Event{Path: "/tmp/file"})
if v := events.Pop(); v != nil {
event := v.(*Event) // 需要类型断言
handleEvent(event)
}
```
**变更后**:
```go
// 新的泛型队列
events := gqueue.NewTQueue[*Event]()
events.Push(&Event{Path: "/tmp/file"})
if event := events.Pop(); event != nil {
handleEvent(event) // event 已是 *Event 类型
}
```
### 收益
- ✅ **编译时类型安全**: 实例容器的类型错误在编译期捕获
- ✅ **消除运行时断言**: 避免类型断言带来的 panic 风险
- ✅ **提升代码可读性**: 实例管理逻辑更清晰
- ✅ **改善开发体验**: IDE 类型提示和代码补全更准确
### 性能权衡
**编译时**:
- 泛型实例化会增加编译时间和二进制体积
- 预估编译时间增加 5-15%,二进制体积增加约 1-2MB
**运行时**:
- 减少类型断言的反射开销
- 提升实例获取等热点路径的性能
145 lines
5.7 KiB
Go
145 lines
5.7 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 (
|
|
// configChecker checks whether the *Config is nil.
|
|
configChecker = func(v *Config) bool { return v == nil }
|
|
// Configuration groups.
|
|
localConfigMap = gmap.NewKVMapWithChecker[string, *Config](configChecker, 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, 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()
|
|
}
|