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.
139 lines
5.2 KiB
Go
139 lines
5.2 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 gsession
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/gogf/gf/v2/container/gmap"
|
|
"github.com/gogf/gf/v2/database/gredis"
|
|
"github.com/gogf/gf/v2/internal/intlog"
|
|
)
|
|
|
|
// StorageRedisHashTable implements the Session Storage interface with redis hash table.
|
|
type StorageRedisHashTable struct {
|
|
StorageBase
|
|
redis *gredis.Redis // Redis client for session storage.
|
|
prefix string // Redis key prefix for session id.
|
|
}
|
|
|
|
// NewStorageRedisHashTable creates and returns a redis hash table storage object for session.
|
|
func NewStorageRedisHashTable(redis *gredis.Redis, prefix ...string) *StorageRedisHashTable {
|
|
if redis == nil {
|
|
panic("redis instance for storage cannot be empty")
|
|
return nil
|
|
}
|
|
s := &StorageRedisHashTable{
|
|
redis: redis,
|
|
}
|
|
if len(prefix) > 0 && prefix[0] != "" {
|
|
s.prefix = prefix[0]
|
|
}
|
|
return s
|
|
}
|
|
|
|
// Get retrieves session value with given key.
|
|
// It returns nil if the key does not exist in the session.
|
|
func (s *StorageRedisHashTable) Get(ctx context.Context, sessionId string, key string) (value any, err error) {
|
|
v, err := s.redis.HGet(ctx, s.sessionIdToRedisKey(sessionId), key)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if v.IsNil() {
|
|
return nil, nil
|
|
}
|
|
return v.String(), nil
|
|
}
|
|
|
|
// Data retrieves all key-value pairs as map from storage.
|
|
func (s *StorageRedisHashTable) Data(ctx context.Context, sessionId string) (data map[string]any, err error) {
|
|
m, err := s.redis.HGetAll(ctx, s.sessionIdToRedisKey(sessionId))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return m.Map(), nil
|
|
}
|
|
|
|
// GetSize retrieves the size of key-value pairs from storage.
|
|
func (s *StorageRedisHashTable) GetSize(ctx context.Context, sessionId string) (size int, err error) {
|
|
v, err := s.redis.HLen(ctx, s.sessionIdToRedisKey(sessionId))
|
|
return int(v), err
|
|
}
|
|
|
|
// Set sets key-value session pair to the storage.
|
|
// The parameter `ttl` specifies the TTL for the session id (not for the key-value pair).
|
|
func (s *StorageRedisHashTable) Set(ctx context.Context, sessionId string, key string, value any, ttl time.Duration) error {
|
|
_, err := s.redis.HSet(ctx, s.sessionIdToRedisKey(sessionId), map[string]any{
|
|
key: value,
|
|
})
|
|
return err
|
|
}
|
|
|
|
// SetMap batch sets key-value session pairs with map to the storage.
|
|
// The parameter `ttl` specifies the TTL for the session id(not for the key-value pair).
|
|
func (s *StorageRedisHashTable) SetMap(ctx context.Context, sessionId string, data map[string]any, ttl time.Duration) error {
|
|
err := s.redis.HMSet(ctx, s.sessionIdToRedisKey(sessionId), data)
|
|
return err
|
|
}
|
|
|
|
// Remove deletes key with its value from storage.
|
|
func (s *StorageRedisHashTable) Remove(ctx context.Context, sessionId string, key string) error {
|
|
_, err := s.redis.HDel(ctx, s.sessionIdToRedisKey(sessionId), key)
|
|
return err
|
|
}
|
|
|
|
// RemoveAll deletes all key-value pairs from storage.
|
|
func (s *StorageRedisHashTable) RemoveAll(ctx context.Context, sessionId string) error {
|
|
_, err := s.redis.Del(ctx, s.sessionIdToRedisKey(sessionId))
|
|
return err
|
|
}
|
|
|
|
// GetSession returns the session data as *gmap.StrAnyMap for given session id from storage.
|
|
//
|
|
// The parameter `ttl` specifies the TTL for this session, and it returns nil if the TTL is exceeded.
|
|
// The parameter `data` is the current old session data stored in memory,
|
|
// and for some storage it might be nil if memory storage is disabled.
|
|
//
|
|
// This function is called ever when session starts.
|
|
func (s *StorageRedisHashTable) GetSession(ctx context.Context, sessionId string, ttl time.Duration) (*gmap.StrAnyMap, error) {
|
|
intlog.Printf(ctx, "StorageRedisHashTable.GetSession: %s, %v", sessionId, ttl)
|
|
v, err := s.redis.Exists(ctx, s.sessionIdToRedisKey(sessionId))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if v > 0 {
|
|
// It does not store the session data in memory, it so returns an empty map.
|
|
// It retrieves session data items directly through redis server each time.
|
|
return gmap.NewStrAnyMap(true), nil
|
|
}
|
|
return nil, nil
|
|
}
|
|
|
|
// SetSession updates the data map for specified session id.
|
|
// This function is called ever after session, which is changed dirty, is closed.
|
|
// This copy all session data map from memory to storage.
|
|
func (s *StorageRedisHashTable) SetSession(ctx context.Context, sessionId string, sessionData *gmap.StrAnyMap, ttl time.Duration) error {
|
|
intlog.Printf(ctx, "StorageRedisHashTable.SetSession: %s, %v", sessionId, ttl)
|
|
_, err := s.redis.Expire(ctx, s.sessionIdToRedisKey(sessionId), int64(ttl.Seconds()))
|
|
return err
|
|
}
|
|
|
|
// UpdateTTL updates the TTL for specified session id.
|
|
// This function is called ever after session, which is not dirty, is closed.
|
|
// It just adds the session id to the async handling queue.
|
|
func (s *StorageRedisHashTable) UpdateTTL(ctx context.Context, sessionId string, ttl time.Duration) error {
|
|
intlog.Printf(ctx, "StorageRedisHashTable.UpdateTTL: %s, %v", sessionId, ttl)
|
|
_, err := s.redis.Expire(ctx, s.sessionIdToRedisKey(sessionId), int64(ttl.Seconds()))
|
|
return err
|
|
}
|
|
|
|
// sessionIdToRedisKey converts and returns the redis key for given session id.
|
|
func (s *StorageRedisHashTable) sessionIdToRedisKey(sessionId string) string {
|
|
return s.prefix + sessionId
|
|
}
|