Fix merge conflict

Signed-off-by: EdricCua <[email protected]>

go/api/command_options.go

@@ -462,70 +462,3 @@ func (opts *CopyOptions) toArgs() ([]string, error) {
 	}
 	return args, err
 }
-
-// Optional arguments for `Info` for standalone client
-type EchoOptions struct {
-	// A list of [Section] values specifying which sections of information to retrieve.
-	// When no parameter is provided, [Section.Default] is assumed.
-	// Starting with server version 7.0.0 `INFO` command supports multiple sections.
-	Sections []Section
-}
-
-type Section string
-
-const (
-	// SERVER: General information about the server
-	Server Section = "server"
-	// CLIENTS: Client connections section
-	Clients Section = "clients"
-	// MEMORY: Memory consumption related information
-	Memory Section = "memory"
-	// PERSISTENCE: RDB and AOF related information
-	Persistence Section = "persistence"
-	// STATS: General statistics
-	Stats Section = "stats"
-	// REPLICATION: Master/replica replication information
-	Replication Section = "replication"
-	// CPU: CPU consumption statistics
-	Cpu Section = "cpu"
-	// COMMANDSTATS: Valkey command statistics
-	Commandstats Section = "commandstats"
-	// LATENCYSTATS: Valkey command latency percentile distribution statistics
-	Latencystats Section = "latencystats"
-	// SENTINEL: Valkey Sentinel section (only applicable to Sentinel instances)
-	Sentinel Section = "sentinel"
-	// CLUSTER: Valkey Cluster section
-	Cluster Section = "cluster"
-	// MODULES: Modules section
-	Modules Section = "modules"
-	// KEYSPACE: Database related statistics
-	Keyspace Section = "keyspace"
-	// ERRORSTATS: Valkey error statistics
-	Errorstats Section = "errorstats"
-	// ALL: Return all sections (excluding module generated ones)
-	All Section = "all"
-	// DEFAULT: Return only the default set of sections
-	Default Section = "default"
-	// EVERYTHING: Includes all and modules
-	Everything Section = "everything"
-)
-
-// Optional arguments for `Echo` for cluster client
-type ClusterEchoOptions struct {
-	*EchoOptions
-	// Specifies the routing configuration for the command.
-	// The client will route the command to the nodes defined by `Route`.
-	// The command will be routed to all primary nodes, unless `Route` is provided.
-	Route *config.Route
-}
-
-func (opts *EchoOptions) ToArgs() []string {
-	if opts == nil {
-		return []string{}
-	}
-	args := make([]string, 0, len(opts.Sections))
-	for _, section := range opts.Sections {
-		args = append(args, string(section))
-	}
-	return args
-}

go/api/glide_cluster_client.go

@@ -18,7 +18,6 @@ type GlideClusterClientCommands interface {
 	BaseClient
 	GenericClusterCommands
 	ServerManagementClusterCommands
-	ConnectionManagementClusterCommands
 }
 
 // GlideClusterClient implements cluster mode operations by extending baseClient functionality.