mirror of
https://gitee.com/johng/gf
synced 2026-06-07 02:12: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
**运行时**:
- 减少类型断言的反射开销
- 提升实例获取等热点路径的性能
471 lines
14 KiB
Go
471 lines
14 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
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"fmt"
|
|
htmltpl "html/template"
|
|
"strconv"
|
|
"strings"
|
|
texttpl "text/template"
|
|
|
|
"github.com/gogf/gf/v2"
|
|
"github.com/gogf/gf/v2/container/gmap"
|
|
"github.com/gogf/gf/v2/encoding/ghash"
|
|
"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/os/gfile"
|
|
"github.com/gogf/gf/v2/os/gfsnotify"
|
|
"github.com/gogf/gf/v2/os/glog"
|
|
"github.com/gogf/gf/v2/os/gmlock"
|
|
"github.com/gogf/gf/v2/os/gres"
|
|
"github.com/gogf/gf/v2/os/gspath"
|
|
"github.com/gogf/gf/v2/text/gstr"
|
|
"github.com/gogf/gf/v2/util/gutil"
|
|
)
|
|
|
|
const (
|
|
// Template name for content parsing.
|
|
templateNameForContentParsing = "TemplateContent"
|
|
)
|
|
|
|
// fileCacheItem is the cache item for the template file.
|
|
type fileCacheItem struct {
|
|
path string
|
|
folder string
|
|
content string
|
|
}
|
|
|
|
var (
|
|
// Templates cache map for template folder.
|
|
// Note that there's no expiring logic for this map.
|
|
templates = gmap.NewStrAnyMap(true)
|
|
|
|
// Try-folders for resource template file searching.
|
|
resourceTryFolders = []string{
|
|
"template/", "template", "/template", "/template/",
|
|
"resource/template/", "resource/template", "/resource/template", "/resource/template/",
|
|
}
|
|
|
|
// Prefix array for trying searching in the local system.
|
|
localSystemTryFolders = []string{"", "template/", "resource/template"}
|
|
)
|
|
|
|
// Parse parses given template file `file` with given template variables `params`
|
|
// and returns the parsed template content.
|
|
func (view *View) Parse(ctx context.Context, file string, params ...Params) (result string, err error) {
|
|
var usedParams Params
|
|
if len(params) > 0 {
|
|
usedParams = params[0]
|
|
}
|
|
return view.ParseOption(ctx, Option{
|
|
File: file,
|
|
Content: "",
|
|
Orphan: false,
|
|
Params: usedParams,
|
|
})
|
|
}
|
|
|
|
// ParseDefault parses the default template file with params.
|
|
func (view *View) ParseDefault(ctx context.Context, params ...Params) (result string, err error) {
|
|
var usedParams Params
|
|
if len(params) > 0 {
|
|
usedParams = params[0]
|
|
}
|
|
return view.ParseOption(ctx, Option{
|
|
File: view.config.DefaultFile,
|
|
Content: "",
|
|
Orphan: false,
|
|
Params: usedParams,
|
|
})
|
|
}
|
|
|
|
// ParseContent parses given template content `content` with template variables `params`
|
|
// and returns the parsed content in []byte.
|
|
func (view *View) ParseContent(ctx context.Context, content string, params ...Params) (string, error) {
|
|
var usedParams Params
|
|
if len(params) > 0 {
|
|
usedParams = params[0]
|
|
}
|
|
return view.ParseOption(ctx, Option{
|
|
Content: content,
|
|
Orphan: false,
|
|
Params: usedParams,
|
|
})
|
|
}
|
|
|
|
// Option for template parsing.
|
|
//
|
|
// Deprecated: use Options instead.
|
|
type Option = Options
|
|
|
|
// Options for template parsing.
|
|
type Options struct {
|
|
File string // Template file path in absolute or relative to searching paths.
|
|
Content string // Template content, it ignores `File` if `Content` is given.
|
|
Orphan bool // If true, the `File` is considered as a single file parsing without files recursively parsing from its folder.
|
|
Params Params // Template parameters map.
|
|
}
|
|
|
|
// ParseOption implements template parsing using Option.
|
|
//
|
|
// Deprecated: use ParseWithOptions instead.
|
|
func (view *View) ParseOption(ctx context.Context, option Option) (result string, err error) {
|
|
return view.ParseWithOptions(ctx, option)
|
|
}
|
|
|
|
// ParseWithOptions implements template parsing using Option.
|
|
func (view *View) ParseWithOptions(ctx context.Context, opts Options) (result string, err error) {
|
|
if opts.Content != "" {
|
|
return view.doParseContent(ctx, opts.Content, opts.Params)
|
|
}
|
|
if opts.File == "" {
|
|
return "", gerror.New(`template file cannot be empty`)
|
|
}
|
|
// It caches the file, folder, and content to enhance performance.
|
|
r := view.fileCacheMap.GetOrSetFuncLock(opts.File, func() *fileCacheItem {
|
|
var (
|
|
path string
|
|
folder string
|
|
content string
|
|
resource *gres.File
|
|
)
|
|
// Searching the absolute file path for `file`.
|
|
path, folder, resource, err = view.searchFile(ctx, opts.File)
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
if resource != nil {
|
|
content = string(resource.Content())
|
|
} else {
|
|
content = gfile.GetContentsWithCache(path)
|
|
}
|
|
// Monitor template files changes using fsnotify asynchronously.
|
|
if resource == nil {
|
|
if _, err = gfsnotify.AddOnce(
|
|
"gview.Parse:"+folder, folder, func(event *gfsnotify.Event) {
|
|
// CLEAR THEM ALL.
|
|
view.fileCacheMap.Clear()
|
|
templates.Clear()
|
|
gfsnotify.Exit()
|
|
},
|
|
); err != nil {
|
|
intlog.Errorf(ctx, `%+v`, err)
|
|
}
|
|
}
|
|
return &fileCacheItem{
|
|
path: path,
|
|
folder: folder,
|
|
content: content,
|
|
}
|
|
})
|
|
if r == nil {
|
|
return
|
|
}
|
|
// It's not necessary continuing parsing if template content is empty.
|
|
if r.content == "" {
|
|
return "", nil
|
|
}
|
|
// If it's an Orphan option, it just parses the single file by ParseContent.
|
|
if opts.Orphan {
|
|
return view.doParseContent(ctx, r.content, opts.Params)
|
|
}
|
|
// Get the template object instance for `folder`.
|
|
var tpl any
|
|
tpl, err = view.getTemplate(r.path, r.folder, fmt.Sprintf(`*%s`, gfile.Ext(r.path)))
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
// Using memory lock to ensure concurrent safety for template parsing.
|
|
gmlock.LockFunc("gview.Parse:"+r.path, func() {
|
|
if view.config.AutoEncode {
|
|
tpl, err = tpl.(*htmltpl.Template).Parse(r.content)
|
|
} else {
|
|
tpl, err = tpl.(*texttpl.Template).Parse(r.content)
|
|
}
|
|
if err != nil && r.path != "" {
|
|
err = gerror.Wrap(err, r.path)
|
|
}
|
|
})
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
return view.doParseContentWithStdTemplate(ctx, tpl, opts.Params)
|
|
}
|
|
|
|
// doParseContent parses given template content `content` with template variables `params`
|
|
// and returns the parsed content in []byte.
|
|
func (view *View) doParseContent(ctx context.Context, content string, params Params) (string, error) {
|
|
// It's not necessary continuing parsing if template content is empty.
|
|
if content == "" {
|
|
return "", nil
|
|
}
|
|
var (
|
|
err error
|
|
key = fmt.Sprintf("%s_%v_%v", templateNameForContentParsing, view.config.Delimiters, view.config.AutoEncode)
|
|
tpl = templates.GetOrSetFuncLock(key, func() any {
|
|
if view.config.AutoEncode {
|
|
return htmltpl.New(templateNameForContentParsing).Delims(
|
|
view.config.Delimiters[0],
|
|
view.config.Delimiters[1],
|
|
).Funcs(view.funcMap)
|
|
}
|
|
return texttpl.New(templateNameForContentParsing).Delims(
|
|
view.config.Delimiters[0],
|
|
view.config.Delimiters[1],
|
|
).Funcs(view.funcMap)
|
|
})
|
|
)
|
|
// Using memory lock to ensure concurrent safety for content parsing.
|
|
hash := strconv.FormatUint(ghash.DJB64([]byte(content)), 10)
|
|
gmlock.LockFunc("gview.ParseContent:"+hash, func() {
|
|
if view.config.AutoEncode {
|
|
tpl, err = tpl.(*htmltpl.Template).Parse(content)
|
|
} else {
|
|
tpl, err = tpl.(*texttpl.Template).Parse(content)
|
|
}
|
|
})
|
|
if err != nil {
|
|
err = gerror.Wrapf(err, `template parsing failed`)
|
|
return "", err
|
|
}
|
|
return view.doParseContentWithStdTemplate(ctx, tpl, params)
|
|
}
|
|
|
|
func (view *View) doParseContentWithStdTemplate(ctx context.Context, tpl any, params Params) (string, error) {
|
|
// Note that the template variable assignment cannot change the value
|
|
// of the existing `params` or view.data because both variables are pointers.
|
|
// It needs to merge the values of the two maps into a new map.
|
|
variables := gutil.MapMergeCopy(params, view.getBuiltInParams())
|
|
if len(view.data) > 0 {
|
|
gutil.MapMerge(variables, view.data)
|
|
}
|
|
view.setI18nLanguageFromCtx(ctx, variables)
|
|
|
|
buffer := bytes.NewBuffer(nil)
|
|
if view.config.AutoEncode {
|
|
var newTpl *htmltpl.Template
|
|
newTpl, err := tpl.(*htmltpl.Template).Clone()
|
|
if err != nil {
|
|
err = gerror.Wrapf(err, `template clone failed`)
|
|
return "", err
|
|
}
|
|
if err = newTpl.Execute(buffer, variables); err != nil {
|
|
err = gerror.Wrapf(err, `template parsing failed`)
|
|
return "", err
|
|
}
|
|
} else {
|
|
if err := tpl.(*texttpl.Template).Execute(buffer, variables); err != nil {
|
|
err = gerror.Wrapf(err, `template parsing failed`)
|
|
return "", err
|
|
}
|
|
}
|
|
// TODO any graceful plan to replace "<no value>"?
|
|
result := gstr.Replace(buffer.String(), "<no value>", "")
|
|
result = view.i18nTranslate(ctx, result, variables)
|
|
return result, nil
|
|
}
|
|
|
|
func (view *View) getBuiltInParams() map[string]any {
|
|
return map[string]any{
|
|
"version": gf.VERSION,
|
|
}
|
|
}
|
|
|
|
// getTemplate returns the template object associated with given template file `path`.
|
|
// It uses template cache to enhance performance, that is, it will return the same template object
|
|
// with the same given `path`. It will also automatically refresh the template cache
|
|
// if the template files under `path` changes (recursively).
|
|
func (view *View) getTemplate(filePath, folderPath, pattern string) (tpl any, err error) {
|
|
var (
|
|
mapKey = fmt.Sprintf("%s_%v", filePath, view.config.Delimiters)
|
|
mapFunc = func() any {
|
|
tplName := filePath
|
|
if view.config.AutoEncode {
|
|
tpl = htmltpl.New(tplName).Delims(
|
|
view.config.Delimiters[0],
|
|
view.config.Delimiters[1],
|
|
).Funcs(view.funcMap)
|
|
} else {
|
|
tpl = texttpl.New(tplName).Delims(
|
|
view.config.Delimiters[0],
|
|
view.config.Delimiters[1],
|
|
).Funcs(view.funcMap)
|
|
}
|
|
// Firstly, checking the resource manager.
|
|
if !gres.IsEmpty() {
|
|
if files := gres.ScanDirFile(folderPath, pattern, true); len(files) > 0 {
|
|
if view.config.AutoEncode {
|
|
var t = tpl.(*htmltpl.Template)
|
|
for _, v := range files {
|
|
_, err = t.New(v.FileInfo().Name()).Parse(string(v.Content()))
|
|
if err != nil {
|
|
err = view.formatTemplateObjectCreatingError(v.Name(), tplName, err)
|
|
return nil
|
|
}
|
|
}
|
|
} else {
|
|
var t = tpl.(*texttpl.Template)
|
|
for _, v := range files {
|
|
_, err = t.New(v.FileInfo().Name()).Parse(string(v.Content()))
|
|
if err != nil {
|
|
err = view.formatTemplateObjectCreatingError(v.Name(), tplName, err)
|
|
return nil
|
|
}
|
|
}
|
|
}
|
|
return tpl
|
|
}
|
|
}
|
|
|
|
// Secondly, checking the file system,
|
|
// and then automatically parsing all its sub-files recursively.
|
|
var files []string
|
|
files, err = gfile.ScanDir(folderPath, pattern, true)
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
if view.config.AutoEncode {
|
|
t := tpl.(*htmltpl.Template)
|
|
for _, file := range files {
|
|
if _, err = t.Parse(gfile.GetContents(file)); err != nil {
|
|
err = view.formatTemplateObjectCreatingError(file, tplName, err)
|
|
return nil
|
|
}
|
|
}
|
|
} else {
|
|
t := tpl.(*texttpl.Template)
|
|
for _, file := range files {
|
|
if _, err = t.Parse(gfile.GetContents(file)); err != nil {
|
|
err = view.formatTemplateObjectCreatingError(file, tplName, err)
|
|
return nil
|
|
}
|
|
}
|
|
}
|
|
return tpl
|
|
}
|
|
)
|
|
result := templates.GetOrSetFuncLock(mapKey, mapFunc)
|
|
if result != nil {
|
|
return result, nil
|
|
}
|
|
return
|
|
}
|
|
|
|
// formatTemplateObjectCreatingError formats the error that created from creating the template object.
|
|
func (view *View) formatTemplateObjectCreatingError(filePath, tplName string, err error) error {
|
|
if err != nil {
|
|
return gerror.NewSkip(1, gstr.Replace(err.Error(), tplName, filePath))
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// searchFile returns the absolute path of the `file` and its template folder path.
|
|
// The returned `folder` is the template folder path, not the folder of the template file `path`.
|
|
func (view *View) searchFile(ctx context.Context, file string) (path string, folder string, resource *gres.File, err error) {
|
|
var (
|
|
tempPath string
|
|
trimmedFile = strings.TrimLeft(file, `\/`)
|
|
)
|
|
// Firstly checking the resource manager.
|
|
if !gres.IsEmpty() {
|
|
// Search folders.
|
|
if path == "" {
|
|
view.searchPaths.RLockFunc(func(array []string) {
|
|
for _, searchPath := range array {
|
|
tempPath = strings.TrimRight(searchPath, `\/`) + `/` + trimmedFile
|
|
if tmpFile := gres.Get(tempPath); tmpFile != nil {
|
|
path = tmpFile.Name()
|
|
folder = searchPath
|
|
resource = tmpFile
|
|
return
|
|
}
|
|
|
|
for _, tryFolder := range resourceTryFolders {
|
|
tempPath = strings.TrimRight(searchPath, `\/`) + `/` + strings.TrimRight(tryFolder, `\/`) + `/` + file
|
|
if tmpFile := gres.Get(tempPath); tmpFile != nil {
|
|
path = tmpFile.Name()
|
|
folder = searchPath + tryFolder
|
|
resource = tmpFile
|
|
return
|
|
}
|
|
}
|
|
}
|
|
})
|
|
}
|
|
// Try folders.
|
|
if path == "" {
|
|
for _, tryFolder := range resourceTryFolders {
|
|
tempPath = strings.TrimRight(tryFolder, `\/`) + `/` + trimmedFile
|
|
if tmpFile := gres.Get(tempPath); tmpFile != nil {
|
|
path = tmpFile.Name()
|
|
folder = tryFolder
|
|
resource = tmpFile
|
|
return
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// Secondly, checking the file system.
|
|
if path == "" {
|
|
// Absolute path.
|
|
path = gfile.RealPath(file)
|
|
if path != "" {
|
|
folder = gfile.Dir(path)
|
|
return
|
|
}
|
|
// In search paths.
|
|
view.searchPaths.RLockFunc(func(array []string) {
|
|
for _, searchPath := range array {
|
|
searchPath = gstr.TrimRight(searchPath, `\/`)
|
|
for _, tryFolder := range localSystemTryFolders {
|
|
relativePath := gstr.TrimRight(
|
|
gfile.Join(tryFolder, file),
|
|
`\/`,
|
|
)
|
|
if path, _ = gspath.Search(searchPath, relativePath); path != "" {
|
|
folder = gfile.Join(searchPath, tryFolder)
|
|
return
|
|
}
|
|
}
|
|
}
|
|
})
|
|
}
|
|
|
|
// Error checking.
|
|
if path == "" {
|
|
buffer := bytes.NewBuffer(nil)
|
|
if view.searchPaths.Len() > 0 {
|
|
fmt.Fprintf(buffer, "cannot find template file \"%s\" in following paths:", file)
|
|
view.searchPaths.RLockFunc(func(array []string) {
|
|
index := 1
|
|
for _, searchPath := range array {
|
|
searchPath = gstr.TrimRight(searchPath, `\/`)
|
|
for _, tryFolder := range localSystemTryFolders {
|
|
fmt.Fprintf(buffer,
|
|
"\n%d. %s",
|
|
index, gfile.Join(searchPath, tryFolder))
|
|
index++
|
|
}
|
|
}
|
|
})
|
|
} else {
|
|
fmt.Fprintf(buffer, "cannot find template file \"%s\" with no path set/add", file)
|
|
}
|
|
if errorPrint() {
|
|
glog.Error(ctx, buffer.String())
|
|
}
|
|
err = gerror.NewCodef(gcode.CodeInvalidParameter, `template file "%s" not found`, file)
|
|
}
|
|
return
|
|
}
|