zhangdeman/redis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cluster -> single

Browse Source
This commit is contained in:
白茶清欢
2024-06-20 18:38:23 +08:00
parent f11c0a8216
commit e8b63fb863
3 changed files with 16 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
client.go
View File

@ -28,14 +28,14 @@ var (
func init() {
Client = &OwnClient{
lock: &sync.RWMutex{},
instanceTable: make(map[string]*redisClient.ClusterClient),
instanceTable: make(map[string]*redisClient.Client),
whiteCommandTable: make(map[string]bool),
}
}
type OwnClient struct {
lock *sync.RWMutex
instanceTable map[string]*redisClient.ClusterClient
instanceTable map[string]*redisClient.Client
whiteCommandTable map[string]bool
logger *zap.Logger
}
@ -62,7 +62,7 @@ func (o *OwnClient) isAllowCommand(command string) bool {
// Date : 11:05 2024/6/19
func (o *OwnClient) Exec(ctx context.Context, instanceFlag string, command string, args ...any) *define.RedisResult {
var (
instance *redisClient.ClusterClient
instance *redisClient.Client
)
cmdParamList := []any{
@ -127,13 +127,13 @@ func (o *OwnClient) SetCommandWhiteList(commandList []string) {
}
}
func (o *OwnClient) GetRealClient(instanceFlag string) *redisClient.ClusterClient {
func (o *OwnClient) GetRealClient(instanceFlag string) *redisClient.Client {
o.lock.RLock()
defer o.lock.RUnlock()
return o.instanceTable[instanceFlag]
}
func (o *OwnClient) GetRealClientWithError(instanceFlag string) (*redisClient.ClusterClient, error) {
func (o *OwnClient) GetRealClientWithError(instanceFlag string) (*redisClient.Client, error) {
o.lock.RLock()
defer o.lock.RUnlock()
instance, exist := o.instanceTable[instanceFlag]
@ -143,17 +143,11 @@ func (o *OwnClient) GetRealClientWithError(instanceFlag string) (*redisClient.Cl
return instance, nil
}
func (o *OwnClient) AddClient(instanceFlag string, instanceConfig *define.ClusterOptions) error {
instance := redisClient.NewClusterClient(&redisClient.ClusterOptions{
Addrs: instanceConfig.Addrs,
// ClientName: instanceConfig.ClientName,
NewClient: nil,
MaxRedirects: instanceConfig.MaxRedirects,
ReadOnly: instanceConfig.ReadOnly,
RouteByLatency: instanceConfig.RouteByLatency,
RouteRandomly: instanceConfig.RouteRandomly,
ClusterSlots: nil,
Dialer: nil,
func (o *OwnClient) AddClient(instanceFlag string, instanceConfig *define.Options) error {
instance := redisClient.NewClient(&redisClient.Options{
Addr: instanceConfig.Addr,
ClientName: instanceConfig.ClientName,
Dialer: nil,
OnConnect: func(ctx context.Context, cn *redisClient.Conn) error {
return nil
},