Skip to content

Commit

Permalink
its wooorkkiiinngggg... finally
Browse files Browse the repository at this point in the history
  • Loading branch information
@osteensco
osteensco committed Nov 15, 2024
1 parent 6110f8f commit d42a3d1
Show file tree
Hide file tree
Showing 8 changed files with 2,189 additions and 1,571 deletions.
3,176 changes: 1,638 additions & 1,538 deletions coverage/coverage.out
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions internal/constants/const.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ const (
OkResponse = "+OK\r\n"
WrongArgsResponse = "wrong number of arguments"
MissingArgResponse = "missing argument %s"
InvalidCmdResponse = "invalid command provided"
)

const (
Expand Down
86 changes: 64 additions & 22 deletions internal/modules/hash/commands.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ func handleHEXPIRE(params internal.HandlerFuncParams) ([]byte, error) {
keyExists := params.KeysExist(params.Context, keys.WriteKeys)[key]

if !keyExists {
return []byte("-2\r\n"), nil
return []byte(":-2\r\n"), nil
}

hash, ok := params.GetValues(params.Context, []string{key})[key].(Hash)
Expand All @@ -634,10 +634,7 @@ func handleHEXPIRE(params internal.HandlerFuncParams) ([]byte, error) {
cmdargs := keys.WriteKeys[1:]
seconds, err := strconv.ParseInt(cmdargs[0], 10, 64)
if err != nil {
return nil, errors.New(fmt.Sprintf("expire time must be integer, was provided %q", cmdargs[0]))
}
if seconds == 0 {
return []byte("2\r\n"), nil
return nil, errors.New(fmt.Sprintf("seconds must be integer, was provided %q", cmdargs[0]))
}

// FIELDS argument provides starting index to work off of to grab fields
Expand All @@ -653,16 +650,23 @@ func handleHEXPIRE(params internal.HandlerFuncParams) ([]byte, error) {
// index through numfields
numfields, err := strconv.ParseInt(cmdargs[fieldsIdx+1], 10, 64)
if err != nil {
return nil, errors.New(fmt.Sprintf("numberfields must be integer, was provided %q", cmdargs[0]))
return nil, errors.New(fmt.Sprintf("numberfields must be integer, was provided %q", cmdargs[fieldsIdx+1]))
}
endIdx := fieldsIdx + 2 + int(numfields)
fields := cmdargs[fieldsIdx+2 : endIdx]

expireAt := time.Now().Add(time.Duration(seconds) * time.Second)
expireAt := params.GetClock().Now().Add(time.Duration(seconds) * time.Second)

// build out response
resp := "*" + fmt.Sprintf("%v", len(fields)) + "\r\n"
respidx := 1

// handle expire time of 0 seconds
if seconds == 0 {
for i := numfields; i > 0; i-- {
resp = resp + ":2\r\n"
}
return []byte(resp), nil
}

if fieldsIdx == 2 {
// Handle expire options
Expand All @@ -672,13 +676,11 @@ func handleHEXPIRE(params internal.HandlerFuncParams) ([]byte, error) {
_, ok := hash[f]
if !ok {
resp = resp + ":-2\r\n"
respidx++
continue
}
currentExpireAt := hash[f].ExpireAt
if currentExpireAt != (time.Time{}) {
resp = resp + ":0\r\n"
respidx++
continue
}
err = params.SetHashExpiry(params.Context, key, f, expireAt)
Expand All @@ -687,21 +689,18 @@ func handleHEXPIRE(params internal.HandlerFuncParams) ([]byte, error) {
}

resp = resp + ":1\r\n"
respidx++

}
case "xx":
for _, f := range fields {
_, ok := hash[f]
if !ok {
resp = resp + ":-2\r\n"
respidx++
continue
}
currentExpireAt := hash[f].ExpireAt
if currentExpireAt == (time.Time{}) {
resp = resp + ":0\r\n"
respidx++
continue
}
err = params.SetHashExpiry(params.Context, key, f, expireAt)
Expand All @@ -710,21 +709,19 @@ func handleHEXPIRE(params internal.HandlerFuncParams) ([]byte, error) {
}

resp = resp + ":1\r\n"
respidx++

}
case "gt":
for _, f := range fields {
_, ok := hash[f]
if !ok {
resp = resp + ":-2\r\n"
respidx++
continue
}
currentExpireAt := hash[f].ExpireAt
//TODO
if currentExpireAt == (time.Time{}) || expireAt.Before(currentExpireAt) {
resp = resp + ":0\r\n"
respidx++
continue
}
err = params.SetHashExpiry(params.Context, key, f, expireAt)
Expand All @@ -733,21 +730,18 @@ func handleHEXPIRE(params internal.HandlerFuncParams) ([]byte, error) {
}

resp = resp + ":1\r\n"
respidx++

}
case "lt":
for _, f := range fields {
_, ok := hash[f]
if !ok {
resp = resp + ":-2\r\n"
respidx++
continue
}
currentExpireAt := hash[f].ExpireAt
if currentExpireAt != (time.Time{}) && currentExpireAt.Before(expireAt) {
resp = resp + ":0\r\n"
respidx++
continue
}
err = params.SetHashExpiry(params.Context, key, f, expireAt)
Expand All @@ -756,7 +750,6 @@ func handleHEXPIRE(params internal.HandlerFuncParams) ([]byte, error) {
}

resp = resp + ":1\r\n"
respidx++

}
default:
Expand All @@ -767,7 +760,6 @@ func handleHEXPIRE(params internal.HandlerFuncParams) ([]byte, error) {
_, ok := hash[f]
if !ok {
resp = resp + ":-2\r\n"
respidx++
continue
}
err = params.SetHashExpiry(params.Context, key, f, expireAt)
Expand All @@ -776,7 +768,6 @@ func handleHEXPIRE(params internal.HandlerFuncParams) ([]byte, error) {
}

resp = resp + ":1\r\n"
respidx++

}
}
Expand All @@ -785,6 +776,48 @@ func handleHEXPIRE(params internal.HandlerFuncParams) ([]byte, error) {
return []byte(resp), nil
}

func handleHTTL(params internal.HandlerFuncParams) ([]byte, error) {
keys, err := httlKeyFunc(params.Command)
if err != nil {
return nil, err
}
key := keys.ReadKeys[0]
keyExists := params.KeysExist(params.Context, keys.ReadKeys)[key]

if !keyExists {
return []byte(":-2\r\n"), nil
}

hash, ok := params.GetValues(params.Context, []string{key})[key].(Hash)
if !ok {
return nil, fmt.Errorf("value at %s is not a hash", key)
}

cmdargs := keys.ReadKeys[2:]
numfields, err := strconv.ParseInt(cmdargs[0], 10, 64)
if err != nil {
return nil, errors.New(fmt.Sprintf("expire time must be integer, was provided %q", cmdargs[0]))
}

fields := cmdargs[1 : numfields+1]
resp := "*" + fmt.Sprintf("%v", len(fields)) + "\r\n"
for _, field := range fields {
f, ok := hash[field]
if !ok {
resp = resp + ":-2\r\n"
continue
}
if f.ExpireAt == (time.Time{}) {
resp = resp + ":-1\r\n"
continue
}
resp = resp + fmt.Sprintf(":%d\r\n", int(f.ExpireAt.Sub(params.GetClock().Now()).Round(time.Second).Seconds()))

}

return []byte(resp), nil
}

func Commands() []internal.Command {
return []internal.Command{
{
Expand Down Expand Up @@ -927,5 +960,14 @@ Return the string length of the values stored at the specified fields. 0 if the
KeyExtractionFunc: hexpireKeyFunc,
HandlerFunc: handleHEXPIRE,
},
{
Command: "httl",
Module: constants.HashModule,
Categories: []string{constants.HashCategory, constants.ReadCategory, constants.FastCategory},
Description: `HTTL key FIELDS numfields field [field ...] Returns the remaining TTL (time to live) of a hash key's field(s) that have a set expiration.`,
Sync: true,
KeyExtractionFunc: httlKeyFunc,
HandlerFunc: handleHTTL,
},
}
}
Loading

0 comments on commit d42a3d1

Please sign in to comment.