mirror of
https://gitee.com/johng/gf
synced 2026-06-30 11:05:11 +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
**运行时**:
- 减少类型断言的反射开销
- 提升实例获取等热点路径的性能
103 lines
2.4 KiB
Go
103 lines
2.4 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 gcache
|
|
|
|
import (
|
|
"sync"
|
|
|
|
"github.com/gogf/gf/v2/container/glist"
|
|
"github.com/gogf/gf/v2/container/gmap"
|
|
)
|
|
|
|
// checker is used to check if the value is nil.
|
|
var checker = func(v *glist.Element) bool { return v == nil }
|
|
|
|
// memoryLru holds LRU info.
|
|
// It uses list.List from stdlib for its underlying doubly linked list.
|
|
type memoryLru struct {
|
|
mu sync.RWMutex // Mutex to guarantee concurrent safety.
|
|
cap int // LRU cap.
|
|
data *gmap.KVMap[any, *glist.Element] // Key mapping to the item of the list.
|
|
list *glist.List // Key list.
|
|
}
|
|
|
|
// newMemoryLru creates and returns a new LRU manager.
|
|
func newMemoryLru(cap int) *memoryLru {
|
|
lru := &memoryLru{
|
|
cap: cap,
|
|
data: gmap.NewKVMapWithChecker[any, *glist.Element](checker, false),
|
|
list: glist.New(false),
|
|
}
|
|
return lru
|
|
}
|
|
|
|
// Remove deletes the `key` FROM `lru`.
|
|
func (l *memoryLru) Remove(keys ...any) {
|
|
if l == nil {
|
|
return
|
|
}
|
|
l.mu.Lock()
|
|
defer l.mu.Unlock()
|
|
for _, key := range keys {
|
|
if v := l.data.Remove(key); v != nil {
|
|
l.list.Remove(v)
|
|
}
|
|
}
|
|
}
|
|
|
|
// SaveAndEvict saves the keys into LRU, evicts and returns the spare keys.
|
|
func (l *memoryLru) SaveAndEvict(keys ...any) (evictedKeys []any) {
|
|
if l == nil {
|
|
return
|
|
}
|
|
l.mu.Lock()
|
|
defer l.mu.Unlock()
|
|
evictedKeys = make([]any, 0)
|
|
for _, key := range keys {
|
|
if evictedKey := l.doSaveAndEvict(key); evictedKey != nil {
|
|
evictedKeys = append(evictedKeys, evictedKey)
|
|
}
|
|
}
|
|
return
|
|
}
|
|
|
|
func (l *memoryLru) doSaveAndEvict(key any) (evictedKey any) {
|
|
element := l.data.Get(key)
|
|
if element != nil {
|
|
if element.Prev() == nil {
|
|
// It this element is already on top of list,
|
|
// it ignores the element moving.
|
|
return
|
|
}
|
|
l.list.Remove(element)
|
|
}
|
|
|
|
// pushes the active key to top of list.
|
|
element = l.list.PushFront(key)
|
|
l.data.Set(key, element)
|
|
// evict the spare key from list.
|
|
if l.data.Size() <= l.cap {
|
|
return
|
|
}
|
|
|
|
if evictedKey = l.list.PopBack(); evictedKey != nil {
|
|
l.data.Remove(evictedKey)
|
|
}
|
|
return
|
|
}
|
|
|
|
// Clear deletes all keys.
|
|
func (l *memoryLru) Clear() {
|
|
if l == nil {
|
|
return
|
|
}
|
|
l.mu.Lock()
|
|
defer l.mu.Unlock()
|
|
l.data.Clear()
|
|
l.list.Clear()
|
|
}
|