Skip to content

Commit 5e23f1c

Browse files
denglimingmp911de
authored andcommitted
Simplify CLUSTER MYID command for Jedis.
Closes #2226
1 parent c63e2e2 commit 5e23f1c

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterConnection.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
* @author Tao Chen
7171
* @author Chen Guanqun
7272
* @author Pavel Khokhlov
73+
* @author Liming Deng
7374
* @since 1.7
7475
*/
7576
public class JedisClusterConnection implements DefaultedRedisClusterConnection {
@@ -577,13 +578,10 @@ public Set<RedisClusterNode> clusterGetSlaves(RedisClusterNode master) {
577578
@Override
578579
public Map<RedisClusterNode, Collection<RedisClusterNode>> clusterGetMasterSlaveMap() {
579580

580-
List<NodeResult<Collection<RedisClusterNode>>> nodeResults = clusterCommandExecutor
581-
.executeCommandAsyncOnNodes((JedisClusterCommandCallback<Collection<RedisClusterNode>>) client -> {
582-
583-
// TODO: remove client.eval as soon as Jedis offers support for myid
584-
return JedisConverters.toSetOfRedisClusterNodes(
585-
client.clusterSlaves((String) client.eval("return redis.call('cluster', 'myid')", 0)));
586-
}, topologyProvider.getTopology().getActiveMasterNodes()).getResults();
581+
List<NodeResult<Collection<RedisClusterNode>>> nodeResults = clusterCommandExecutor.executeCommandAsyncOnNodes(
582+
(JedisClusterCommandCallback<Collection<RedisClusterNode>>) client -> JedisConverters
583+
.toSetOfRedisClusterNodes(client.clusterSlaves(client.clusterMyId())),
584+
topologyProvider.getTopology().getActiveMasterNodes()).getResults();
587585

588586
Map<RedisClusterNode, Collection<RedisClusterNode>> result = new LinkedHashMap<>();
589587

0 commit comments

Comments
 (0)