wip

Author: ndyakov

adapters.go

@@ -3,7 +3,6 @@ package redis
 import (
 	"context"
 	"errors"
-	"fmt"
 	"net"
 	"time"
 
@@ -23,11 +22,6 @@ func NewClientAdapter(client *baseClient) interfaces.ClientInterface {
 	return &clientAdapter{client: client}
 }
 
-// NewClusterClientAdapter creates a new client adapter for cluster Redis clients.
-func NewClusterClientAdapter(client interface{}) interfaces.ClientInterface {
-	return &clusterClientAdapter{client: client}
-}
-
 // clientAdapter adapts a Redis client to implement interfaces.ClientInterface.
 type clientAdapter struct {
 	client *baseClient
@@ -126,78 +120,6 @@ func (ca *connectionAdapter) ClearRelaxedTimeout() {
 	ca.conn.ClearRelaxedTimeout()
 }
 
-// clusterClientAdapter adapts a cluster client to implement interfaces.ClientInterface.
-type clusterClientAdapter struct {
-	client interface{}
-}
-
-// GetOptions returns the client options.
-func (cca *clusterClientAdapter) GetOptions() interfaces.OptionsInterface {
-	// Return a mock options adapter for cluster clients
-	return &mockClusterOptionsAdapter{}
-}
-
-// ExecuteCommand executes a command on the cluster client.
-func (cca *clusterClientAdapter) ExecuteCommand(ctx context.Context, cmd interface{}) error {
-	// Use reflection to call Process method on the cluster client
-	// This is a simplified implementation for the refactoring
-	return nil // Mock implementation
-}
-
-// GetPushProcessor returns the cluster client's push notification processor.
-func (cca *clusterClientAdapter) GetPushProcessor() interfaces.NotificationProcessor {
-	// For cluster clients, return a mock processor since the actual implementation
-	// would be more complex and distributed across nodes
-	return &mockClusterPushProcessor{}
-}
-
-// DialToEndpoint creates a connection to the specified endpoint for cluster clients.
-func (cca *clusterClientAdapter) DialToEndpoint(ctx context.Context, endpoint string) (interface{}, error) {
-	// For cluster clients, this would need to handle cluster-specific connection logic
-	// For now, return an error indicating this is not implemented for cluster clients
-	return nil, fmt.Errorf("DialToEndpoint not implemented for cluster clients")
-}
-
-// mockClusterOptionsAdapter is a mock implementation for cluster options.
-type mockClusterOptionsAdapter struct{}
-
-// GetReadTimeout returns the read timeout.
-func (mcoa *mockClusterOptionsAdapter) GetReadTimeout() time.Duration {
-	return 5 * time.Second
-}
-
-// GetWriteTimeout returns the write timeout.
-func (mcoa *mockClusterOptionsAdapter) GetWriteTimeout() time.Duration {
-	return 3 * time.Second
-}
-
-// GetAddr returns the connection address.
-func (mcoa *mockClusterOptionsAdapter) GetAddr() string {
-	return "localhost:6379"
-}
-
-// IsTLSEnabled returns true if TLS is enabled.
-func (mcoa *mockClusterOptionsAdapter) IsTLSEnabled() bool {
-	return false
-}
-
-// GetProtocol returns the protocol version.
-func (mcoa *mockClusterOptionsAdapter) GetProtocol() int {
-	return 3
-}
-
-// GetPoolSize returns the connection pool size.
-func (mcoa *mockClusterOptionsAdapter) GetPoolSize() int {
-	return 50 // Default cluster pool size (5 * runtime.GOMAXPROCS(0))
-}
-
-// NewDialer returns a new dialer function for the connection.
-func (mcoa *mockClusterOptionsAdapter) NewDialer() func(context.Context) (net.Conn, error) {
-	return func(ctx context.Context) (net.Conn, error) {
-		return nil, errors.New("mock cluster dialer")
-	}
-}
-
 // pushProcessorAdapter adapts a push.NotificationProcessor to implement interfaces.NotificationProcessor.
 type pushProcessorAdapter struct {
 	processor push.NotificationProcessor
@@ -220,21 +142,3 @@ func (ppa *pushProcessorAdapter) UnregisterHandler(pushNotificationName string)
 func (ppa *pushProcessorAdapter) GetHandler(pushNotificationName string) interface{} {
 	return ppa.processor.GetHandler(pushNotificationName)
 }
-
-// mockClusterPushProcessor is a mock implementation for cluster push processors.
-type mockClusterPushProcessor struct{}
-
-// RegisterHandler registers a handler (mock implementation).
-func (mcpp *mockClusterPushProcessor) RegisterHandler(pushNotificationName string, handler interface{}, protected bool) error {
-	return nil
-}
-
-// UnregisterHandler removes a handler (mock implementation).
-func (mcpp *mockClusterPushProcessor) UnregisterHandler(pushNotificationName string) error {
-	return nil
-}
-
-// GetHandler returns the handler (mock implementation).
-func (mcpp *mockClusterPushProcessor) GetHandler(pushNotificationName string) interface{} {
-	return nil
-}

commands.go

@@ -193,8 +193,7 @@ type Cmdable interface {
 	ClientID(ctx context.Context) *IntCmd
 	ClientUnblock(ctx context.Context, id int64) *IntCmd
 	ClientUnblockWithError(ctx context.Context, id int64) *IntCmd
-	ClientMaintNotifications(ctx context.Context, enabled bool, endpointType string) *StatusCmd
-	ClientMaintNotificationsInfo(ctx context.Context) *MapStringInterfaceCmd
+	ClientMaintNotifications(ctx context.Context, enabled bool, endpointType string, timeout int) *StatusCmd
 	ConfigGet(ctx context.Context, parameter string) *MapStringStringCmd
 	ConfigResetStat(ctx context.Context) *StatusCmd
 	ConfigSet(ctx context.Context, parameter, value string) *StatusCmd
@@ -520,34 +519,20 @@ func (c cmdable) ClientInfo(ctx context.Context) *ClientInfoCmd {
 	return cmd
 }
 
-// ClientMaintNotifications enables or disables maintenance push notifications.
-// This command is used for hitless upgrades to control whether the client
-// receives MOVING, MIGRATING, MIGRATED, FAILING_OVER, and FAILED_OVER notifications.
-func (c cmdable) ClientMaintNotifications(ctx context.Context, enabled bool, endpointType string) *StatusCmd {
+// ClientMaintNotifications enables or disables maintenance notifications for hitless upgrades.
+// When enabled, the client will receive push notifications about Redis maintenance events.
+func (c cmdable) ClientMaintNotifications(ctx context.Context, enabled bool, endpointType string, timeout int) *StatusCmd {
 	args := []interface{}{"client", "maint_notifications"}
-
 	if enabled {
-		args = append(args, "on")
-		if endpointType != "" {
-			args = append(args, "moving-endpoint-type", endpointType)
-		}
+		args = append(args, "on", endpointType, timeout)
 	} else {
 		args = append(args, "off")
 	}
-
 	cmd := NewStatusCmd(ctx, args...)
 	_ = c(ctx, cmd)
 	return cmd
 }
 
-// ClientMaintNotificationsInfo returns information about the current maintenance
-// notification configuration, similar to CLIENT TRACKINGINFO.
-func (c cmdable) ClientMaintNotificationsInfo(ctx context.Context) *MapStringInterfaceCmd {
-	cmd := NewMapStringInterfaceCmd(ctx, "client", "maint_notifications_info")
-	_ = c(ctx, cmd)
-	return cmd
-}
-
 // ------------------------------------------------------------------------------------------------
 
 func (c cmdable) ConfigGet(ctx context.Context, parameter string) *MapStringStringCmd {