Skip to content

Commit 0c5c4b8

Browse files
rueianrueian
committed
feat: bump v1.0.24
1 parent 5cacd16 commit 0c5c4b8

File tree

5 files changed

+53
-53
lines changed

5 files changed

+53
-53
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ module mymodule
460460
461461
go 1.18
462462
463-
require github.com/redis/rueidis v1.0.23-go1.18
463+
require github.com/redis/rueidis v1.0.24-go1.18
464464
```
465465

466466
## Contributing

‎mux_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ func TestNewMux(t *testing.T) {
7878
})
7979
mock.Expect("CLIENT", "TRACKING", "ON", "OPTIN").
8080
ReplyString("OK")
81-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
81+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
8282
ReplyError("UNKNOWN COMMAND")
83-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
83+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
8484
ReplyError("UNKNOWN COMMAND")
8585
mock.Expect("PING").ReplyString("OK")
8686
mock.Close()

‎pipe.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"github.com/redis/rueidis/internal/util"
2020
)
2121

22-
const LIB_NAME = "rueidis"
23-
const LIB_VER = "1.0.23"
22+
const LibName = "rueidis"
23+
const LibVer = "1.0.24"
2424

2525
var noHello = regexp.MustCompile("unknown command .?(HELLO|hello).?")
2626

@@ -201,7 +201,7 @@ func _newPipe(connFn func() (net.Conn, error), option *ClientOption, r2ps bool)
201201
if len(option.ClientSetInfo) == 2 {
202202
init = append(init, []string{"CLIENT", "SETINFO", "LIB-NAME", option.ClientSetInfo[0]}, []string{"CLIENT", "SETINFO", "LIB-VER", option.ClientSetInfo[1]})
203203
} else {
204-
init = append(init, []string{"CLIENT", "SETINFO", "LIB-NAME", LIB_NAME}, []string{"CLIENT", "SETINFO", "LIB-VER", LIB_VER})
204+
init = append(init, []string{"CLIENT", "SETINFO", "LIB-NAME", LibName}, []string{"CLIENT", "SETINFO", "LIB-VER", LibVer})
205205
}
206206

207207
timeout := option.Dialer.Timeout
@@ -282,7 +282,7 @@ func _newPipe(connFn func() (net.Conn, error), option *ClientOption, r2ps bool)
282282
if len(option.ClientSetInfo) == 2 {
283283
init = append(init, []string{"CLIENT", "SETINFO", "LIB-NAME", option.ClientSetInfo[0]}, []string{"CLIENT", "SETINFO", "LIB-VER", option.ClientSetInfo[1]})
284284
} else {
285-
init = append(init, []string{"CLIENT", "SETINFO", "LIB-NAME", LIB_NAME}, []string{"CLIENT", "SETINFO", "LIB-VER", LIB_VER})
285+
init = append(init, []string{"CLIENT", "SETINFO", "LIB-NAME", LibName}, []string{"CLIENT", "SETINFO", "LIB-VER", LibVer})
286286
}
287287
p.version = 5
288288
if len(init) != 0 {

‎pipe_test.go

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@ func setup(t *testing.T, option ClientOption) (*pipe, *redisMock, func(), func()
146146
mock.Expect("CLIENT", "TRACKING", "ON", "OPTIN").
147147
ReplyString("OK")
148148
}
149-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
149+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
150150
ReplyError("UNKNOWN COMMAND")
151-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
151+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
152152
ReplyError("UNKNOWN COMMAND")
153153
}()
154154
p, err := newPipe(func() (net.Conn, error) { return n1, nil }, &option)
@@ -283,9 +283,9 @@ func TestNewPipe(t *testing.T) {
283283
ReplyString("OK")
284284
mock.Expect("SELECT", "1").
285285
ReplyString("OK")
286-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
286+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
287287
ReplyError("UNKNOWN COMMAND")
288-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
288+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
289289
ReplyError("UNKNOWN COMMAND")
290290
}()
291291
p, err := newPipe(func() (net.Conn, error) { return n1, nil }, &ClientOption{
@@ -319,9 +319,9 @@ func TestNewPipe(t *testing.T) {
319319
ReplyString("OK")
320320
mock.Expect("SELECT", "1").
321321
ReplyString("OK")
322-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
322+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
323323
ReplyError("UNKNOWN COMMAND")
324-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
324+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
325325
ReplyError("UNKNOWN COMMAND")
326326
}()
327327
p, err := newPipe(func() (net.Conn, error) { return n1, nil }, &ClientOption{
@@ -357,9 +357,9 @@ func TestNewPipe(t *testing.T) {
357357
})
358358
mock.Expect("CLIENT", "TRACKING", "ON", "OPTIN", "NOLOOP").
359359
ReplyString("OK")
360-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
360+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
361361
ReplyError("UNKNOWN COMMAND")
362-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
362+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
363363
ReplyError("UNKNOWN COMMAND")
364364
}()
365365
p, err := newPipe(func() (net.Conn, error) { return n1, nil }, &ClientOption{
@@ -392,9 +392,9 @@ func TestNewPipe(t *testing.T) {
392392
ReplyString("OK")
393393
mock.Expect("READONLY").
394394
ReplyString("OK")
395-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
395+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
396396
ReplyError("UNKNOWN COMMAND")
397-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
397+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
398398
ReplyError("UNKNOWN COMMAND")
399399
}()
400400
p, err := newPipe(func() (net.Conn, error) { return n1, nil }, &ClientOption{
@@ -431,9 +431,9 @@ func TestNewPipe(t *testing.T) {
431431
ReplyString("OK")
432432
mock.Expect("READONLY").
433433
ReplyError("This instance has cluster support disabled")
434-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
434+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
435435
ReplyError("UNKNOWN COMMAND")
436-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
436+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
437437
ReplyError("UNKNOWN COMMAND")
438438
}()
439439
p, err := newPipe(func() (net.Conn, error) { return n1, nil }, &ClientOption{
@@ -490,9 +490,9 @@ func TestNewRESP2Pipe(t *testing.T) {
490490
ReplyError("ERR unknown command `HELLO`")
491491
mock.Expect("CLIENT", "TRACKING", "ON", "OPTIN").
492492
ReplyError("ERR unknown subcommand or wrong number of arguments for 'TRACKING'. Try CLIENT HELP")
493-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
493+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
494494
ReplyError("UNKNOWN COMMAND")
495-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
495+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
496496
ReplyError("UNKNOWN COMMAND")
497497
mock.Expect("PING").ReplyString("OK")
498498
}()
@@ -511,9 +511,9 @@ func TestNewRESP2Pipe(t *testing.T) {
511511
ReplyError("ERR unknown command `HELLO`")
512512
mock.Expect("CLIENT", "TRACKING", "ON", "OPTIN").
513513
ReplyString("OK")
514-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
514+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
515515
ReplyError("UNKNOWN COMMAND")
516-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
516+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
517517
ReplyError("UNKNOWN COMMAND")
518518
mock.Expect("PING").ReplyString("OK")
519519
}()
@@ -535,9 +535,9 @@ func TestNewRESP2Pipe(t *testing.T) {
535535
{typ: '+', string: "proto"},
536536
{typ: ':', integer: 2},
537537
}})
538-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
538+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
539539
ReplyError("UNKNOWN COMMAND")
540-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
540+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
541541
ReplyError("UNKNOWN COMMAND")
542542
}()
543543
p, err := newPipe(func() (net.Conn, error) { return n1, nil }, &ClientOption{
@@ -563,19 +563,19 @@ func TestNewRESP2Pipe(t *testing.T) {
563563
ReplyError("ERR unknown command `HELLO`")
564564
mock.Expect("SELECT", "1").
565565
ReplyError("ERR ACL")
566-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
566+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
567567
ReplyError("UNKNOWN COMMAND")
568-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
568+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
569569
ReplyError("UNKNOWN COMMAND")
570570
mock.Expect("AUTH", "pa").
571571
ReplyString("OK")
572572
mock.Expect("CLIENT", "SETNAME", "cn").
573573
ReplyString("OK")
574574
mock.Expect("SELECT", "1").
575575
ReplyString("OK")
576-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
576+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
577577
ReplyError("UNKNOWN COMMAND")
578-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
578+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
579579
ReplyError("UNKNOWN COMMAND")
580580
}()
581581
p, err := newPipe(func() (net.Conn, error) { return n1, nil }, &ClientOption{
@@ -604,19 +604,19 @@ func TestNewRESP2Pipe(t *testing.T) {
604604
ReplyError("ERR unknown command `HELLO`")
605605
mock.Expect("SELECT", "1").
606606
ReplyError("ERR ACL")
607-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
607+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
608608
ReplyError("UNKNOWN COMMAND")
609-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
609+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
610610
ReplyError("UNKNOWN COMMAND")
611611
mock.Expect("AUTH", "ua", "pa").
612612
ReplyString("OK")
613613
mock.Expect("CLIENT", "SETNAME", "cn").
614614
ReplyString("OK")
615615
mock.Expect("SELECT", "1").
616616
ReplyString("OK")
617-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
617+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
618618
ReplyError("UNKNOWN COMMAND")
619-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
619+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
620620
ReplyError("UNKNOWN COMMAND")
621621
}()
622622
p, err := newPipe(func() (net.Conn, error) { return n1, nil }, &ClientOption{
@@ -648,9 +648,9 @@ func TestNewRESP2Pipe(t *testing.T) {
648648
ReplyError("ERR ACL")
649649
mock.Expect("READONLY").
650650
ReplyError("ERR ACL")
651-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
651+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
652652
ReplyError("UNKNOWN COMMAND")
653-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
653+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
654654
ReplyError("UNKNOWN COMMAND")
655655
mock.Expect("AUTH", "pa").
656656
ReplyString("OK")
@@ -660,9 +660,9 @@ func TestNewRESP2Pipe(t *testing.T) {
660660
ReplyString("OK")
661661
mock.Expect("READONLY").
662662
ReplyString("OK")
663-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
663+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
664664
ReplyError("UNKNOWN COMMAND")
665-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
665+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
666666
ReplyError("UNKNOWN COMMAND")
667667
}()
668668
p, err := newPipe(func() (net.Conn, error) { return n1, nil }, &ClientOption{
@@ -694,9 +694,9 @@ func TestNewRESP2Pipe(t *testing.T) {
694694
ReplyError("ERR ACL")
695695
mock.Expect("READONLY").
696696
ReplyError("ERR ACL")
697-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
697+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
698698
ReplyError("UNKNOWN COMMAND")
699-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
699+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
700700
ReplyError("UNKNOWN COMMAND")
701701
mock.Expect("AUTH", "pa").
702702
ReplyString("OK")
@@ -706,9 +706,9 @@ func TestNewRESP2Pipe(t *testing.T) {
706706
ReplyString("OK")
707707
mock.Expect("READONLY").
708708
ReplyError("This instance has cluster support disabled")
709-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
709+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
710710
ReplyError("UNKNOWN COMMAND")
711-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
711+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
712712
ReplyError("UNKNOWN COMMAND")
713713
}()
714714
p, err := newPipe(func() (net.Conn, error) { return n1, nil }, &ClientOption{
@@ -738,9 +738,9 @@ func TestNewRESP2Pipe(t *testing.T) {
738738
ReplyError("ERR unknown command `HELLO`")
739739
mock.Expect("SELECT", "1").
740740
ReplyError("ERR ACL")
741-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
741+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
742742
ReplyError("UNKNOWN COMMAND")
743-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
743+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
744744
ReplyError("UNKNOWN COMMAND")
745745
n1.Close()
746746
n2.Close()

‎rueidis_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ func TestNewClusterClient(t *testing.T) {
7777
return
7878
}
7979
slots, _ := slotsResp.ToMessage()
80-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
80+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
8181
ReplyError("UNKNOWN COMMAND")
82-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
82+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
8383
ReplyError("UNKNOWN COMMAND")
8484
mock.Expect("CLUSTER", "SLOTS").Reply(slots)
8585
mock.Close()
@@ -114,9 +114,9 @@ func TestNewClusterClientError(t *testing.T) {
114114
if err != nil {
115115
return
116116
}
117-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
117+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
118118
ReplyError("UNKNOWN COMMAND")
119-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
119+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
120120
ReplyError("UNKNOWN COMMAND")
121121
mock.Expect("CLUSTER", "SLOTS").Reply(RedisMessage{typ: '-', string: "other error"})
122122
mock.Expect("PING").ReplyString("OK")
@@ -171,9 +171,9 @@ func TestFallBackSingleClient(t *testing.T) {
171171
if err != nil {
172172
return
173173
}
174-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
174+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
175175
ReplyError("UNKNOWN COMMAND")
176-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
176+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
177177
ReplyError("UNKNOWN COMMAND")
178178
mock.Expect("CLUSTER", "SLOTS").Reply(RedisMessage{typ: '-', string: "ERR This instance has cluster support disabled"})
179179
mock.Expect("PING").ReplyString("OK")
@@ -208,9 +208,9 @@ func TestForceSingleClient(t *testing.T) {
208208
if err != nil {
209209
return
210210
}
211-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
211+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
212212
ReplyError("UNKNOWN COMMAND")
213-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
213+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
214214
ReplyError("UNKNOWN COMMAND")
215215
mock.Expect("PING").ReplyString("OK")
216216
mock.Close()
@@ -290,9 +290,9 @@ func TestTLSClient(t *testing.T) {
290290
if err != nil {
291291
return
292292
}
293-
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME).
293+
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
294294
ReplyError("UNKNOWN COMMAND")
295-
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LIB_VER).
295+
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
296296
ReplyError("UNKNOWN COMMAND")
297297
mock.Expect("CLUSTER", "SLOTS").Reply(RedisMessage{typ: '-', string: "ERR This instance has cluster support disabled"})
298298
mock.Expect("PING").ReplyString("OK")

0 commit comments

Comments
 (0)