Skip to content

Commit 2af9e02

Browse files
alicebobalicebob
authored
Merge pull request #407 from alicebob/consts
constants for key types
2 parents dd31bf6 + f2de203 commit 2af9e02

File tree

13 files changed

+178
-168
lines changed

13 files changed

+178
-168
lines changed

‎cmd_geo.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (m *Miniredis) cmdGeoadd(c *server.Peer, cmd string, args []string) {
4040
withTx(m, c, func(c *server.Peer, ctx *connCtx) {
4141
db := m.db(ctx.selectedDB)
4242

43-
if db.exists(key) && db.t(key) != "zset" {
43+
if db.exists(key) && db.t(key) != keyTypeSortedSet {
4444
c.WriteError(ErrWrongType.Error())
4545
return
4646
}
@@ -103,7 +103,7 @@ func (m *Miniredis) cmdGeodist(c *server.Peer, cmd string, args []string) {
103103
c.WriteNull()
104104
return
105105
}
106-
if db.t(key) != "zset" {
106+
if db.t(key) != keyTypeSortedSet {
107107
c.WriteError(ErrWrongType.Error())
108108
return
109109
}
@@ -157,7 +157,7 @@ func (m *Miniredis) cmdGeopos(c *server.Peer, cmd string, args []string) {
157157
withTx(m, c, func(c *server.Peer, ctx *connCtx) {
158158
db := m.db(ctx.selectedDB)
159159

160-
if db.exists(key) && db.t(key) != "zset" {
160+
if db.exists(key) && db.t(key) != keyTypeSortedSet {
161161
c.WriteError(ErrWrongType.Error())
162162
return
163163
}
@@ -495,7 +495,7 @@ func (m *Miniredis) cmdGeoradiusbymember(c *server.Peer, cmd string, args []stri
495495
return
496496
}
497497

498-
if db.t(opts.key) != "zset" {
498+
if db.t(opts.key) != keyTypeSortedSet {
499499
c.WriteError(ErrWrongType.Error())
500500
return
501501
}

‎cmd_hash.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func (m *Miniredis) cmdHset(c *server.Peer, cmd string, args []string) {
5454
return
5555
}
5656

57-
if t, ok := db.keys[key]; ok && t != "hash" {
57+
if t, ok := db.keys[key]; ok && t != keyTypeHash {
5858
c.WriteError(msgWrongType)
5959
return
6060
}
@@ -91,14 +91,14 @@ func (m *Miniredis) cmdHsetnx(c *server.Peer, cmd string, args []string) {
9191
withTx(m, c, func(c *server.Peer, ctx *connCtx) {
9292
db := m.db(ctx.selectedDB)
9393

94-
if t, ok := db.keys[opts.key]; ok && t != "hash" {
94+
if t, ok := db.keys[opts.key]; ok && t != keyTypeHash {
9595
c.WriteError(msgWrongType)
9696
return
9797
}
9898

9999
if _, ok := db.hashKeys[opts.key]; !ok {
100100
db.hashKeys[opts.key] = map[string]string{}
101-
db.keys[opts.key] = "hash"
101+
db.keys[opts.key] = keyTypeHash
102102
}
103103
_, ok := db.hashKeys[opts.key][opts.field]
104104
if ok {
@@ -135,7 +135,7 @@ func (m *Miniredis) cmdHmset(c *server.Peer, cmd string, args []string) {
135135
withTx(m, c, func(c *server.Peer, ctx *connCtx) {
136136
db := m.db(ctx.selectedDB)
137137

138-
if t, ok := db.keys[key]; ok && t != "hash" {
138+
if t, ok := db.keys[key]; ok && t != keyTypeHash {
139139
c.WriteError(msgWrongType)
140140
return
141141
}
@@ -173,7 +173,7 @@ func (m *Miniredis) cmdHget(c *server.Peer, cmd string, args []string) {
173173
c.WriteNull()
174174
return
175175
}
176-
if t != "hash" {
176+
if t != keyTypeHash {
177177
c.WriteError(msgWrongType)
178178
return
179179
}
@@ -217,7 +217,7 @@ func (m *Miniredis) cmdHdel(c *server.Peer, cmd string, args []string) {
217217
c.WriteInt(0)
218218
return
219219
}
220-
if t != "hash" {
220+
if t != keyTypeHash {
221221
c.WriteError(msgWrongType)
222222
return
223223
}
@@ -270,7 +270,7 @@ func (m *Miniredis) cmdHexists(c *server.Peer, cmd string, args []string) {
270270
c.WriteInt(0)
271271
return
272272
}
273-
if t != "hash" {
273+
if t != keyTypeHash {
274274
c.WriteError(msgWrongType)
275275
return
276276
}
@@ -307,7 +307,7 @@ func (m *Miniredis) cmdHgetall(c *server.Peer, cmd string, args []string) {
307307
c.WriteMapLen(0)
308308
return
309309
}
310-
if t != "hash" {
310+
if t != keyTypeHash {
311311
c.WriteError(msgWrongType)
312312
return
313313
}
@@ -343,7 +343,7 @@ func (m *Miniredis) cmdHkeys(c *server.Peer, cmd string, args []string) {
343343
c.WriteLen(0)
344344
return
345345
}
346-
if db.t(key) != "hash" {
346+
if db.t(key) != keyTypeHash {
347347
c.WriteError(msgWrongType)
348348
return
349349
}
@@ -380,7 +380,7 @@ func (m *Miniredis) cmdHstrlen(c *server.Peer, cmd string, args []string) {
380380
c.WriteInt(0)
381381
return
382382
}
383-
if t != "hash" {
383+
if t != keyTypeHash {
384384
c.WriteError(msgWrongType)
385385
return
386386
}
@@ -414,7 +414,7 @@ func (m *Miniredis) cmdHvals(c *server.Peer, cmd string, args []string) {
414414
c.WriteLen(0)
415415
return
416416
}
417-
if t != "hash" {
417+
if t != keyTypeHash {
418418
c.WriteError(msgWrongType)
419419
return
420420
}
@@ -451,7 +451,7 @@ func (m *Miniredis) cmdHlen(c *server.Peer, cmd string, args []string) {
451451
c.WriteInt(0)
452452
return
453453
}
454-
if t != "hash" {
454+
if t != keyTypeHash {
455455
c.WriteError(msgWrongType)
456456
return
457457
}
@@ -479,7 +479,7 @@ func (m *Miniredis) cmdHmget(c *server.Peer, cmd string, args []string) {
479479
withTx(m, c, func(c *server.Peer, ctx *connCtx) {
480480
db := m.db(ctx.selectedDB)
481481

482-
if t, ok := db.keys[key]; ok && t != "hash" {
482+
if t, ok := db.keys[key]; ok && t != keyTypeHash {
483483
c.WriteError(msgWrongType)
484484
return
485485
}
@@ -530,7 +530,7 @@ func (m *Miniredis) cmdHincrby(c *server.Peer, cmd string, args []string) {
530530
withTx(m, c, func(c *server.Peer, ctx *connCtx) {
531531
db := m.db(ctx.selectedDB)
532532

533-
if t, ok := db.keys[opts.key]; ok && t != "hash" {
533+
if t, ok := db.keys[opts.key]; ok && t != keyTypeHash {
534534
c.WriteError(msgWrongType)
535535
return
536536
}
@@ -577,7 +577,7 @@ func (m *Miniredis) cmdHincrbyfloat(c *server.Peer, cmd string, args []string) {
577577
withTx(m, c, func(c *server.Peer, ctx *connCtx) {
578578
db := m.db(ctx.selectedDB)
579579

580-
if t, ok := db.keys[opts.key]; ok && t != "hash" {
580+
if t, ok := db.keys[opts.key]; ok && t != keyTypeHash {
581581
c.WriteError(msgWrongType)
582582
return
583583
}
@@ -662,7 +662,7 @@ func (m *Miniredis) cmdHscan(c *server.Peer, cmd string, args []string) {
662662
c.WriteLen(0) // no elements
663663
return
664664
}
665-
if db.exists(opts.key) && db.t(opts.key) != "hash" {
665+
if db.exists(opts.key) && db.t(opts.key) != keyTypeHash {
666666
c.WriteError(ErrWrongType.Error())
667667
return
668668
}

‎cmd_hll.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func (m *Miniredis) cmdPfadd(c *server.Peer, cmd string, args []string) {
2828
withTx(m, c, func(c *server.Peer, ctx *connCtx) {
2929
db := m.db(ctx.selectedDB)
3030

31-
if db.exists(key) && db.t(key) != "hll" {
31+
if db.exists(key) && db.t(key) != keyTypeHll {
3232
c.WriteError(ErrNotValidHllValue.Error())
3333
return
3434
}

‎cmd_list.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func (m *Miniredis) cmdBXpop(c *server.Peer, cmd string, args []string, lr leftr
8484
if !db.exists(key) {
8585
continue
8686
}
87-
if db.t(key) != "list" {
87+
if db.t(key) != keyTypeList {
8888
c.WriteError(msgWrongType)
8989
return true
9090
}
@@ -145,7 +145,7 @@ func (m *Miniredis) cmdLindex(c *server.Peer, cmd string, args []string) {
145145
c.WriteNull()
146146
return
147147
}
148-
if t != "list" {
148+
if t != keyTypeList {
149149
c.WriteError(msgWrongType)
150150
return
151151
}
@@ -239,7 +239,7 @@ func (m *Miniredis) cmdLpos(c *server.Peer, cmd string, args []string) {
239239
c.WriteNull()
240240
return
241241
}
242-
if t != "list" {
242+
if t != keyTypeList {
243243
c.WriteError(msgWrongType)
244244
return
245245
}
@@ -347,7 +347,7 @@ func (m *Miniredis) cmdLinsert(c *server.Peer, cmd string, args []string) {
347347
c.WriteInt(0)
348348
return
349349
}
350-
if t != "list" {
350+
if t != keyTypeList {
351351
c.WriteError(msgWrongType)
352352
return
353353
}
@@ -401,7 +401,7 @@ func (m *Miniredis) cmdLlen(c *server.Peer, cmd string, args []string) {
401401
c.WriteInt(0)
402402
return
403403
}
404-
if t != "list" {
404+
if t != keyTypeList {
405405
c.WriteError(msgWrongType)
406406
return
407407
}
@@ -471,7 +471,7 @@ func (m *Miniredis) cmdXpop(c *server.Peer, cmd string, args []string, lr leftri
471471
c.WriteNull()
472472
return
473473
}
474-
if db.t(opts.key) != "list" {
474+
if db.t(opts.key) != keyTypeList {
475475
c.WriteError(msgWrongType)
476476
return
477477
}
@@ -530,7 +530,7 @@ func (m *Miniredis) cmdXpush(c *server.Peer, cmd string, args []string, lr leftr
530530
withTx(m, c, func(c *server.Peer, ctx *connCtx) {
531531
db := m.db(ctx.selectedDB)
532532

533-
if db.exists(key) && db.t(key) != "list" {
533+
if db.exists(key) && db.t(key) != keyTypeList {
534534
c.WriteError(msgWrongType)
535535
return
536536
}
@@ -580,7 +580,7 @@ func (m *Miniredis) cmdXpushx(c *server.Peer, cmd string, args []string, lr left
580580
c.WriteInt(0)
581581
return
582582
}
583-
if db.t(key) != "list" {
583+
if db.t(key) != keyTypeList {
584584
c.WriteError(msgWrongType)
585585
return
586586
}
@@ -629,7 +629,7 @@ func (m *Miniredis) cmdLrange(c *server.Peer, cmd string, args []string) {
629629
withTx(m, c, func(c *server.Peer, ctx *connCtx) {
630630
db := m.db(ctx.selectedDB)
631631

632-
if t, ok := db.keys[opts.key]; ok && t != "list" {
632+
if t, ok := db.keys[opts.key]; ok && t != keyTypeList {
633633
c.WriteError(msgWrongType)
634634
return
635635
}
@@ -680,7 +680,7 @@ func (m *Miniredis) cmdLrem(c *server.Peer, cmd string, args []string) {
680680
c.WriteInt(0)
681681
return
682682
}
683-
if db.t(opts.key) != "list" {
683+
if db.t(opts.key) != keyTypeList {
684684
c.WriteError(msgWrongType)
685685
return
686686
}
@@ -754,7 +754,7 @@ func (m *Miniredis) cmdLset(c *server.Peer, cmd string, args []string) {
754754
c.WriteError(msgKeyNotFound)
755755
return
756756
}
757-
if db.t(opts.key) != "list" {
757+
if db.t(opts.key) != keyTypeList {
758758
c.WriteError(msgWrongType)
759759
return
760760
}
@@ -811,7 +811,7 @@ func (m *Miniredis) cmdLtrim(c *server.Peer, cmd string, args []string) {
811811
c.WriteOK()
812812
return
813813
}
814-
if t != "list" {
814+
if t != keyTypeList {
815815
c.WriteError(msgWrongType)
816816
return
817817
}
@@ -852,7 +852,7 @@ func (m *Miniredis) cmdRpoplpush(c *server.Peer, cmd string, args []string) {
852852
c.WriteNull()
853853
return
854854
}
855-
if db.t(src) != "list" || (db.exists(dst) && db.t(dst) != "list") {
855+
if db.t(src) != keyTypeList || (db.exists(dst) && db.t(dst) != keyTypeList) {
856856
c.WriteError(msgWrongType)
857857
return
858858
}
@@ -897,7 +897,7 @@ func (m *Miniredis) cmdBrpoplpush(c *server.Peer, cmd string, args []string) {
897897
if !db.exists(opts.src) {
898898
return false
899899
}
900-
if db.t(opts.src) != "list" || (db.exists(opts.dst) && db.t(opts.dst) != "list") {
900+
if db.t(opts.src) != keyTypeList || (db.exists(opts.dst) && db.t(opts.dst) != keyTypeList) {
901901
c.WriteError(msgWrongType)
902902
return true
903903
}
@@ -949,7 +949,7 @@ func (m *Miniredis) cmdLmove(c *server.Peer, cmd string, args []string) {
949949
c.WriteNull()
950950
return
951951
}
952-
if db.t(opts.src) != "list" || (db.exists(opts.dst) && db.t(opts.dst) != "list") {
952+
if db.t(opts.src) != keyTypeList || (db.exists(opts.dst) && db.t(opts.dst) != keyTypeList) {
953953
c.WriteError(msgWrongType)
954954
return
955955
}
@@ -1017,7 +1017,7 @@ func (m *Miniredis) cmdBlmove(c *server.Peer, cmd string, args []string) {
10171017
if !db.exists(opts.src) {
10181018
return false
10191019
}
1020-
if db.t(opts.src) != "list" || (db.exists(opts.dst) && db.t(opts.dst) != "list") {
1020+
if db.t(opts.src) != keyTypeList || (db.exists(opts.dst) && db.t(opts.dst) != keyTypeList) {
10211021
c.WriteError(msgWrongType)
10221022
return true
10231023
}

‎cmd_server.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,19 @@ func (m *Miniredis) cmdMemory(c *server.Peer, cmd string, args []string) {
5757
ok bool
5858
)
5959
switch db.keys[args[0]] {
60-
case "string":
60+
case keyTypeString:
6161
value, ok = db.stringKeys[args[0]]
62-
case "set":
62+
case keyTypeSet:
6363
value, ok = db.setKeys[args[0]]
64-
case "hash":
64+
case keyTypeHash:
6565
value, ok = db.hashKeys[args[0]]
66-
case "list":
66+
case keyTypeList:
6767
value, ok = db.listKeys[args[0]]
68-
case "hll":
68+
case keyTypeHll:
6969
value, ok = db.hllKeys[args[0]]
70-
case "zset":
70+
case keyTypeSortedSet:
7171
value, ok = db.sortedsetKeys[args[0]]
72-
case "stream":
72+
case keyTypeStream:
7373
value, ok = db.streamKeys[args[0]]
7474
}
7575
if !ok {

‎cmd_set.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func (m *Miniredis) cmdSadd(c *server.Peer, cmd string, args []string) {
5050
withTx(m, c, func(c *server.Peer, ctx *connCtx) {
5151
db := m.db(ctx.selectedDB)
5252

53-
if db.exists(key) && db.t(key) != "set" {
53+
if db.exists(key) && db.t(key) != keyTypeSet {
5454
c.WriteError(ErrWrongType.Error())
5555
return
5656
}

0 commit comments

Comments
 (0)