From 1fba3daa84829ec53c16fe571329773fa327f466 Mon Sep 17 00:00:00 2001 From: cjh <1271435567@qq.com> Date: Thu, 23 May 2024 10:42:54 +0800 Subject: [PATCH 1/2] fix spop binlog data race --- include/pika_set.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/pika_set.h b/include/pika_set.h index 34e47d5edc..51d0c422ac 100644 --- a/include/pika_set.h +++ b/include/pika_set.h @@ -68,6 +68,10 @@ class SPopCmd : public Cmd { : Cmd(name, arity, flag, static_cast(AclCategory::SET)) { srem_cmd_ = std::make_shared(kCmdNameSRem, -3, kCmdFlagsWrite | kCmdFlagsSet); } + SPopCmd(const SPopCmd& other) + : Cmd(other), key_(other.key_), members_(other.members_), count_(other.count_), s_(other.s_) { + srem_cmd_ = std::make_shared(kCmdNameSRem, -3, kCmdFlagsWrite | kCmdFlagsSet); + } std::vector current_key() const override { std::vector res; res.push_back(key_); From 0c018e73f579dec2c1656d4d0099d55e17b0779e Mon Sep 17 00:00:00 2001 From: cjh <1271435567@qq.com> Date: Thu, 23 May 2024 19:54:41 +0800 Subject: [PATCH 2/2] adjust format --- include/pika_set.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/pika_set.h b/include/pika_set.h index 51d0c422ac..c4b8eb2031 100644 --- a/include/pika_set.h +++ b/include/pika_set.h @@ -66,8 +66,8 @@ class SPopCmd : public Cmd { public: SPopCmd(const std::string& name, int arity, uint32_t flag) : Cmd(name, arity, flag, static_cast(AclCategory::SET)) { - srem_cmd_ = std::make_shared(kCmdNameSRem, -3, kCmdFlagsWrite | kCmdFlagsSet); - } + srem_cmd_ = std::make_shared(kCmdNameSRem, -3, kCmdFlagsWrite | kCmdFlagsSet); + } SPopCmd(const SPopCmd& other) : Cmd(other), key_(other.key_), members_(other.members_), count_(other.count_), s_(other.s_) { srem_cmd_ = std::make_shared(kCmdNameSRem, -3, kCmdFlagsWrite | kCmdFlagsSet);