update ttl type from millisecond to second(#263)

Author: qishenonly

structure/string.go

@@ -35,7 +35,7 @@ func stringToBytesWithKey(key string) []byte {
 }
 
 func integerToDuration(ttl int64) time.Duration {
-	return time.Duration(ttl) * time.Millisecond
+	return time.Duration(ttl) * time.Second
 }
 
 // Set sets the value of a key
@@ -395,7 +395,7 @@ func (s *StringStructure) Size(key string) (string, error) {
 
 	sizeInBytes := len(toString)
 
-	// 将字节数转换成对应的单位（KB、MB等）
+	// Convert bytes to corresponding units (KB, MB...)
 	const (
 		KB = 1 << 10
 		MB = 1 << 20
@@ -558,8 +558,6 @@ var (
 	ErrInvalidValue = errors.New("Wrong value: invalid value")
 	// ErrInvalidType is returned if the type is invalid.
 	ErrInvalidType = errors.New("Wrong value: invalid type")
-	// ErrKeyExpired is returned if the key is expired.
-	ErrKeyExpired = errors.New("Wrong value: key expired")
 )
 
 // decodeStringValue decodes the value
@@ -596,7 +594,7 @@ func decodeStringValue(value []byte) ([]byte, int64, error) {
 
 	// Check the expiration time expire
 	if expire != 0 && expire < time.Now().UnixNano() {
-		return nil, -1, ErrKeyExpired
+		return nil, -1, _const.ErrKeyIsExpired
 	}
 
 	// Return the original value value

structure/string_test.go

@@ -26,7 +26,7 @@ func TestStringStructure_Get(t *testing.T) {
 
 	err = str.Set("1", randkv.RandomValue(100), 0)
 	assert.Nil(t, err)
-	err = str.Set("1", randkv.RandomValue(100), 2000)
+	err = str.Set("1", randkv.RandomValue(100), 2)
 	assert.Nil(t, err)
 
 	value1, err := str.Get("1")
@@ -36,7 +36,7 @@ func TestStringStructure_Get(t *testing.T) {
 	time.Sleep(3 * time.Second)
 
 	value2, err := str.Get("1")
-	assert.Equal(t, err, ErrKeyExpired)
+	assert.Equal(t, err, _const.ErrKeyIsExpired)
 	assert.Nil(t, value2)
 
 	_, err = str.Get("3")
@@ -305,29 +305,29 @@ func TestStringStructure_Expire(t *testing.T) {
 	err = str.Set("1", []byte("1"), 0)
 	assert.Nil(t, err)
 
-	err = str.Expire("1", 1000)
+	err = str.Expire("1", 1)
 	assert.Nil(t, err)
 	v1, err := str.Get("1")
 	assert.Nil(t, err)
 	assert.Equal(t, v1, []byte("1"))
 
 	time.Sleep(2 * time.Second)
 	v2, err := str.Get("1")
-	assert.Equal(t, err, ErrKeyExpired)
+	assert.Equal(t, err, _const.ErrKeyIsExpired)
 	assert.Equal(t, v2, nil)
 
 	err = str.Set("2", "你好", 0)
 	assert.Nil(t, err)
 
-	err = str.Expire("2", 1000)
+	err = str.Expire("2", 1)
 	assert.Nil(t, err)
 	v3, err := str.Get("2")
 	assert.Nil(t, err)
 	assert.Equal(t, v3, "你好")
 
 	time.Sleep(2 * time.Second)
 	v4, err := str.Get("2")
-	assert.Equal(t, err, ErrKeyExpired)
+	assert.Equal(t, err, _const.ErrKeyIsExpired)
 	assert.Equal(t, v4, nil)
 }
 
@@ -338,7 +338,7 @@ func TestStringStructure_Persist(t *testing.T) {
 	err = str.Set("1", []byte("1"), 0)
 	assert.Nil(t, err)
 
-	err = str.Expire("1", 1000)
+	err = str.Expire("1", 1)
 	assert.Nil(t, err)
 	v1, err := str.Get("1")
 	assert.Nil(t, err)
@@ -449,7 +449,7 @@ func TestStringStructure_TTL(t *testing.T) {
 	str, _ := initdb()
 	defer str.db.Clean()
 
-	err = str.Set("1", []byte("1"), 2000)
+	err = str.Set("1", []byte("1"), 2)
 	assert.Nil(t, err)
 
 	ttl, err := str.TTL("1")