mirror of
https://github.com/HDT3213/godis.git
synced 2025-10-06 09:17:10 +08:00
refactor command table
This commit is contained in:
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
func TestZAdd(t *testing.T) {
|
||||
FlushAll(testDB, [][]byte{})
|
||||
execFlushAll(testDB, [][]byte{})
|
||||
size := 100
|
||||
|
||||
// add new members
|
||||
@@ -22,18 +22,18 @@ func TestZAdd(t *testing.T) {
|
||||
scores[i] = rand.Float64()
|
||||
setArgs = append(setArgs, strconv.FormatFloat(scores[i], 'f', -1, 64), members[i])
|
||||
}
|
||||
result := ZAdd(testDB, utils.ToBytesList(setArgs...))
|
||||
result := execZAdd(testDB, utils.ToBytesList(setArgs...))
|
||||
asserts.AssertIntReply(t, result, size)
|
||||
|
||||
// test zscore and zrank
|
||||
for i, member := range members {
|
||||
result := ZScore(testDB, utils.ToBytesList(key, member))
|
||||
result := execZScore(testDB, utils.ToBytesList(key, member))
|
||||
score := strconv.FormatFloat(scores[i], 'f', -1, 64)
|
||||
asserts.AssertBulkReply(t, result, score)
|
||||
}
|
||||
|
||||
// test zcard
|
||||
result = ZCard(testDB, utils.ToBytesList(key))
|
||||
result = execZCard(testDB, utils.ToBytesList(key))
|
||||
asserts.AssertIntReply(t, result, size)
|
||||
|
||||
// update members
|
||||
@@ -42,19 +42,19 @@ func TestZAdd(t *testing.T) {
|
||||
scores[i] = rand.Float64() + 100
|
||||
setArgs = append(setArgs, strconv.FormatFloat(scores[i], 'f', -1, 64), members[i])
|
||||
}
|
||||
result = ZAdd(testDB, utils.ToBytesList(setArgs...))
|
||||
result = execZAdd(testDB, utils.ToBytesList(setArgs...))
|
||||
asserts.AssertIntReply(t, result, 0) // return number of new members
|
||||
|
||||
// test updated score
|
||||
for i, member := range members {
|
||||
result := ZScore(testDB, utils.ToBytesList(key, member))
|
||||
result := execZScore(testDB, utils.ToBytesList(key, member))
|
||||
score := strconv.FormatFloat(scores[i], 'f', -1, 64)
|
||||
asserts.AssertBulkReply(t, result, score)
|
||||
}
|
||||
}
|
||||
|
||||
func TestZRank(t *testing.T) {
|
||||
FlushAll(testDB, [][]byte{})
|
||||
execFlushAll(testDB, [][]byte{})
|
||||
size := 100
|
||||
key := utils.RandString(10)
|
||||
members := make([]string, size)
|
||||
@@ -65,21 +65,21 @@ func TestZRank(t *testing.T) {
|
||||
scores[i] = i
|
||||
setArgs = append(setArgs, strconv.FormatInt(int64(scores[i]), 10), members[i])
|
||||
}
|
||||
ZAdd(testDB, utils.ToBytesList(setArgs...))
|
||||
execZAdd(testDB, utils.ToBytesList(setArgs...))
|
||||
|
||||
// test zrank
|
||||
for i, member := range members {
|
||||
result := ZRank(testDB, utils.ToBytesList(key, member))
|
||||
result := execZRank(testDB, utils.ToBytesList(key, member))
|
||||
asserts.AssertIntReply(t, result, i)
|
||||
|
||||
result = ZRevRank(testDB, utils.ToBytesList(key, member))
|
||||
result = execZRevRank(testDB, utils.ToBytesList(key, member))
|
||||
asserts.AssertIntReply(t, result, size-i-1)
|
||||
}
|
||||
}
|
||||
|
||||
func TestZRange(t *testing.T) {
|
||||
// prepare
|
||||
FlushAll(testDB, [][]byte{})
|
||||
execFlushAll(testDB, [][]byte{})
|
||||
size := 100
|
||||
key := utils.RandString(10)
|
||||
members := make([]string, size)
|
||||
@@ -90,7 +90,7 @@ func TestZRange(t *testing.T) {
|
||||
scores[i] = i
|
||||
setArgs = append(setArgs, strconv.FormatInt(int64(scores[i]), 10), members[i])
|
||||
}
|
||||
ZAdd(testDB, utils.ToBytesList(setArgs...))
|
||||
execZAdd(testDB, utils.ToBytesList(setArgs...))
|
||||
reverseMembers := make([]string, size)
|
||||
for i, v := range members {
|
||||
reverseMembers[size-i-1] = v
|
||||
@@ -98,39 +98,39 @@ func TestZRange(t *testing.T) {
|
||||
|
||||
start := "0"
|
||||
end := "9"
|
||||
result := ZRange(testDB, utils.ToBytesList(key, start, end))
|
||||
result := execZRange(testDB, utils.ToBytesList(key, start, end))
|
||||
asserts.AssertMultiBulkReply(t, result, members[0:10])
|
||||
result = ZRange(testDB, utils.ToBytesList(key, start, end, "WITHSCORES"))
|
||||
result = execZRange(testDB, utils.ToBytesList(key, start, end, "WITHSCORES"))
|
||||
asserts.AssertMultiBulkReplySize(t, result, 20)
|
||||
result = ZRevRange(testDB, utils.ToBytesList(key, start, end))
|
||||
result = execZRevRange(testDB, utils.ToBytesList(key, start, end))
|
||||
asserts.AssertMultiBulkReply(t, result, reverseMembers[0:10])
|
||||
|
||||
start = "0"
|
||||
end = "200"
|
||||
result = ZRange(testDB, utils.ToBytesList(key, start, end))
|
||||
result = execZRange(testDB, utils.ToBytesList(key, start, end))
|
||||
asserts.AssertMultiBulkReply(t, result, members)
|
||||
result = ZRevRange(testDB, utils.ToBytesList(key, start, end))
|
||||
result = execZRevRange(testDB, utils.ToBytesList(key, start, end))
|
||||
asserts.AssertMultiBulkReply(t, result, reverseMembers)
|
||||
|
||||
start = "0"
|
||||
end = "-10"
|
||||
result = ZRange(testDB, utils.ToBytesList(key, start, end))
|
||||
result = execZRange(testDB, utils.ToBytesList(key, start, end))
|
||||
asserts.AssertMultiBulkReply(t, result, members[0:size-10+1])
|
||||
result = ZRevRange(testDB, utils.ToBytesList(key, start, end))
|
||||
result = execZRevRange(testDB, utils.ToBytesList(key, start, end))
|
||||
asserts.AssertMultiBulkReply(t, result, reverseMembers[0:size-10+1])
|
||||
|
||||
start = "0"
|
||||
end = "-200"
|
||||
result = ZRange(testDB, utils.ToBytesList(key, start, end))
|
||||
result = execZRange(testDB, utils.ToBytesList(key, start, end))
|
||||
asserts.AssertMultiBulkReply(t, result, members[0:0])
|
||||
result = ZRevRange(testDB, utils.ToBytesList(key, start, end))
|
||||
result = execZRevRange(testDB, utils.ToBytesList(key, start, end))
|
||||
asserts.AssertMultiBulkReply(t, result, reverseMembers[0:0])
|
||||
|
||||
start = "-10"
|
||||
end = "-1"
|
||||
result = ZRange(testDB, utils.ToBytesList(key, start, end))
|
||||
result = execZRange(testDB, utils.ToBytesList(key, start, end))
|
||||
asserts.AssertMultiBulkReply(t, result, members[90:])
|
||||
result = ZRevRange(testDB, utils.ToBytesList(key, start, end))
|
||||
result = execZRevRange(testDB, utils.ToBytesList(key, start, end))
|
||||
asserts.AssertMultiBulkReply(t, result, reverseMembers[90:])
|
||||
}
|
||||
|
||||
@@ -144,7 +144,7 @@ func reverse(src []string) []string {
|
||||
|
||||
func TestZRangeByScore(t *testing.T) {
|
||||
// prepare
|
||||
FlushAll(testDB, [][]byte{})
|
||||
execFlushAll(testDB, [][]byte{})
|
||||
size := 100
|
||||
key := utils.RandString(10)
|
||||
members := make([]string, size)
|
||||
@@ -155,49 +155,49 @@ func TestZRangeByScore(t *testing.T) {
|
||||
scores[i] = i
|
||||
setArgs = append(setArgs, strconv.FormatInt(int64(scores[i]), 10), members[i])
|
||||
}
|
||||
result := ZAdd(testDB, utils.ToBytesList(setArgs...))
|
||||
result := execZAdd(testDB, utils.ToBytesList(setArgs...))
|
||||
asserts.AssertIntReply(t, result, size)
|
||||
|
||||
min := "20"
|
||||
max := "30"
|
||||
result = ZRangeByScore(testDB, utils.ToBytesList(key, min, max))
|
||||
result = execZRangeByScore(testDB, utils.ToBytesList(key, min, max))
|
||||
asserts.AssertMultiBulkReply(t, result, members[20:31])
|
||||
result = ZRangeByScore(testDB, utils.ToBytesList(key, min, max, "WITHSCORES"))
|
||||
result = execZRangeByScore(testDB, utils.ToBytesList(key, min, max, "WITHSCORES"))
|
||||
asserts.AssertMultiBulkReplySize(t, result, 22)
|
||||
result = ZRevRangeByScore(testDB, utils.ToBytesList(key, max, min))
|
||||
result = execZRevRangeByScore(testDB, utils.ToBytesList(key, max, min))
|
||||
asserts.AssertMultiBulkReply(t, result, reverse(members[20:31]))
|
||||
|
||||
min = "-10"
|
||||
max = "10"
|
||||
result = ZRangeByScore(testDB, utils.ToBytesList(key, min, max))
|
||||
result = execZRangeByScore(testDB, utils.ToBytesList(key, min, max))
|
||||
asserts.AssertMultiBulkReply(t, result, members[0:11])
|
||||
result = ZRevRangeByScore(testDB, utils.ToBytesList(key, max, min))
|
||||
result = execZRevRangeByScore(testDB, utils.ToBytesList(key, max, min))
|
||||
asserts.AssertMultiBulkReply(t, result, reverse(members[0:11]))
|
||||
|
||||
min = "90"
|
||||
max = "110"
|
||||
result = ZRangeByScore(testDB, utils.ToBytesList(key, min, max))
|
||||
result = execZRangeByScore(testDB, utils.ToBytesList(key, min, max))
|
||||
asserts.AssertMultiBulkReply(t, result, members[90:])
|
||||
result = ZRevRangeByScore(testDB, utils.ToBytesList(key, max, min))
|
||||
result = execZRevRangeByScore(testDB, utils.ToBytesList(key, max, min))
|
||||
asserts.AssertMultiBulkReply(t, result, reverse(members[90:]))
|
||||
|
||||
min = "(20"
|
||||
max = "(30"
|
||||
result = ZRangeByScore(testDB, utils.ToBytesList(key, min, max))
|
||||
result = execZRangeByScore(testDB, utils.ToBytesList(key, min, max))
|
||||
asserts.AssertMultiBulkReply(t, result, members[21:30])
|
||||
result = ZRevRangeByScore(testDB, utils.ToBytesList(key, max, min))
|
||||
result = execZRevRangeByScore(testDB, utils.ToBytesList(key, max, min))
|
||||
asserts.AssertMultiBulkReply(t, result, reverse(members[21:30]))
|
||||
|
||||
min = "20"
|
||||
max = "40"
|
||||
result = ZRangeByScore(testDB, utils.ToBytesList(key, min, max, "LIMIT", "5", "5"))
|
||||
result = execZRangeByScore(testDB, utils.ToBytesList(key, min, max, "LIMIT", "5", "5"))
|
||||
asserts.AssertMultiBulkReply(t, result, members[25:30])
|
||||
result = ZRevRangeByScore(testDB, utils.ToBytesList(key, max, min, "LIMIT", "5", "5"))
|
||||
result = execZRevRangeByScore(testDB, utils.ToBytesList(key, max, min, "LIMIT", "5", "5"))
|
||||
asserts.AssertMultiBulkReply(t, result, reverse(members[31:36]))
|
||||
}
|
||||
|
||||
func TestZRem(t *testing.T) {
|
||||
FlushAll(testDB, [][]byte{})
|
||||
execFlushAll(testDB, [][]byte{})
|
||||
size := 100
|
||||
key := utils.RandString(10)
|
||||
members := make([]string, size)
|
||||
@@ -208,17 +208,17 @@ func TestZRem(t *testing.T) {
|
||||
scores[i] = i
|
||||
setArgs = append(setArgs, strconv.FormatInt(int64(scores[i]), 10), members[i])
|
||||
}
|
||||
ZAdd(testDB, utils.ToBytesList(setArgs...))
|
||||
execZAdd(testDB, utils.ToBytesList(setArgs...))
|
||||
|
||||
args := []string{key}
|
||||
args = append(args, members[0:10]...)
|
||||
result := ZRem(testDB, utils.ToBytesList(args...))
|
||||
result := execZRem(testDB, utils.ToBytesList(args...))
|
||||
asserts.AssertIntReply(t, result, 10)
|
||||
result = ZCard(testDB, utils.ToBytesList(key))
|
||||
result = execZCard(testDB, utils.ToBytesList(key))
|
||||
asserts.AssertIntReply(t, result, size-10)
|
||||
|
||||
// test ZRemRangeByRank
|
||||
FlushAll(testDB, [][]byte{})
|
||||
execFlushAll(testDB, [][]byte{})
|
||||
size = 100
|
||||
key = utils.RandString(10)
|
||||
members = make([]string, size)
|
||||
@@ -229,15 +229,15 @@ func TestZRem(t *testing.T) {
|
||||
scores[i] = i
|
||||
setArgs = append(setArgs, strconv.FormatInt(int64(scores[i]), 10), members[i])
|
||||
}
|
||||
ZAdd(testDB, utils.ToBytesList(setArgs...))
|
||||
execZAdd(testDB, utils.ToBytesList(setArgs...))
|
||||
|
||||
result = ZRemRangeByRank(testDB, utils.ToBytesList(key, "0", "9"))
|
||||
result = execZRemRangeByRank(testDB, utils.ToBytesList(key, "0", "9"))
|
||||
asserts.AssertIntReply(t, result, 10)
|
||||
result = ZCard(testDB, utils.ToBytesList(key))
|
||||
result = execZCard(testDB, utils.ToBytesList(key))
|
||||
asserts.AssertIntReply(t, result, size-10)
|
||||
|
||||
// test ZRemRangeByScore
|
||||
FlushAll(testDB, [][]byte{})
|
||||
execFlushAll(testDB, [][]byte{})
|
||||
size = 100
|
||||
key = utils.RandString(10)
|
||||
members = make([]string, size)
|
||||
@@ -248,17 +248,17 @@ func TestZRem(t *testing.T) {
|
||||
scores[i] = i
|
||||
setArgs = append(setArgs, strconv.FormatInt(int64(scores[i]), 10), members[i])
|
||||
}
|
||||
ZAdd(testDB, utils.ToBytesList(setArgs...))
|
||||
execZAdd(testDB, utils.ToBytesList(setArgs...))
|
||||
|
||||
result = ZRemRangeByScore(testDB, utils.ToBytesList(key, "0", "9"))
|
||||
result = execZRemRangeByScore(testDB, utils.ToBytesList(key, "0", "9"))
|
||||
asserts.AssertIntReply(t, result, 10)
|
||||
result = ZCard(testDB, utils.ToBytesList(key))
|
||||
result = execZCard(testDB, utils.ToBytesList(key))
|
||||
asserts.AssertIntReply(t, result, size-10)
|
||||
}
|
||||
|
||||
func TestZCount(t *testing.T) {
|
||||
// prepare
|
||||
FlushAll(testDB, [][]byte{})
|
||||
execFlushAll(testDB, [][]byte{})
|
||||
size := 100
|
||||
key := utils.RandString(10)
|
||||
members := make([]string, size)
|
||||
@@ -269,37 +269,37 @@ func TestZCount(t *testing.T) {
|
||||
scores[i] = i
|
||||
setArgs = append(setArgs, strconv.FormatInt(int64(scores[i]), 10), members[i])
|
||||
}
|
||||
ZAdd(testDB, utils.ToBytesList(setArgs...))
|
||||
execZAdd(testDB, utils.ToBytesList(setArgs...))
|
||||
|
||||
min := "20"
|
||||
max := "30"
|
||||
result := ZCount(testDB, utils.ToBytesList(key, min, max))
|
||||
result := execZCount(testDB, utils.ToBytesList(key, min, max))
|
||||
asserts.AssertIntReply(t, result, 11)
|
||||
|
||||
min = "-10"
|
||||
max = "10"
|
||||
result = ZCount(testDB, utils.ToBytesList(key, min, max))
|
||||
result = execZCount(testDB, utils.ToBytesList(key, min, max))
|
||||
asserts.AssertIntReply(t, result, 11)
|
||||
|
||||
min = "90"
|
||||
max = "110"
|
||||
result = ZCount(testDB, utils.ToBytesList(key, min, max))
|
||||
result = execZCount(testDB, utils.ToBytesList(key, min, max))
|
||||
asserts.AssertIntReply(t, result, 10)
|
||||
|
||||
min = "(20"
|
||||
max = "(30"
|
||||
result = ZCount(testDB, utils.ToBytesList(key, min, max))
|
||||
result = execZCount(testDB, utils.ToBytesList(key, min, max))
|
||||
asserts.AssertIntReply(t, result, 9)
|
||||
}
|
||||
|
||||
func TestZIncrBy(t *testing.T) {
|
||||
FlushAll(testDB, [][]byte{})
|
||||
execFlushAll(testDB, [][]byte{})
|
||||
key := utils.RandString(10)
|
||||
result := ZIncrBy(testDB, utils.ToBytesList(key, "10", "a"))
|
||||
result := execZIncrBy(testDB, utils.ToBytesList(key, "10", "a"))
|
||||
asserts.AssertBulkReply(t, result, "10")
|
||||
result = ZIncrBy(testDB, utils.ToBytesList(key, "10", "a"))
|
||||
result = execZIncrBy(testDB, utils.ToBytesList(key, "10", "a"))
|
||||
asserts.AssertBulkReply(t, result, "20")
|
||||
|
||||
result = ZScore(testDB, utils.ToBytesList(key, "a"))
|
||||
result = execZScore(testDB, utils.ToBytesList(key, "a"))
|
||||
asserts.AssertBulkReply(t, result, "20")
|
||||
}
|
||||
|
Reference in New Issue
Block a user