Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/commands/cmd_string.cc
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,17 @@ class CommandDelEX : public Commander {
CommandParser parser(args, 2);
while (parser.Good()) {
if (parser.EatEqICase("ifdeq")) {
option_ = {DelExOption::IFDEQ, GET_OR_RET(parser.TakeStr())};
std::string digest = GET_OR_RET(parser.TakeStr());
if (digest.size() != 16) {
return {Status::RedisParseErr, "ERR digest must be exactly 16 hexadecimal characters"};
}
option_ = {DelExOption::IFDEQ, std::move(digest)};
} else if (parser.EatEqICase("ifdne")) {
option_ = {DelExOption::IFDNE, GET_OR_RET(parser.TakeStr())};
std::string digest = GET_OR_RET(parser.TakeStr());
if (digest.size() != 16) {
return {Status::RedisParseErr, "ERR digest must be exactly 16 hexadecimal characters"};
}
option_ = {DelExOption::IFDNE, std::move(digest)};
} else if (parser.EatEqICase("ifeq")) {
option_ = {DelExOption::IFEQ, GET_OR_RET(parser.TakeStr())};
} else if (parser.EatEqICase("ifne")) {
Expand Down
4 changes: 2 additions & 2 deletions src/types/redis_string.cc
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,10 @@ rocksdb::Status String::DelEX(engine::Context &ctx, const std::string &user_key,
matched = true;
break;
case DelExOption::IFDEQ:
matched = option.value == util::StringDigest(val);
matched = util::EqualICase(option.value, util::StringDigest(val));
break;
case DelExOption::IFDNE:
matched = option.value != util::StringDigest(val);
matched = !util::EqualICase(option.value, util::StringDigest(val));
break;
case DelExOption::IFEQ:
matched = option.value == val;
Expand Down
47 changes: 47 additions & 0 deletions tests/gocase/unit/type/strings/strings_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,38 @@ func testString(t *testing.T, configs util.KvrocksServerConfigs) {
require.Equal(t, "", rdb.Get(ctx, value).Val())
})

t.Run("DelEX IFDEQ and IFDNE accept uppercase digest", func(t *testing.T) {
key := "test-string-key-uppercase-digest"
value := "Hello world"
var digest string

require.NoError(t, rdb.Del(ctx, key).Err())
require.NoError(t, rdb.Set(ctx, key, value, 0).Err())
digest = strings.ToUpper(rdb.Do(ctx, "DIGEST", key).Val().(string))
require.Equal(t, int64(1), rdb.Do(ctx, "DelEX", key, "ifdeq", digest).Val())
require.Equal(t, int64(0), rdb.Exists(ctx, key).Val())

require.NoError(t, rdb.Set(ctx, key, value, 0).Err())
digest = strings.ToUpper(rdb.Do(ctx, "DIGEST", key).Val().(string))
require.Equal(t, int64(0), rdb.Do(ctx, "DelEX", key, "ifdne", digest).Val())
require.Equal(t, value, rdb.Get(ctx, key).Val())
})

t.Run("DelEX IFDEQ and IFDNE reject invalid digest length", func(t *testing.T) {
key := "test-string-key-invalid-digest"
value := "Hello world"

require.NoError(t, rdb.Del(ctx, key).Err())
require.NoError(t, rdb.Set(ctx, key, value, 0).Err())
require.ErrorContains(t, rdb.Do(ctx, "DelEX", key, "ifdeq", "123456789012345").Err(),
"exactly 16 hexadecimal characters")
require.Equal(t, value, rdb.Get(ctx, key).Val())

require.ErrorContains(t, rdb.Do(ctx, "DelEX", key, "ifdne", "123456789012345").Err(),
"exactly 16 hexadecimal characters")
require.Equal(t, value, rdb.Get(ctx, key).Val())
})

t.Run("MGET command", func(t *testing.T) {
require.NoError(t, rdb.FlushDB(ctx).Err())
require.NoError(t, rdb.Set(ctx, "foo", "BAR", 0).Err())
Expand Down Expand Up @@ -1204,4 +1236,19 @@ func testString(t *testing.T, configs util.KvrocksServerConfigs) {
require.Equal(t, []redis.LCSMatchedPosition{}, rdb.LCS(ctx, &redis.LCSQuery{Key1: "virus1", Key2: "virus2", Idx: true}).Val().Matches)
require.Equal(t, []redis.LCSMatchedPosition{}, rdb.LCS(ctx, &redis.LCSQuery{Key1: "virus1", Key2: "virus2", Idx: true, WithMatchLen: true}).Val().Matches)
})

t.Run("DelEX IFDEQ and IFDNE reject invalid digest length", func(t *testing.T) {
key := "test-string-key-invalid-digest"
value := "Hello world"

require.NoError(t, rdb.Del(ctx, key).Err())
require.NoError(t, rdb.Set(ctx, key, value, 0).Err())
require.ErrorContains(t, rdb.Do(ctx, "DelEX", key, "ifdeq", "123456789012345").Err(),
"exactly 16 hexadecimal characters")
require.Equal(t, value, rdb.Get(ctx, key).Val())

require.ErrorContains(t, rdb.Do(ctx, "DelEX", key, "ifdne", "123456789012345").Err(),
"exactly 16 hexadecimal characters")
require.Equal(t, value, rdb.Get(ctx, key).Val())
})
}