feat: 更新 Redis 示例

dunwu · dunwu · commit 9f69c6f192b5 · 2022-06-08T21:03:22.000+08:00
diff --git a/codes/javadb/javadb-redis/src/test/java/io/github/dunwu/javadb/redis/jedis/rank/RankDemo.java b/codes/javadb/javadb-redis/src/test/java/io/github/dunwu/javadb/redis/jedis/rank/RankDemo.java
@@ -67,6 +67,9 @@ public RankDemo(Jedis jedis) {
     public RankElement getRankByMember(String member) {
         if (isRegionRankEnabled) {
             RankRegionElement element = getRankByMemberWithRegions(member);
+            if (element == null) {
+                return null;
+            }
             return BeanUtil.toBean(element, RankElement.class);
         } else {
             // 排行榜采用不分区方案
@@ -137,16 +140,21 @@ public void saveRank(String member, double score) {
      * @return /
      */
     public RankElement getRankByMemberWithNoRegions(String member) {
-        Long rank = jedis.zrevrank(RANK, member);
-        if (rank != null) {
-            Set<Tuple> tuples = jedis.zrevrangeWithScores(RANK, rank, rank);
-            for (Tuple tuple : tuples) {
-                if (tuple.getElement().equals(member)) {
-                    return new RankElement(member, tuple.getScore(), rank);
-                }
-            }
+        Pipeline pipeline = jedis.pipelined();
+        Response<Long> rankResponse = pipeline.zrevrank(RANK, member);
+        Response<Double> scoreResponse = pipeline.zscore(RANK, member);
+        pipeline.syncAndReturnAll();
+
+        if (rankResponse == null || scoreResponse == null) {
+            return null;
         }
-        return new RankElement(member, null, TOTAL_RANK_LENGTH);
+
+        Long rank = rankResponse.get();
+        Double score = scoreResponse.get();
+        if (rank == null || score == null) {
+            return null;
+        }
+        return new RankElement(member, score, rank);
     }
 
     /**
@@ -214,13 +222,15 @@ private void saveRankWithNoRegions(final String member, final double score) {
      * @return /
      */
     public RankRegionElement getRankByMemberWithRegions(String member) {
-        long totalRank = TOTAL_RANK_LENGTH;
 
         // pipeline 合并查询
-        List<Response<Long>> responseList = new LinkedList<>();
+        List<Map<String, Response<?>>> responseList = new LinkedList<>();
         Pipeline pipeline = jedis.pipelined();
         for (RankRegion region : REGIONS) {
-            responseList.add(pipeline.zrevrank(region.getRegionKey(), member));
+            Map<String, Response<?>> map = new HashMap<>(2);
+            map.put("rank", pipeline.zrevrank(region.getRegionKey(), member));
+            map.put("score", pipeline.zscore(region.getRegionKey(), member));
+            responseList.add(map);
         }
         pipeline.syncAndReturnAll();
 
@@ -231,18 +241,25 @@ public RankRegionElement getRankByMemberWithRegions(String member) {
 
         // 处理 pipeline 查询结果
         for (int i = 0; i < responseList.size(); i++) {
-            Response<Long> response = responseList.get(i);
-            if (response != null && response.get() != null) {
-                Long rank = response.get();
-                RankRegion region = REGIONS.get(i);
-                totalRank = getTotalRank(region.getRegionNo(), rank);
-                return new RankRegionElement(region.getRegionNo(), region.getRegionKey(), member, null, rank,
-                                             totalRank);
+            Map<String, Response<?>> map = responseList.get(i);
+            Response<?> rankResponse = map.get("rank");
+            Response<?> scoreResponse = map.get("score");
+            if (rankResponse == null && scoreResponse == null) {
+                continue;
             }
+
+            Long rank = (Long) rankResponse.get();
+            Double score = (Double) scoreResponse.get();
+            if (rank == null || score == null) {
+                continue;
+            }
+
+            RankRegion region = REGIONS.get(i);
+            long totalRank = getTotalRank(region.getRegionNo(), rank);
+            return new RankRegionElement(region.getRegionNo(), region.getRegionKey(), member, score, rank, totalRank);
         }
 
-        int lastRegionNo = getLastRegionNo();
-        return new RankRegionElement(lastRegionNo, getRankRedisKey(lastRegionNo), member, null, null, totalRank);
+        return null;
     }
 
     /**
diff --git a/codes/javadb/javadb-redis/src/test/java/io/github/dunwu/javadb/redis/jedis/rank/RankDemoTests.java b/codes/javadb/javadb-redis/src/test/java/io/github/dunwu/javadb/redis/jedis/rank/RankDemoTests.java
@@ -95,7 +95,7 @@ public void testAdd() {
         RankElement rank1 = rank.getRankByMember(member1);
         RankElement rank2 = rank.getRankByMember(member2);
         Assertions.assertEquals(RankDemo.FIRST, rank1.getTotalRank());
-        Assertions.assertEquals(RankDemo.TOTAL_RANK_LENGTH, rank2.getTotalRank());
+        Assertions.assertNull(rank2);
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public void testAdd() {`
`95`	`95`	`RankElement rank1 = rank.getRankByMember(member1);`
`96`	`96`	`RankElement rank2 = rank.getRankByMember(member2);`
`97`	`97`	`Assertions.assertEquals(RankDemo.FIRST, rank1.getTotalRank());`
`98`		`- Assertions.assertEquals(RankDemo.TOTAL_RANK_LENGTH, rank2.getTotalRank());`
	`98`	`+ Assertions.assertNull(rank2);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`