Skip to content

Commit 0ba1990

Browse files
kirito632kirito632
committed
feat(string): support IFEQ/IFNE/IFDEQ/IFDNE in SET command
1 parent 8d4d8ea commit 0ba1990

5 files changed

Lines changed: 457 additions & 5 deletions

File tree

‎src/commands/cmd_string.cc‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,18 @@ class CommandSet : public Commander {
344344
set_flag_ = StringSetType::NX;
345345
} else if (parser.EatEqICaseFlag("XX", set_flag)) {
346346
set_flag_ = StringSetType::XX;
347+
} else if (parser.EatEqICaseFlag("IFEQ", set_flag)) {
348+
set_flag_ = StringSetType::IFEQ;
349+
cmp_value_ = GET_OR_RET(parser.TakeStr());
350+
} else if (parser.EatEqICaseFlag("IFNE", set_flag)) {
351+
set_flag_ = StringSetType::IFNE;
352+
cmp_value_ = GET_OR_RET(parser.TakeStr());
353+
} else if (parser.EatEqICaseFlag("IFDEQ", set_flag)) {
354+
set_flag_ = StringSetType::IFDEQ;
355+
cmp_value_ = GET_OR_RET(parser.TakeStr());
356+
} else if (parser.EatEqICaseFlag("IFDNE", set_flag)) {
357+
set_flag_ = StringSetType::IFDNE;
358+
cmp_value_ = GET_OR_RET(parser.TakeStr());
347359
} else if (parser.EatEqICase("GET")) {
348360
get_ = true;
349361
} else {
@@ -358,7 +370,7 @@ class CommandSet : public Commander {
358370
std::optional<std::string> ret;
359371
redis::String string_db(srv->storage, conn->GetNamespace());
360372

361-
rocksdb::Status s = string_db.Set(ctx, args_[1], args_[2], {expire_, set_flag_, get_, keep_ttl_}, ret);
373+
rocksdb::Status s = string_db.Set(ctx, args_[1], args_[2], {expire_, set_flag_, get_, keep_ttl_, cmp_value_}, ret);
362374

363375
if (!s.ok()) {
364376
return {Status::RedisExecErr, s.ToString()};
@@ -385,6 +397,7 @@ class CommandSet : public Commander {
385397
bool get_ = false;
386398
bool keep_ttl_ = false;
387399
StringSetType set_flag_ = StringSetType::NONE;
400+
std::string cmp_value_;
388401
};
389402

390403
class CommandSetEX : public Commander {

‎src/types/redis_string.cc‎

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ rocksdb::Status String::Set(engine::Context &ctx, const std::string &user_key, c
239239
}
240240

241241
rocksdb::Status String::Set(engine::Context &ctx, const std::string &user_key, const std::string &value,
242-
StringSetArgs args, std::optional<std::string> &ret) {
242+
const StringSetArgs &args, std::optional<std::string> &ret) {
243243
uint64_t expire = 0;
244244
std::string ns_key = AppendNamespacePrefix(user_key);
245245

@@ -249,6 +249,21 @@ rocksdb::Status String::Set(engine::Context &ctx, const std::string &user_key, c
249249
uint64_t old_expire = 0;
250250
auto s = getValueAndExpire(ctx, ns_key, &old_value, &old_expire);
251251
if (!s.ok() && !s.IsNotFound() && !s.IsInvalidArgument()) return s;
252+
// If the existing key is not a string type, enforce expected behaviors:
253+
if (s.IsInvalidArgument()) {
254+
// For conditional comparisons (IFEQ/IFNE/IFDEQ/IFDNE), reading the old value is required,
255+
// so return the underlying WRONGTYPE (InvalidArgument) error.
256+
if (args.type == StringSetType::IFEQ || args.type == StringSetType::IFNE || args.type == StringSetType::IFDEQ ||
257+
args.type == StringSetType::IFDNE) {
258+
return s;
259+
}
260+
// For NX option, treat a wrong type as "key exists" so the condition is not met.
261+
if (args.type == StringSetType::NX) {
262+
if (!args.get) ret = std::nullopt;
263+
return rocksdb::Status::OK();
264+
}
265+
// For other options, continue (e.g., XX may still proceed since key exists).
266+
}
252267
// GET option
253268
if (args.get) {
254269
if (s.IsInvalidArgument()) {
@@ -271,6 +286,38 @@ rocksdb::Status String::Set(engine::Context &ctx, const std::string &user_key, c
271286
// if XX option given, the key didn't exist before: return nil
272287
if (!args.get) ret = std::nullopt;
273288
return rocksdb::Status::OK();
289+
} else if (args.type == StringSetType::IFEQ) {
290+
// condition met only when key exists AND value matches
291+
bool matched = s.ok() && (old_value == args.cmp_value);
292+
if (!matched) {
293+
if (!args.get) ret = std::nullopt;
294+
return rocksdb::Status::OK();
295+
}
296+
if (!args.get) ret = "";
297+
} else if (args.type == StringSetType::IFNE) {
298+
// condition not met when key exists AND value matches; key-not-found counts as met
299+
bool not_matched = s.ok() && (old_value == args.cmp_value);
300+
if (not_matched) {
301+
if (!args.get) ret = std::nullopt;
302+
return rocksdb::Status::OK();
303+
}
304+
if (!args.get) ret = "";
305+
} else if (args.type == StringSetType::IFDEQ) {
306+
// condition met only when key exists AND digest matches
307+
bool matched = s.ok() && (util::StringDigest(old_value) == args.cmp_value);
308+
if (!matched) {
309+
if (!args.get) ret = std::nullopt;
310+
return rocksdb::Status::OK();
311+
}
312+
if (!args.get) ret = "";
313+
} else if (args.type == StringSetType::IFDNE) {
314+
// condition not met when key exists AND digest matches; key-not-found counts as met
315+
bool not_matched = s.ok() && (util::StringDigest(old_value) == args.cmp_value);
316+
if (not_matched) {
317+
if (!args.get) ret = std::nullopt;
318+
return rocksdb::Status::OK();
319+
}
320+
if (!args.get) ret = "";
274321
} else {
275322
// if GET option not given, make ret not nil
276323
if (!args.get) ret = "";

‎src/types/redis_string.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,15 @@ struct DelExOption {
4343
DelExOption(Type type, std::string value) : type(type), value(std::move(value)) {}
4444
};
4545

46-
enum class StringSetType { NONE, NX, XX };
46+
enum class StringSetType { NONE, NX, XX, IFEQ, IFNE, IFDEQ, IFDNE };
4747

4848
struct StringSetArgs {
4949
// Expire time in mill seconds.
5050
uint64_t expire;
5151
StringSetType type;
5252
bool get;
5353
bool keep_ttl;
54+
std::string cmp_value; // valid only when type is IFEQ/IFNE/IFDEQ/IFDNE
5455
};
5556

5657
struct StringMSetArgs {
@@ -103,8 +104,8 @@ class String : public Database {
103104
std::optional<std::string> &old_value);
104105
rocksdb::Status GetDel(engine::Context &ctx, const std::string &user_key, std::string *value);
105106
rocksdb::Status Set(engine::Context &ctx, const std::string &user_key, const std::string &value);
106-
rocksdb::Status Set(engine::Context &ctx, const std::string &user_key, const std::string &value, StringSetArgs args,
107-
std::optional<std::string> &ret);
107+
rocksdb::Status Set(engine::Context &ctx, const std::string &user_key, const std::string &value,
108+
const StringSetArgs &args, std::optional<std::string> &ret);
108109
rocksdb::Status SetEX(engine::Context &ctx, const std::string &user_key, const std::string &value,
109110
uint64_t expire_ms);
110111
rocksdb::Status SetNX(engine::Context &ctx, const std::string &user_key, const std::string &value, uint64_t expire_ms,

‎tests/cppunit/types/string_test.cc‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,3 +613,46 @@ TEST_F(RedisStringTest, LCS) {
613613
4},
614614
std::get<StringLCSIdxResult>(rst));
615615
}
616+
617+
TEST_F(RedisStringTest, SetIFDEQ) {
618+
std::string key = "ifdeq-key";
619+
std::string value = "hello";
620+
std::optional<std::string> ret;
621+
622+
// key not found → condition not met, no write
623+
auto s = string_->Set(*ctx_, key, "new", {0, StringSetType::IFDEQ, false, false, util::StringDigest(value)}, ret);
624+
EXPECT_TRUE(s.ok());
625+
EXPECT_FALSE(ret.has_value());
626+
std::string got;
627+
EXPECT_TRUE(string_->Get(*ctx_, key, &got).IsNotFound());
628+
629+
// set up the key
630+
string_->Set(*ctx_, key, value);
631+
632+
// digest matches → write succeeds
633+
ret = std::nullopt;
634+
s = string_->Set(*ctx_, key, "new", {0, StringSetType::IFDEQ, false, false, util::StringDigest(value)}, ret);
635+
EXPECT_TRUE(s.ok());
636+
EXPECT_TRUE(ret.has_value());
637+
string_->Get(*ctx_, key, &got);
638+
EXPECT_EQ("new", got);
639+
640+
// digest mismatches → no write
641+
ret = std::nullopt;
642+
s = string_->Set(*ctx_, key, "newer", {0, StringSetType::IFDEQ, false, false, "xxxxxxxxxxxxxxxx"}, ret);
643+
EXPECT_TRUE(s.ok());
644+
EXPECT_FALSE(ret.has_value());
645+
string_->Get(*ctx_, key, &got);
646+
EXPECT_EQ("new", got);
647+
648+
// empty string edge case: digest of "" is well-defined
649+
string_->Set(*ctx_, key, "");
650+
ret = std::nullopt;
651+
s = string_->Set(*ctx_, key, "nonempty", {0, StringSetType::IFDEQ, false, false, util::StringDigest("")}, ret);
652+
EXPECT_TRUE(s.ok());
653+
EXPECT_TRUE(ret.has_value());
654+
string_->Get(*ctx_, key, &got);
655+
EXPECT_EQ("nonempty", got);
656+
657+
EXPECT_TRUE(string_->Del(*ctx_, key).ok());
658+
}

0 commit comments

Comments
 (0)