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.
206 lines
5.4 KiB
Go
206 lines
5.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 gdebug
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"reflect"
|
|
"runtime"
|
|
"strings"
|
|
)
|
|
|
|
const (
|
|
maxCallerDepth = 1000
|
|
stackFilterKey = "/debug/gdebug/gdebug"
|
|
)
|
|
|
|
var (
|
|
goRootForFilter = runtime.GOROOT() // goRootForFilter is used for stack filtering purpose.
|
|
binaryVersion = "" // The version of current running binary(uint64 hex).
|
|
binaryVersionMd5 = "" // The version of current running binary(MD5).
|
|
selfPath = "" // Current running binary absolute path.
|
|
)
|
|
|
|
func init() {
|
|
if goRootForFilter != "" {
|
|
goRootForFilter = strings.ReplaceAll(goRootForFilter, "\\", "/")
|
|
}
|
|
// Initialize internal package variable: selfPath.
|
|
selfPath, _ = exec.LookPath(os.Args[0])
|
|
if selfPath != "" {
|
|
selfPath, _ = filepath.Abs(selfPath)
|
|
}
|
|
if selfPath == "" {
|
|
selfPath, _ = filepath.Abs(os.Args[0])
|
|
}
|
|
}
|
|
|
|
// Caller returns the function name and the absolute file path along with its line
|
|
// number of the caller.
|
|
func Caller(skip ...int) (function string, path string, line int) {
|
|
return CallerWithFilter(nil, skip...)
|
|
}
|
|
|
|
// CallerWithFilter returns the function name and the absolute file path along with
|
|
// its line number of the caller.
|
|
//
|
|
// The parameter `filters` is used to filter the path of the caller.
|
|
func CallerWithFilter(filters []string, skip ...int) (function string, path string, line int) {
|
|
var (
|
|
number = 0
|
|
ok = true
|
|
)
|
|
if len(skip) > 0 {
|
|
number = skip[0]
|
|
}
|
|
pc, file, line, start := callerFromIndex(filters)
|
|
if start != -1 {
|
|
for i := start + number; i < maxCallerDepth; i++ {
|
|
if i != start {
|
|
pc, file, line, ok = runtime.Caller(i)
|
|
}
|
|
if ok {
|
|
if filterFileByFilters(file, filters) {
|
|
continue
|
|
}
|
|
function = ""
|
|
if fn := runtime.FuncForPC(pc); fn == nil {
|
|
function = "unknown"
|
|
} else {
|
|
function = fn.Name()
|
|
}
|
|
return function, file, line
|
|
} else {
|
|
break
|
|
}
|
|
}
|
|
}
|
|
return "", "", -1
|
|
}
|
|
|
|
// callerFromIndex returns the caller position and according information exclusive of the
|
|
// debug package.
|
|
//
|
|
// VERY NOTE THAT, the returned index value should be `index - 1` as the caller's start point.
|
|
func callerFromIndex(filters []string) (pc uintptr, file string, line int, index int) {
|
|
var ok bool
|
|
for index = 0; index < maxCallerDepth; index++ {
|
|
if pc, file, line, ok = runtime.Caller(index); ok {
|
|
if filterFileByFilters(file, filters) {
|
|
continue
|
|
}
|
|
if index > 0 {
|
|
index--
|
|
}
|
|
return
|
|
}
|
|
}
|
|
return 0, "", -1, -1
|
|
}
|
|
|
|
func filterFileByFilters(file string, filters []string) (filtered bool) {
|
|
// Filter empty file.
|
|
if file == "" {
|
|
return true
|
|
}
|
|
// Filter gdebug package callings.
|
|
if strings.Contains(file, stackFilterKey) {
|
|
return true
|
|
}
|
|
for _, filter := range filters {
|
|
if filter != "" && strings.Contains(file, filter) {
|
|
return true
|
|
}
|
|
}
|
|
// GOROOT filter.
|
|
if goRootForFilter != "" && len(file) >= len(goRootForFilter) && file[0:len(goRootForFilter)] == goRootForFilter {
|
|
// https://github.com/gogf/gf/issues/2047
|
|
fileSeparator := file[len(goRootForFilter)]
|
|
if fileSeparator == filepath.Separator || fileSeparator == '\\' || fileSeparator == '/' {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
// CallerPackage returns the package name of the caller.
|
|
func CallerPackage() string {
|
|
function, _, _ := Caller()
|
|
// it defines a new internal function to retrieve the package name from caller function name,
|
|
// which is for unit testing purpose for core logic of this function.
|
|
return getPackageFromCallerFunction(function)
|
|
}
|
|
|
|
func getPackageFromCallerFunction(function string) string {
|
|
indexSplit := strings.LastIndexByte(function, '/')
|
|
if indexSplit == -1 {
|
|
return function[:strings.IndexByte(function, '.')]
|
|
}
|
|
var (
|
|
leftPart = function[:indexSplit+1]
|
|
rightPart = function[indexSplit+1:]
|
|
indexDot = strings.IndexByte(rightPart, '.')
|
|
)
|
|
if indexDot >= 0 {
|
|
rightPart = rightPart[:indexDot]
|
|
}
|
|
return leftPart + rightPart
|
|
}
|
|
|
|
// CallerFunction returns the function name of the caller.
|
|
func CallerFunction() string {
|
|
function, _, _ := Caller()
|
|
function = function[strings.LastIndexByte(function, '/')+1:]
|
|
function = function[strings.IndexByte(function, '.')+1:]
|
|
return function
|
|
}
|
|
|
|
// CallerFilePath returns the file path of the caller.
|
|
func CallerFilePath() string {
|
|
_, path, _ := Caller()
|
|
return path
|
|
}
|
|
|
|
// CallerDirectory returns the directory of the caller.
|
|
func CallerDirectory() string {
|
|
_, path, _ := Caller()
|
|
return filepath.Dir(path)
|
|
}
|
|
|
|
// CallerFileLine returns the file path along with the line number of the caller.
|
|
func CallerFileLine() string {
|
|
_, path, line := Caller()
|
|
return fmt.Sprintf(`%s:%d`, path, line)
|
|
}
|
|
|
|
// CallerFileLineShort returns the file name along with the line number of the caller.
|
|
func CallerFileLineShort() string {
|
|
_, path, line := Caller()
|
|
return fmt.Sprintf(`%s:%d`, filepath.Base(path), line)
|
|
}
|
|
|
|
// FuncPath returns the complete function path of given `f`.
|
|
func FuncPath(f any) string {
|
|
return runtime.FuncForPC(reflect.ValueOf(f).Pointer()).Name()
|
|
}
|
|
|
|
// FuncName returns the function name of given `f`.
|
|
func FuncName(f any) string {
|
|
path := FuncPath(f)
|
|
if path == "" {
|
|
return ""
|
|
}
|
|
index := strings.LastIndexByte(path, '/')
|
|
if index < 0 {
|
|
index = strings.LastIndexByte(path, '\\')
|
|
}
|
|
return path[index+1:]
|
|
}
|