Skip to content

Commit 1ad61f9

Browse files
committed
fix: rm mode from struct
Signed-off-by: Cheyu Wu <[email protected]>
1 parent 1c2c2e9 commit 1ad61f9

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

client.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ type singleClient struct {
1616
cmd Builder
1717
retry bool
1818
DisableCache bool
19-
mode ClientMode
2019
}
2120

2221
func newSingleClient(opt *ClientOption, prev conn, connFn connFn, retryer retryHandler) (*singleClient, error) {
@@ -37,7 +36,7 @@ func newSingleClient(opt *ClientOption, prev conn, connFn connFn, retryer retryH
3736
}
3837

3938
func newSingleClientWithConn(conn conn, builder Builder, retry, disableCache bool, retryer retryHandler) *singleClient {
40-
return &singleClient{cmd: builder, conn: conn, retry: retry, retryHandler: retryer, DisableCache: disableCache, mode: ClientModeStandalone}
39+
return &singleClient{cmd: builder, conn: conn, retry: retry, retryHandler: retryer, DisableCache: disableCache}
4140
}
4241

4342
func (c *singleClient) B() Builder {
@@ -191,7 +190,7 @@ func (c *singleClient) Nodes() map[string]Client {
191190
}
192191

193192
func (c *singleClient) Mode() ClientMode {
194-
return c.mode
193+
return ClientModeStandalone
195194
}
196195

197196
func (c *singleClient) Close() {

cluster.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ type clusterClient struct {
3535
stop uint32
3636
cmd Builder
3737
retry bool
38-
mode ClientMode
3938
}
4039

4140
// NOTE: connrole and conn must be initialized at the same time
@@ -58,7 +57,6 @@ func newClusterClient(opt *ClientOption, connFn connFn, retryer retryHandler) (*
5857
retry: !opt.DisableRetry,
5958
retryHandler: retryer,
6059
stopCh: make(chan struct{}),
61-
mode: ClientModeCluster,
6260
}
6361

6462
if opt.ReplicaOnly && opt.SendToReplicas != nil {
@@ -1206,7 +1204,7 @@ func (c *clusterClient) Nodes() map[string]Client {
12061204
}
12071205

12081206
func (c *clusterClient) Mode() ClientMode {
1209-
return c.mode
1207+
return ClientModeCluster
12101208
}
12111209

12121210
func (c *clusterClient) Close() {

sentinel.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ func newSentinelClient(opt *ClientOption, connFn connFn, retryer retryHandler) (
2626
retry: !opt.DisableRetry,
2727
retryHandler: retryer,
2828
replica: opt.ReplicaOnly,
29-
mode: ClientModeSentinel,
3029
}
3130

3231
for _, sentinel := range opt.InitAddress {
@@ -57,7 +56,6 @@ type sentinelClient struct {
5756
cmd Builder
5857
retry bool
5958
replica bool
60-
mode ClientMode
6159
}
6260

6361
func (c *sentinelClient) B() Builder {
@@ -221,7 +219,7 @@ func (c *sentinelClient) Nodes() map[string]Client {
221219
}
222220

223221
func (c *sentinelClient) Mode() ClientMode {
224-
return c.mode
222+
return ClientModeSentinel
225223
}
226224

227225
func (c *sentinelClient) Close() {

0 commit comments

Comments
 (0)