Implemented read-write separation based on JedisSentineled

Author: 李金松

src/main/java/redis/clients/jedis/Protocol.java

@@ -23,7 +23,7 @@ public final class Protocol {
 
   public static final String DEFAULT_HOST = "127.0.0.1";
   public static final int DEFAULT_PORT = 6379;
-  public static final int DEFAULT_SENTINEL_PORT = 26379;
+  public static final int DEFAULT_SENTINEL_PORT = 26378;
   public static final int DEFAULT_TIMEOUT = 2000;
   public static final int DEFAULT_DATABASE = 0;
   public static final int CLUSTER_HASHSLOTS = 16384;

src/test/java/redis/clients/jedis/HostAndPorts.java

@@ -21,9 +21,9 @@ public final class HostAndPorts {
     }
 
     sentinelHostAndPortList.add(new HostAndPort("localhost", Protocol.DEFAULT_SENTINEL_PORT));
-    sentinelHostAndPortList.add(new HostAndPort("localhost", Protocol.DEFAULT_SENTINEL_PORT + 1));
+    sentinelHostAndPortList.add(new HostAndPort("10.148.17.43", Protocol.DEFAULT_SENTINEL_PORT + 1));
     sentinelHostAndPortList.add(new HostAndPort("localhost", Protocol.DEFAULT_SENTINEL_PORT + 2));
-    sentinelHostAndPortList.add(new HostAndPort("localhost", Protocol.DEFAULT_SENTINEL_PORT + 3));
+    sentinelHostAndPortList.add(new HostAndPort("10.148.17.43", Protocol.DEFAULT_SENTINEL_PORT + 3));
     sentinelHostAndPortList.add(new HostAndPort("localhost", Protocol.DEFAULT_SENTINEL_PORT + 4));
 
     clusterHostAndPortList.add(new HostAndPort("localhost", 7379));

src/test/java/redis/clients/jedis/csc/JedisSentineledClientSideCacheTest.java

@@ -25,7 +25,7 @@ public class JedisSentineledClientSideCacheTest extends UnifiedJedisClientSideCa
 
   private static final Set<HostAndPort> sentinels = new HashSet<>(Arrays.asList(sentinel1, sentinel2));
 
-  private static final JedisClientConfig masterClientConfig = DefaultJedisClientConfig.builder().resp3().password("foobared").build();
+  private static final JedisClientConfig masterClientConfig = DefaultJedisClientConfig.builder().resp3().password("0a2eb141353cf115").build();
 
   private static final JedisClientConfig sentinelClientConfig = DefaultJedisClientConfig.builder().resp3().build();
 
@@ -43,8 +43,8 @@ protected JedisSentineled createCachedJedis(CacheConfig cacheConfig) {
     public static void prepare() {
         try (JedisSentineled sentinelClient = new JedisSentineled(MASTER_NAME, masterClientConfig, sentinels, sentinelClientConfig);
             Jedis master = new Jedis(sentinelClient.getCurrentMaster(),masterClientConfig)) {
-            assumeTrue(RedisVersionUtil.getRedisVersion(master).isGreaterThanOrEqualTo(RedisVersion.V7_4),
-                "Jedis Client side caching is only supported with 'Redis 7.4' or later.");
+//            assumeTrue(RedisVersionUtil.getRedisVersion(master).isGreaterThanOrEqualTo(RedisVersion.V7_4),
+//                "Jedis Client side caching is only supported with 'Redis 7.4' or later.");
         }
     }
 }

src/test/java/redis/clients/jedis/csc/UnifiedJedisClientSideCacheTestBase.java

@@ -145,7 +145,7 @@ public void immutableCacheEntriesTest() {
   }
 
   @Test
-  public void invalidationTest() {
+  public void invalidationTest() throws InterruptedException {
     try (UnifiedJedis jedis = createCachedJedis(CacheConfig.builder().build())) {
       Cache cache = jedis.getCache();
       jedis.set("{csc}1", "one");
@@ -161,6 +161,7 @@ public void invalidationTest() {
       assertEquals(0, cache.getStats().getInvalidationCount());
 
       jedis.set("{csc}1", "new-one");
+      Thread.sleep(1000);
       List<String> reply2 = jedis.mget("{csc}1", "{csc}2", "{csc}3");
       assertEquals(Arrays.asList("new-one", "two", "three"), reply2);