Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: let clusterclient respect the option.PipelineMultiplex #418

Merged
merged 2 commits into from
Dec 10, 2023
Merged

feat: let clusterclient respect the option.PipelineMultiplex #418

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e06396c
feat: let clusterclient respect the option.PipelineMultiplex
rueian Dec 10, 2023
5ca6ad6
docs: let clusterclient respect the option.PipelineMultiplex
rueian Dec 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions rueidis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ type ClientOption struct {

// PipelineMultiplex determines how many tcp connections used to pipeline commands to one redis instance.
// The default for single and sentinel clients is 2, which means 4 connections (2^2).
// For cluster client, PipelineMultiplex doesn't have any effect.
// The default for cluster clients is 0, which means 1 connection (2^0).
PipelineMultiplex int

// ConnWriteTimeout is applied net.Conn.SetWriteDeadline and periodic PING to redis
Expand Down Expand Up @@ -317,19 +317,16 @@ func NewClient(option ClientOption) (client Client, err error) {
option.PipelineMultiplex = singleClientMultiplex(option.PipelineMultiplex)
return newSentinelClient(&option, makeConn)
}
pmbk := option.PipelineMultiplex
option.PipelineMultiplex = 0 // PipelineMultiplex is meaningless for cluster client

if option.ForceSingleClient {
option.PipelineMultiplex = singleClientMultiplex(pmbk)
option.PipelineMultiplex = singleClientMultiplex(option.PipelineMultiplex)
return newSingleClient(&option, nil, makeConn)
}
if client, err = newClusterClient(&option, makeConn); err != nil {
if client == (*clusterClient)(nil) {
return nil, err
}
if len(option.InitAddress) == 1 && (err.Error() == redisErrMsgCommandNotAllow || strings.Contains(strings.ToUpper(err.Error()), "CLUSTER")) {
option.PipelineMultiplex = singleClientMultiplex(pmbk)
option.PipelineMultiplex = singleClientMultiplex(option.PipelineMultiplex)
client, err = newSingleClient(&option, client.(*clusterClient).single(), makeConn)
} else {
client.Close()
Expand Down