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
**运行时**:
- 减少类型断言的反射开销
- 提升实例获取等热点路径的性能
160 lines
5.3 KiB
Go
160 lines
5.3 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 gview implements a template engine based on text/template.
|
|
//
|
|
// Reserved template variable names:
|
|
// I18nLanguage: Assign this variable to define i18n language for each page.
|
|
package gview
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/gogf/gf/v2/container/garray"
|
|
"github.com/gogf/gf/v2/container/gmap"
|
|
"github.com/gogf/gf/v2/internal/intlog"
|
|
"github.com/gogf/gf/v2/os/gcmd"
|
|
"github.com/gogf/gf/v2/os/gfile"
|
|
"github.com/gogf/gf/v2/os/glog"
|
|
)
|
|
|
|
// View object for template engine.
|
|
type View struct {
|
|
searchPaths *garray.StrArray // Searching array for path, NOT concurrent-safe for performance purpose.
|
|
data map[string]any // Global template variables.
|
|
funcMap map[string]any // Global template function map.
|
|
fileCacheMap *gmap.KVMap[string, *fileCacheItem] // File cache map.
|
|
config Config // Extra configuration for the view.
|
|
}
|
|
|
|
type (
|
|
Params = map[string]any // Params is type for template params.
|
|
FuncMap = map[string]any // FuncMap is type for custom template functions.
|
|
)
|
|
|
|
const (
|
|
commandEnvKeyForPath = "gf.gview.path"
|
|
)
|
|
|
|
var (
|
|
// Default view object.
|
|
defaultViewObj *View
|
|
fileCacheItemChecker = func(v *fileCacheItem) bool { return v == nil }
|
|
)
|
|
|
|
// checkAndInitDefaultView checks and initializes the default view object.
|
|
// The default view object will be initialized just once.
|
|
func checkAndInitDefaultView() {
|
|
if defaultViewObj == nil {
|
|
defaultViewObj = New()
|
|
}
|
|
}
|
|
|
|
// ParseContent parses the template content directly using the default view object
|
|
// and returns the parsed content.
|
|
func ParseContent(ctx context.Context, content string, params ...Params) (string, error) {
|
|
checkAndInitDefaultView()
|
|
return defaultViewObj.ParseContent(ctx, content, params...)
|
|
}
|
|
|
|
// New returns a new view object.
|
|
// The parameter `path` specifies the template directory path to load template files.
|
|
func New(path ...string) *View {
|
|
var (
|
|
ctx = context.TODO()
|
|
)
|
|
view := &View{
|
|
searchPaths: garray.NewStrArray(),
|
|
data: make(map[string]any),
|
|
funcMap: make(map[string]any),
|
|
fileCacheMap: gmap.NewKVMapWithChecker[string, *fileCacheItem](fileCacheItemChecker, true),
|
|
config: DefaultConfig(),
|
|
}
|
|
if len(path) > 0 && len(path[0]) > 0 {
|
|
if err := view.SetPath(path[0]); err != nil {
|
|
intlog.Errorf(context.TODO(), `%+v`, err)
|
|
}
|
|
} else {
|
|
// Customized dir path from env/cmd.
|
|
if envPath := gcmd.GetOptWithEnv(commandEnvKeyForPath).String(); envPath != "" {
|
|
if gfile.Exists(envPath) {
|
|
if err := view.SetPath(envPath); err != nil {
|
|
intlog.Errorf(context.TODO(), `%+v`, err)
|
|
}
|
|
} else {
|
|
if errorPrint() {
|
|
glog.Errorf(ctx, "Template directory path does not exist: %s", envPath)
|
|
}
|
|
}
|
|
} else {
|
|
// Dir path of working dir.
|
|
if pwdPath := gfile.Pwd(); pwdPath != "" {
|
|
if err := view.SetPath(pwdPath); err != nil {
|
|
intlog.Errorf(context.TODO(), `%+v`, err)
|
|
}
|
|
}
|
|
// Dir path of binary.
|
|
if selfPath := gfile.SelfDir(); selfPath != "" && gfile.Exists(selfPath) {
|
|
if err := view.AddPath(selfPath); err != nil {
|
|
intlog.Errorf(context.TODO(), `%+v`, err)
|
|
}
|
|
}
|
|
// Dir path of main package.
|
|
if mainPath := gfile.MainPkgPath(); mainPath != "" && gfile.Exists(mainPath) {
|
|
if err := view.AddPath(mainPath); err != nil {
|
|
intlog.Errorf(context.TODO(), `%+v`, err)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// set default delimiters.
|
|
view.SetDelimiters("{{", "}}")
|
|
// default build-in functions.
|
|
view.BindFuncMap(FuncMap{
|
|
"eq": view.buildInFuncEq,
|
|
"ne": view.buildInFuncNe,
|
|
"lt": view.buildInFuncLt,
|
|
"le": view.buildInFuncLe,
|
|
"gt": view.buildInFuncGt,
|
|
"ge": view.buildInFuncGe,
|
|
"text": view.buildInFuncText,
|
|
"html": view.buildInFuncHtmlEncode,
|
|
"htmlencode": view.buildInFuncHtmlEncode,
|
|
"htmldecode": view.buildInFuncHtmlDecode,
|
|
"encode": view.buildInFuncHtmlEncode,
|
|
"decode": view.buildInFuncHtmlDecode,
|
|
"url": view.buildInFuncUrlEncode,
|
|
"urlencode": view.buildInFuncUrlEncode,
|
|
"urldecode": view.buildInFuncUrlDecode,
|
|
"date": view.buildInFuncDate,
|
|
"substr": view.buildInFuncSubStr,
|
|
"strlimit": view.buildInFuncStrLimit,
|
|
"concat": view.buildInFuncConcat,
|
|
"replace": view.buildInFuncReplace,
|
|
"compare": view.buildInFuncCompare,
|
|
"hidestr": view.buildInFuncHideStr,
|
|
"highlight": view.buildInFuncHighlight,
|
|
"toupper": view.buildInFuncToUpper,
|
|
"tolower": view.buildInFuncToLower,
|
|
"nl2br": view.buildInFuncNl2Br,
|
|
"include": view.buildInFuncInclude,
|
|
"dump": view.buildInFuncDump,
|
|
"map": view.buildInFuncMap,
|
|
"maps": view.buildInFuncMaps,
|
|
"json": view.buildInFuncJson,
|
|
"xml": view.buildInFuncXml,
|
|
"ini": view.buildInFuncIni,
|
|
"yaml": view.buildInFuncYaml,
|
|
"yamli": view.buildInFuncYamlIndent,
|
|
"toml": view.buildInFuncToml,
|
|
"plus": view.buildInFuncPlus,
|
|
"minus": view.buildInFuncMinus,
|
|
"times": view.buildInFuncTimes,
|
|
"divide": view.buildInFuncDivide,
|
|
})
|
|
return view
|
|
}
|