fix:Segmentation fault in zremrangebyrank (OpenAtomFoundation#2896)

Co-authored-by: chejinge <[email protected]>
cheniujh · Sep 13, 2024 · 9cfe839 · 9cfe839
1 parent f41be92
commit 9cfe839
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 1 deletion.
diff --git a/src/pika_zset.cc b/src/pika_zset.cc
@@ -1356,6 +1356,8 @@ void ZRemrangebyrankCmd::DoInitial() {
  return;
  }
  key_ = argv_[1];
+ min_ = argv_[2];
+ max_ = argv_[3];
  if (pstd::string2int(argv_[2].data(), argv_[2].size(), &start_rank_) == 0) {
  res_.SetRes(CmdRes::kInvalidInt);
  return;
@@ -1384,7 +1386,7 @@ void ZRemrangebyrankCmd::DoThroughDB() {
 
 void ZRemrangebyrankCmd::DoUpdateCache() {
  if (s_.ok()) {
- db_->cache()->ZRemrangebyrank(key_, min_, max_, ele_deleted_);
+ db_->cache()->ZRemrangebyrank(key_, min_, max_, ele_deleted_, db_);
  }
 }
 

diff --git a/tests/integration/zset_test.go b/tests/integration/zset_test.go
@@ -1460,6 +1460,76 @@ var _ = Describe("Zset Commands", func() {
  }}))
  })
 
+ It("should perform Case 1: ZRemRangeByRank", func() {
+ client.Del(ctx, "zset1")
+
+ vals, err := client.ZRange(ctx, "zset1", 0, -1).Result()
+ Expect(err).NotTo(HaveOccurred())
+ Expect(vals).To(BeEmpty())
+
+ err = client.ZAdd(ctx, "zset1", redis.Z{Score: 1, Member: "m1"}, redis.Z{Score: 2, Member: "m2"}, redis.Z{Score: 3, Member: "m3"}).Err()
+ Expect(err).NotTo(HaveOccurred())
+
+ vals, err = client.ZRange(ctx, "zset1", 0, -1).Result()
+ Expect(err).NotTo(HaveOccurred())
+ Expect(vals).To(Equal([]string{"m1", "m2", "m3"}))
+
+ zRemRangeByRank := client.ZRemRangeByRank(ctx, "zset1", 0, 1)
+ Expect(zRemRangeByRank.Err()).NotTo(HaveOccurred())
+ Expect(zRemRangeByRank.Val()).To(Equal(int64(2)))
+
+ vals, err = client.ZRange(ctx, "zset1", 0, -1).Result()
+ Expect(err).NotTo(HaveOccurred())
+ Expect(vals).To(Equal([]string{"m3"}))
+ })
+
+ It("should perform Case 2: ZRemRangeByRank", func() {
+ client.Del(ctx, "zset1")
+
+ err := client.ZAdd(ctx, "zset1", redis.Z{Score: 3, Member: "m3"}, redis.Z{Score: 4, Member: "m4"}).Err()
+ Expect(err).NotTo(HaveOccurred())
+
+ vals, err := client.ZRange(ctx, "zset1", 0, -1).Result()
+ Expect(err).NotTo(HaveOccurred())
+ Expect(vals).To(Equal([]string{"m3", "m4"}))
+
+ zRemRangeByRank := client.ZRemRangeByRank(ctx, "zset1", 0, 1)
+ Expect(zRemRangeByRank.Err()).NotTo(HaveOccurred())
+ Expect(zRemRangeByRank.Val()).To(Equal(int64(2)))
+
+ vals, err = client.ZRange(ctx, "zset1", 0, -1).Result()
+ Expect(err).NotTo(HaveOccurred())
+ Expect(vals).To(BeEmpty())
+ })
+
+ It("should perform Case 3: ZRemRangeByRank", func() {
+ client.Del(ctx, "zset1")
+
+ err := client.ZAdd(ctx, "zset1", redis.Z{Score: 2, Member: "m2"}, redis.Z{Score: 3, Member: "m1"},
+ redis.Z{Score: 3, Member: "m3"}, redis.Z{Score: 4, Member: "m4"}).Err()
+ Expect(err).NotTo(HaveOccurred())
+
+ vals, err := client.ZRangeWithScores(ctx, "zset1", 0, -1).Result()
+ Expect(err).NotTo(HaveOccurred())
+ Expect(vals).To(Equal([]redis.Z{
+ {Score: 2, Member: "m2"},
+ {Score: 3, Member: "m1"},
+ {Score: 3, Member: "m3"},
+ {Score: 4, Member: "m4"},
+ }))
+
+ zRemRangeByRank := client.ZRemRangeByRank(ctx, "zset1", 0, 1)
+ Expect(zRemRangeByRank.Err()).NotTo(HaveOccurred())
+ Expect(zRemRangeByRank.Val()).To(Equal(int64(2)))
+
+ vals, err = client.ZRangeWithScores(ctx, "zset1", 0, -1).Result()
+ Expect(err).NotTo(HaveOccurred())
+ Expect(vals).To(Equal([]redis.Z{
+ {Score: 3, Member: "m3"},
+ {Score: 4, Member: "m4"},
+ }))
+ })
+
  It("should ZRemRangeByScore", func() {
  err := client.ZAdd(ctx, "zset", redis.Z{Score: 1, Member: "one"}).Err()
  Expect(err).NotTo(HaveOccurred())