Skip to content
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

ZRANGE / ZREVRANK add withscore option support #1607

Merged
merged 8 commits into from
Jul 29, 2023
Merged

ZRANGE / ZREVRANK add withscore option support #1607

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1269928
ZRANGE / ZREVRANK add withscore option support
enjoy-binbin Jul 25, 2023
b30658a
format the code
enjoy-binbin Jul 25, 2023
a7f1f18
Merge branch 'unstable' into zrank_withscore
aleksraiden Jul 27, 2023
bf136e0
Merge branch 'unstable' into zrank_withscore
PragmaTwice Jul 28, 2023
e407a82
Merge branch 'unstable' into zrank_withscore
PragmaTwice Jul 29, 2023
af0e6e2
Merge branch 'unstable' into zrank_withscore
PragmaTwice Jul 29, 2023
00c354a
Merge branch 'unstable' into zrank_withscore
PragmaTwice Jul 29, 2023
2f7641e
Merge branch 'unstable' into zrank_withscore
PragmaTwice Jul 29, 2023
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
41 changes: 36 additions & 5 deletions src/commands/cmd_zset.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,24 +966,55 @@ class CommandZRevRangeByScore : public CommandZRangeGeneric {
class CommandZRank : public Commander {
public:
explicit CommandZRank(bool reversed = false) : reversed_(reversed) {}

Status Parse(const std::vector<std::string> &args) override {
if (args.size() > 4) {
return {Status::RedisParseErr, errWrongNumOfArguments};
}

// skip the <CMD> <key> <member> and parse remaining optional arguments
CommandParser parser(args, 3);
while (parser.Good()) {
if (parser.EatEqICase("withscore") && !with_score_) {
enjoy-binbin marked this conversation as resolved.
Show resolved Hide resolved
with_score_ = true;
} else {
return parser.InvalidSyntax();
}
}

return Commander::Parse(args);
}

Status Execute(Server *svr, Connection *conn, std::string *output) override {
int rank = 0;
double score = 0.0;
redis::ZSet zset_db(svr->storage, conn->GetNamespace());
auto s = zset_db.Rank(args_[1], args_[2], reversed_, &rank);
auto s = zset_db.Rank(args_[1], args_[2], reversed_, &rank, &score);
if (!s.ok()) {
return {Status::RedisExecErr, s.ToString()};
}

mapleFU marked this conversation as resolved.
Show resolved Hide resolved
if (rank == -1) {
*output = redis::NilString();
if (with_score_) {
output->append(redis::MultiLen(-1));
} else {
*output = redis::NilString();
}
} else {
*output = redis::Integer(rank);
if (with_score_) {
output->append(redis::MultiLen(2));
output->append(redis::Integer(rank));
output->append(redis::BulkString(util::Float2String(score)));
} else {
*output = redis::Integer(rank);
}
}
return Status::OK();
}

private:
bool reversed_;
bool with_score_ = false;
};

class CommandZRevRank : public CommandZRank {
Expand Down Expand Up @@ -1361,13 +1392,13 @@ REDIS_REGISTER_COMMANDS(MakeCmdAttr<CommandZAdd>("zadd", -4, "write", 1, 1, 1),
MakeCmdAttr<CommandZRangeByLex>("zrangebylex", -4, "read-only", 1, 1, 1),
MakeCmdAttr<CommandZRevRangeByLex>("zrevrangebylex", -4, "read-only", 1, 1, 1),
MakeCmdAttr<CommandZRangeByScore>("zrangebyscore", -4, "read-only", 1, 1, 1),
MakeCmdAttr<CommandZRank>("zrank", 3, "read-only", 1, 1, 1),
MakeCmdAttr<CommandZRank>("zrank", -3, "read-only", 1, 1, 1),
MakeCmdAttr<CommandZRem>("zrem", -3, "write", 1, 1, 1),
MakeCmdAttr<CommandZRemRangeByRank>("zremrangebyrank", 4, "write", 1, 1, 1),
MakeCmdAttr<CommandZRemRangeByScore>("zremrangebyscore", 4, "write", 1, 1, 1),
MakeCmdAttr<CommandZRemRangeByLex>("zremrangebylex", 4, "write", 1, 1, 1),
MakeCmdAttr<CommandZRevRangeByScore>("zrevrangebyscore", -4, "read-only", 1, 1, 1),
MakeCmdAttr<CommandZRevRank>("zrevrank", 3, "read-only", 1, 1, 1),
MakeCmdAttr<CommandZRevRank>("zrevrank", -3, "read-only", 1, 1, 1),
MakeCmdAttr<CommandZScore>("zscore", 3, "read-only", 1, 1, 1),
MakeCmdAttr<CommandZMScore>("zmscore", -3, "read-only", 1, 1, 1),
MakeCmdAttr<CommandZScan>("zscan", -3, "read-only", 1, 1, 1),
Expand Down
5 changes: 4 additions & 1 deletion src/types/redis_zset.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,8 +566,10 @@ rocksdb::Status ZSet::Remove(const Slice &user_key, const std::vector<Slice> &me
return storage_->Write(storage_->DefaultWriteOptions(), batch->GetWriteBatch());
}

rocksdb::Status ZSet::Rank(const Slice &user_key, const Slice &member, bool reversed, int *member_rank) {
rocksdb::Status ZSet::Rank(const Slice &user_key, const Slice &member, bool reversed, int *member_rank,
double *member_score) {
*member_rank = -1;
*member_score = 0.0;

std::string ns_key;
AppendNamespacePrefix(user_key, &ns_key);
Expand Down Expand Up @@ -613,6 +615,7 @@ rocksdb::Status ZSet::Rank(const Slice &user_key, const Slice &member, bool reve
}

*member_rank = rank;
*member_score = target_score;
return rocksdb::Status::OK();
}

Expand Down
3 changes: 2 additions & 1 deletion src/types/redis_zset.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ class ZSet : public SubKeyScanner {
rocksdb::Status Add(const Slice &user_key, ZAddFlags flags, MemberScores *mscores, uint64_t *added_cnt);
rocksdb::Status Card(const Slice &user_key, uint64_t *size);
rocksdb::Status IncrBy(const Slice &user_key, const Slice &member, double increment, double *score);
rocksdb::Status Rank(const Slice &user_key, const Slice &member, bool reversed, int *member_rank);
rocksdb::Status Rank(const Slice &user_key, const Slice &member, bool reversed, int *member_rank,
double *member_score);
rocksdb::Status Remove(const Slice &user_key, const std::vector<Slice> &members, uint64_t *removed_cnt);
rocksdb::Status Pop(const Slice &user_key, int count, bool min, MemberScores *mscores);
rocksdb::Status Score(const Slice &user_key, const Slice &member, double *score);
Expand Down
12 changes: 9 additions & 3 deletions tests/cppunit/types/zset_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,19 +382,25 @@ TEST_F(RedisZSetTest, Rank) {

for (size_t i = 0; i < fields_.size(); i++) {
int rank = 0;
zset_->Rank(key_, fields_[i], false, &rank);
double score = 0.0;
zset_->Rank(key_, fields_[i], false, &rank, &score);
EXPECT_EQ(i, rank);
EXPECT_EQ(scores_[i], score);
}
for (size_t i = 0; i < fields_.size(); i++) {
int rank = 0;
zset_->Rank(key_, fields_[i], true, &rank);
double score = 0.0;
zset_->Rank(key_, fields_[i], true, &rank, &score);
EXPECT_EQ(i, static_cast<int>(fields_.size() - rank - 1));
EXPECT_EQ(scores_[i], score);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would FLOAT EQ better here? Or it's expect to be EQ?

}
std::vector<std::string> no_exist_members = {"a", "b"};
for (const auto &member : no_exist_members) {
int rank = 0;
zset_->Rank(key_, member, true, &rank);
double score = 0.0;
zset_->Rank(key_, member, true, &rank, &score);
EXPECT_EQ(-1, rank);
EXPECT_EQ(0.0, score);
}
zset_->Del(key_);
}
28 changes: 25 additions & 3 deletions tests/gocase/unit/type/zset/zset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,20 +649,42 @@ func basicTests(t *testing.T, rdb *redis.Client, ctx context.Context, encoding s
rdb.ZAdd(ctx, "zranktmp", redis.Z{Score: 10, Member: "x"})
rdb.ZAdd(ctx, "zranktmp", redis.Z{Score: 20, Member: "y"})
rdb.ZAdd(ctx, "zranktmp", redis.Z{Score: 30, Member: "z"})

require.Equal(t, int64(0), rdb.ZRank(ctx, "zranktmp", "x").Val())
require.Equal(t, int64(1), rdb.ZRank(ctx, "zranktmp", "y").Val())
require.Equal(t, int64(2), rdb.ZRank(ctx, "zranktmp", "z").Val())
require.Equal(t, int64(0), rdb.ZRank(ctx, "zranktmp", "foo").Val())
require.Equal(t, redis.Nil, rdb.ZRank(ctx, "zranktmp", "foo").Err())
require.Equal(t, int64(2), rdb.ZRevRank(ctx, "zranktmp", "x").Val())
require.Equal(t, int64(1), rdb.ZRevRank(ctx, "zranktmp", "y").Val())
require.Equal(t, int64(0), rdb.ZRevRank(ctx, "zranktmp", "z").Val())
require.Equal(t, int64(0), rdb.ZRevRank(ctx, "zranktmp", "foo").Val())
require.Equal(t, redis.Nil, rdb.ZRevRank(ctx, "zranktmp", "foo").Err())

require.Equal(t, []interface {}{int64(0), "10"}, rdb.Do(ctx, "zrank", "zranktmp", "x", "withscore").Val())
require.Equal(t, []interface {}{int64(1), "20"}, rdb.Do(ctx, "zrank", "zranktmp", "y", "withscore").Val())
require.Equal(t, []interface {}{int64(2), "30"}, rdb.Do(ctx, "zrank", "zranktmp", "z", "withscore").Val())
require.Equal(t, redis.Nil, rdb.Do(ctx, "zrank", "zranktmp", "foo", "withscore").Err())
require.Equal(t, []interface {}{int64(2), "10"}, rdb.Do(ctx, "zrevrank", "zranktmp", "x", "withscore").Val())
require.Equal(t, []interface {}{int64(1), "20"}, rdb.Do(ctx, "zrevrank", "zranktmp", "y", "withscore").Val())
require.Equal(t, []interface {}{int64(0), "30"}, rdb.Do(ctx, "zrevrank", "zranktmp", "z", "withscore").Val())
require.Equal(t, redis.Nil, rdb.Do(ctx, "zrevrank", "zranktmp", "foo", "withscore").Err())
})

t.Run(fmt.Sprintf("ZRANK - after deletion -%s", encoding), func(t *testing.T) {
t.Run(fmt.Sprintf("ZRANK/ZREVRANK - after deletion -%s", encoding), func(t *testing.T) {
rdb.ZRem(ctx, "zranktmp", "y")

require.Equal(t, int64(0), rdb.ZRank(ctx, "zranktmp", "x").Val())
require.Equal(t, int64(1), rdb.ZRank(ctx, "zranktmp", "z").Val())
require.Equal(t, redis.Nil, rdb.ZRank(ctx, "zranktmp", "foo").Err())
require.Equal(t, int64(1), rdb.ZRevRank(ctx, "zranktmp", "x").Val())
require.Equal(t, int64(0), rdb.ZRevRank(ctx, "zranktmp", "z").Val())
require.Equal(t, redis.Nil, rdb.ZRevRank(ctx, "zranktmp", "foo").Err())

require.Equal(t, []interface {}{int64(0), "10"}, rdb.Do(ctx, "zrank", "zranktmp", "x", "withscore").Val())
require.Equal(t, []interface {}{int64(1), "30"}, rdb.Do(ctx, "zrank", "zranktmp", "z", "withscore").Val())
require.Equal(t, redis.Nil, rdb.Do(ctx, "zrank", "zranktmp", "foo", "withscore").Err())
require.Equal(t, []interface {}{int64(1), "10"}, rdb.Do(ctx, "zrevrank", "zranktmp", "x", "withscore").Val())
require.Equal(t, []interface {}{int64(0), "30"}, rdb.Do(ctx, "zrevrank", "zranktmp", "z", "withscore").Val())
require.Equal(t, redis.Nil, rdb.Do(ctx, "zrevrank", "zranktmp", "foo", "withscore").Err())
})

t.Run(fmt.Sprintf("ZINCRBY - can create a new sorted set - %s", encoding), func(t *testing.T) {
Expand Down