refactor project structure

This commit is contained in:
hdt3213
2021-05-09 21:47:05 +08:00
parent 65fc1c3e62
commit 721d9c31a7
28 changed files with 126 additions and 110 deletions

View File

@@ -2,7 +2,7 @@ package cluster
import (
"fmt"
"github.com/hdt3213/godis/db"
"github.com/hdt3213/godis"
"github.com/hdt3213/godis/lib/utils"
"github.com/hdt3213/godis/redis/reply"
"github.com/hdt3213/godis/redis/reply/asserts"
@@ -11,22 +11,22 @@ import (
func TestRename(t *testing.T) {
testDB := testCluster.db
db.FlushAll(testDB, [][]byte{})
godis.FlushAll(testDB, [][]byte{})
key := utils.RandString(10)
value := utils.RandString(10)
newKey := key + utils.RandString(2)
db.Set(testDB, utils.ToBytesList(key, value, "ex", "1000"))
godis.Set(testDB, utils.ToBytesList(key, value, "ex", "1000"))
result := Rename(testCluster, nil, utils.ToBytesList("RENAME", key, newKey))
if _, ok := result.(*reply.OkReply); !ok {
t.Error("expect ok")
return
}
result = db.Exists(testDB, utils.ToBytesList(key))
result = godis.Exists(testDB, utils.ToBytesList(key))
asserts.AssertIntReply(t, result, 0)
result = db.Exists(testDB, utils.ToBytesList(newKey))
result = godis.Exists(testDB, utils.ToBytesList(newKey))
asserts.AssertIntReply(t, result, 1)
// check ttl
result = db.TTL(testDB, utils.ToBytesList(newKey))
result = godis.TTL(testDB, utils.ToBytesList(newKey))
intResult, ok := result.(*reply.IntReply)
if !ok {
t.Error(fmt.Sprintf("expected int reply, actually %s", result.ToBytes()))
@@ -40,18 +40,18 @@ func TestRename(t *testing.T) {
func TestRenameNx(t *testing.T) {
testDB := testCluster.db
db.FlushAll(testDB, [][]byte{})
godis.FlushAll(testDB, [][]byte{})
key := utils.RandString(10)
value := utils.RandString(10)
newKey := key + utils.RandString(2)
db.Set(testCluster.db, utils.ToBytesList(key, value, "ex", "1000"))
godis.Set(testCluster.db, utils.ToBytesList(key, value, "ex", "1000"))
result := RenameNx(testCluster, nil, utils.ToBytesList("RENAMENX", key, newKey))
asserts.AssertIntReply(t, result, 1)
result = db.Exists(testDB, utils.ToBytesList(key))
result = godis.Exists(testDB, utils.ToBytesList(key))
asserts.AssertIntReply(t, result, 0)
result = db.Exists(testDB, utils.ToBytesList(newKey))
result = godis.Exists(testDB, utils.ToBytesList(newKey))
asserts.AssertIntReply(t, result, 1)
result = db.TTL(testDB, utils.ToBytesList(newKey))
result = godis.TTL(testDB, utils.ToBytesList(newKey))
intResult, ok := result.(*reply.IntReply)
if !ok {
t.Error(fmt.Sprintf("expected int reply, actually %s", result.ToBytes()))