mirror of
https://gitee.com/johng/gf
synced 2026-06-07 02:12:11 +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.
244 lines
9.7 KiB
Go
244 lines
9.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 gcache provides kinds of cache management for process.
|
|
//
|
|
// It provides a concurrent-safe in-memory cache adapter for process in default.
|
|
package gcache
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/gogf/gf/v2/container/gvar"
|
|
)
|
|
|
|
// Func is the cache function that calculates and returns the value.
|
|
type Func = func(ctx context.Context) (value any, err error)
|
|
|
|
// DurationNoExpire represents the cache key-value pair that never expires.
|
|
const DurationNoExpire = time.Duration(0)
|
|
|
|
// Default cache object.
|
|
var defaultCache = New()
|
|
|
|
// Set sets cache with `key`-`value` pair, which is expired after `duration`.
|
|
//
|
|
// It does not expire if `duration` == 0.
|
|
// It deletes the keys of `data` if `duration` < 0 or given `value` is nil.
|
|
func Set(ctx context.Context, key any, value any, duration time.Duration) error {
|
|
return defaultCache.Set(ctx, key, value, duration)
|
|
}
|
|
|
|
// SetMap batch sets cache with key-value pairs by `data` map, which is expired after `duration`.
|
|
//
|
|
// It does not expire if `duration` == 0.
|
|
// It deletes the keys of `data` if `duration` < 0 or given `value` is nil.
|
|
func SetMap(ctx context.Context, data map[any]any, duration time.Duration) error {
|
|
return defaultCache.SetMap(ctx, data, duration)
|
|
}
|
|
|
|
// SetIfNotExist sets cache with `key`-`value` pair which is expired after `duration`
|
|
// if `key` does not exist in the cache. It returns true the `key` does not exist in the
|
|
// cache, and it sets `value` successfully to the cache, or else it returns false.
|
|
//
|
|
// It does not expire if `duration` == 0.
|
|
// It deletes the `key` if `duration` < 0 or given `value` is nil.
|
|
func SetIfNotExist(ctx context.Context, key any, value any, duration time.Duration) (bool, error) {
|
|
return defaultCache.SetIfNotExist(ctx, key, value, duration)
|
|
}
|
|
|
|
// SetIfNotExistFunc sets `key` with result of function `f` and returns true
|
|
// if `key` does not exist in the cache, or else it does nothing and returns false if `key` already exists.
|
|
//
|
|
// The parameter `value` can be type of `func() any`, but it does nothing if its
|
|
// result is nil.
|
|
//
|
|
// It does not expire if `duration` == 0.
|
|
// It deletes the `key` if `duration` < 0 or given `value` is nil.
|
|
func SetIfNotExistFunc(ctx context.Context, key any, f Func, duration time.Duration) (bool, error) {
|
|
return defaultCache.SetIfNotExistFunc(ctx, key, f, duration)
|
|
}
|
|
|
|
// SetIfNotExistFuncLock sets `key` with result of function `f` and returns true
|
|
// if `key` does not exist in the cache, or else it does nothing and returns false if `key` already exists.
|
|
//
|
|
// It does not expire if `duration` == 0.
|
|
// It deletes the `key` if `duration` < 0 or given `value` is nil.
|
|
//
|
|
// Note that it differs from function `SetIfNotExistFunc` is that the function `f` is executed within
|
|
// writing mutex lock for concurrent safety purpose.
|
|
func SetIfNotExistFuncLock(ctx context.Context, key any, f Func, duration time.Duration) (bool, error) {
|
|
return defaultCache.SetIfNotExistFuncLock(ctx, key, f, duration)
|
|
}
|
|
|
|
// Get retrieves and returns the associated value of given `key`.
|
|
// It returns nil if it does not exist, or its value is nil, or it's expired.
|
|
// If you would like to check if the `key` exists in the cache, it's better using function Contains.
|
|
func Get(ctx context.Context, key any) (*gvar.Var, error) {
|
|
return defaultCache.Get(ctx, key)
|
|
}
|
|
|
|
// GetOrSet retrieves and returns the value of `key`, or sets `key`-`value` pair and
|
|
// returns `value` if `key` does not exist in the cache. The key-value pair expires
|
|
// after `duration`.
|
|
//
|
|
// It does not expire if `duration` == 0.
|
|
// It deletes the `key` if `duration` < 0 or given `value` is nil, but it does nothing
|
|
// if `value` is a function and the function result is nil.
|
|
func GetOrSet(ctx context.Context, key any, value any, duration time.Duration) (*gvar.Var, error) {
|
|
return defaultCache.GetOrSet(ctx, key, value, duration)
|
|
}
|
|
|
|
// GetOrSetFunc retrieves and returns the value of `key`, or sets `key` with result of
|
|
// function `f` and returns its result if `key` does not exist in the cache. The key-value
|
|
// pair expires after `duration`.
|
|
//
|
|
// It does not expire if `duration` == 0.
|
|
// It deletes the `key` if `duration` < 0 or given `value` is nil, but it does nothing
|
|
// if `value` is a function and the function result is nil.
|
|
func GetOrSetFunc(ctx context.Context, key any, f Func, duration time.Duration) (*gvar.Var, error) {
|
|
return defaultCache.GetOrSetFunc(ctx, key, f, duration)
|
|
}
|
|
|
|
// GetOrSetFuncLock retrieves and returns the value of `key`, or sets `key` with result of
|
|
// function `f` and returns its result if `key` does not exist in the cache. The key-value
|
|
// pair expires after `duration`.
|
|
//
|
|
// It does not expire if `duration` == 0.
|
|
// It deletes the `key` if `duration` < 0 or given `value` is nil, but it does nothing
|
|
// if `value` is a function and the function result is nil.
|
|
//
|
|
// Note that it differs from function `GetOrSetFunc` is that the function `f` is executed within
|
|
// writing mutex lock for concurrent safety purpose.
|
|
func GetOrSetFuncLock(ctx context.Context, key any, f Func, duration time.Duration) (*gvar.Var, error) {
|
|
return defaultCache.GetOrSetFuncLock(ctx, key, f, duration)
|
|
}
|
|
|
|
// Contains checks and returns true if `key` exists in the cache, or else returns false.
|
|
func Contains(ctx context.Context, key any) (bool, error) {
|
|
return defaultCache.Contains(ctx, key)
|
|
}
|
|
|
|
// GetExpire retrieves and returns the expiration of `key` in the cache.
|
|
//
|
|
// Note that,
|
|
// It returns 0 if the `key` does not expire.
|
|
// It returns -1 if the `key` does not exist in the cache.
|
|
func GetExpire(ctx context.Context, key any) (time.Duration, error) {
|
|
return defaultCache.GetExpire(ctx, key)
|
|
}
|
|
|
|
// Remove deletes one or more keys from cache, and returns its value.
|
|
// If multiple keys are given, it returns the value of the last deleted item.
|
|
func Remove(ctx context.Context, keys ...any) (value *gvar.Var, err error) {
|
|
return defaultCache.Remove(ctx, keys...)
|
|
}
|
|
|
|
// Removes deletes `keys` in the cache.
|
|
func Removes(ctx context.Context, keys []any) error {
|
|
return defaultCache.Removes(ctx, keys)
|
|
}
|
|
|
|
// Update updates the value of `key` without changing its expiration and returns the old value.
|
|
// The returned value `exist` is false if the `key` does not exist in the cache.
|
|
//
|
|
// It deletes the `key` if given `value` is nil.
|
|
// It does nothing if `key` does not exist in the cache.
|
|
func Update(ctx context.Context, key any, value any) (oldValue *gvar.Var, exist bool, err error) {
|
|
return defaultCache.Update(ctx, key, value)
|
|
}
|
|
|
|
// UpdateExpire updates the expiration of `key` and returns the old expiration duration value.
|
|
//
|
|
// It returns -1 and does nothing if the `key` does not exist in the cache.
|
|
// It deletes the `key` if `duration` < 0.
|
|
func UpdateExpire(ctx context.Context, key any, duration time.Duration) (oldDuration time.Duration, err error) {
|
|
return defaultCache.UpdateExpire(ctx, key, duration)
|
|
}
|
|
|
|
// Size returns the number of items in the cache.
|
|
func Size(ctx context.Context) (int, error) {
|
|
return defaultCache.Size(ctx)
|
|
}
|
|
|
|
// Data returns a copy of all key-value pairs in the cache as map type.
|
|
// Note that this function may lead lots of memory usage, you can implement this function
|
|
// if necessary.
|
|
func Data(ctx context.Context) (map[any]any, error) {
|
|
return defaultCache.Data(ctx)
|
|
}
|
|
|
|
// Keys returns all keys in the cache as slice.
|
|
func Keys(ctx context.Context) ([]any, error) {
|
|
return defaultCache.Keys(ctx)
|
|
}
|
|
|
|
// KeyStrings returns all keys in the cache as string slice.
|
|
func KeyStrings(ctx context.Context) ([]string, error) {
|
|
return defaultCache.KeyStrings(ctx)
|
|
}
|
|
|
|
// Values returns all values in the cache as slice.
|
|
func Values(ctx context.Context) ([]any, error) {
|
|
return defaultCache.Values(ctx)
|
|
}
|
|
|
|
// MustGet acts like Get, but it panics if any error occurs.
|
|
func MustGet(ctx context.Context, key any) *gvar.Var {
|
|
return defaultCache.MustGet(ctx, key)
|
|
}
|
|
|
|
// MustGetOrSet acts like GetOrSet, but it panics if any error occurs.
|
|
func MustGetOrSet(ctx context.Context, key any, value any, duration time.Duration) *gvar.Var {
|
|
return defaultCache.MustGetOrSet(ctx, key, value, duration)
|
|
}
|
|
|
|
// MustGetOrSetFunc acts like GetOrSetFunc, but it panics if any error occurs.
|
|
func MustGetOrSetFunc(ctx context.Context, key any, f Func, duration time.Duration) *gvar.Var {
|
|
return defaultCache.MustGetOrSetFunc(ctx, key, f, duration)
|
|
}
|
|
|
|
// MustGetOrSetFuncLock acts like GetOrSetFuncLock, but it panics if any error occurs.
|
|
func MustGetOrSetFuncLock(ctx context.Context, key any, f Func, duration time.Duration) *gvar.Var {
|
|
return defaultCache.MustGetOrSetFuncLock(ctx, key, f, duration)
|
|
}
|
|
|
|
// MustContains acts like Contains, but it panics if any error occurs.
|
|
func MustContains(ctx context.Context, key any) bool {
|
|
return defaultCache.MustContains(ctx, key)
|
|
}
|
|
|
|
// MustGetExpire acts like GetExpire, but it panics if any error occurs.
|
|
func MustGetExpire(ctx context.Context, key any) time.Duration {
|
|
return defaultCache.MustGetExpire(ctx, key)
|
|
}
|
|
|
|
// MustSize acts like Size, but it panics if any error occurs.
|
|
func MustSize(ctx context.Context) int {
|
|
return defaultCache.MustSize(ctx)
|
|
}
|
|
|
|
// MustData acts like Data, but it panics if any error occurs.
|
|
func MustData(ctx context.Context) map[any]any {
|
|
return defaultCache.MustData(ctx)
|
|
}
|
|
|
|
// MustKeys acts like Keys, but it panics if any error occurs.
|
|
func MustKeys(ctx context.Context) []any {
|
|
return defaultCache.MustKeys(ctx)
|
|
}
|
|
|
|
// MustKeyStrings acts like KeyStrings, but it panics if any error occurs.
|
|
func MustKeyStrings(ctx context.Context) []string {
|
|
return defaultCache.MustKeyStrings(ctx)
|
|
}
|
|
|
|
// MustValues acts like Values, but it panics if any error occurs.
|
|
func MustValues(ctx context.Context) []any {
|
|
return defaultCache.MustValues(ctx)
|
|
}
|