Skip to content

Add support of BITFIELD_RO #1990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 6, 2024
Merged

Add support of BITFIELD_RO #1990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion src/commands/cmd_bit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ class CommandBitOp : public Commander {
BitOpFlags op_flag_;
};

template <bool ReadOnly>
class CommandBitfield : public Commander {
public:
Status Parse(const std::vector<std::string> &args) override {
Expand Down Expand Up @@ -314,6 +315,12 @@ class CommandBitfield : public Commander {
cmds_.push_back(cmd);
}

if constexpr (ReadOnly) {
if (!read_only_) {
return {Status::RedisParseErr, "BITFIELD_RO only supports the GET subcommand"};
}
}

return Commander::Parse(args);
}

Expand Down Expand Up @@ -394,6 +401,7 @@ REDIS_REGISTER_COMMANDS(MakeCmdAttr<CommandGetBit>("getbit", 3, "read-only", 1,
MakeCmdAttr<CommandBitCount>("bitcount", -2, "read-only", 1, 1, 1),
MakeCmdAttr<CommandBitPos>("bitpos", -3, "read-only", 1, 1, 1),
MakeCmdAttr<CommandBitOp>("bitop", -4, "write", 2, -1, 1),
MakeCmdAttr<CommandBitfield>("bitfield", -2, "write", 1, 1, 1), )
MakeCmdAttr<CommandBitfield<false>>("bitfield", -2, "write", 1, 1, 1),
MakeCmdAttr<CommandBitfield<true>>("bitfield_ro", -2, "read-only", 1, 1, 1), )

} // namespace redis
14 changes: 13 additions & 1 deletion tests/gocase/unit/type/bitmap/bitmap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,13 +303,25 @@ func TestBitmap(t *testing.T) {
require.EqualValues(t, 32, rdb.BitOpOr(ctx, "x", "a", "b").Val())
})

t.Run("BITFIELD on string type", func(t *testing.T) {
t.Run("BITFIELD and BITFIELD_RO on string type", func(t *testing.T) {
str := "zhe ge ren hen lan, shen me dou mei you liu xia."
require.NoError(t, rdb.Set(ctx, "str", str, 0).Err())
for _, command := range []string{"BITFIELD", "BITFIELD_RO"} {
res := rdb.Do(ctx, command, "str", "GET", "u8", "32", "GET", "u8", "40")
require.NoError(t, res.Err())
require.EqualValues(t, []interface{}{int64(str[4]), int64(str[5])}, res.Val())
}

res := rdb.BitField(ctx, "str", "GET", "u8", "32", "SET", "u8", "32", 'r', "GET", "u8", "32")
require.NoError(t, res.Err())
require.EqualValues(t, str[4], res.Val()[0])
require.EqualValues(t, str[4], res.Val()[1])
require.EqualValues(t, 'r', res.Val()[2])
require.ErrorContains(t, rdb.Do(ctx, "BITFIELD_RO", "str", "GET", "u8", "32", "SET", "u8", "32", 'r', "GET", "u8", "32").Err(), "BITFIELD_RO only supports the GET subcommand")

res = rdb.BitField(ctx, "str", "INCRBY", "u8", "32", 2)
require.NoError(t, res.Err())
require.EqualValues(t, 't', res.Val()[0])
require.ErrorContains(t, rdb.Do(ctx, "BITFIELD_RO", "str", "INCRBY", "u8", "32", 2).Err(), "BITFIELD_RO only supports the GET subcommand")
})
}