Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREDIS-869 - Polishing.

Browse Source 
Rename parameters and add methods with new nomenclature.

Original Pull Request: #355
This commit is contained in:
Christoph Strobl
2018-09-20 09:56:02 +02:00
parent 169b1bd174
commit 45cbb21849
7 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/springframework/data/redis/connection/RedisClusterCommands.java
View File

@@ -174,10 +174,10 @@ public interface RedisClusterCommands {
* Assign a {@literal slave} to given {@literal master}.
*
* @param master must not be {@literal null}.
* @param slave must not be {@literal null}.
* @param replica must not be {@literal null}.
* @see <a href="https://redis.io/commands/cluster-replicate">Redis Documentation: CLUSTER REPLICATE</a>
*/
void clusterReplicate(RedisClusterNode master, RedisClusterNode slave);
void clusterReplicate(RedisClusterNode master, RedisClusterNode replica);
enum AddSlots {
MIGRATING, IMPORTING, STABLE, NODE

10
src/main/java/org/springframework/data/redis/connection/RedisClusterNode.java
View File

@@ -326,6 +326,16 @@ public class RedisClusterNode extends RedisNode {
return this;
}
/*
* (non-Javadoc)
* @see org.springframework.data.redis.connection.RedisNode.RedisNodeBuilder#replicaOf(java.lang.String)
*/
@Override
public RedisClusterNodeBuilder replicaOf(String masterId) {
super.replicaOf(masterId);
return this;
}
/**
* Set flags for node.
*

21
src/main/java/org/springframework/data/redis/connection/RedisNode.java
View File

@@ -128,6 +128,14 @@ public class RedisNode implements NamedNode {
* @since 1.7
*/
public boolean isSlave() {
return isReplica();
}
/**
* @return
* @since 2.1
*/
public boolean isReplica() {
return ObjectUtils.nullSafeEquals(NodeType.SLAVE, getType());
}
@@ -242,7 +250,7 @@ public class RedisNode implements NamedNode {
/**
* Set server role.
*
* @param nodeType
* @param type
* @return
* @since 1.7
*/
@@ -260,6 +268,17 @@ public class RedisNode implements NamedNode {
* @since 1.7
*/
public RedisNodeBuilder slaveOf(String masterId) {
return replicaOf(masterId);
}
/**
* Set the id of the master node.
*
* @param masterId
* @return this.
* @since 2.1
*/
public RedisNodeBuilder replicaOf(String masterId) {
node.masterId = masterId;
return this;

10
src/main/java/org/springframework/data/redis/connection/RedisServer.java
View File

@@ -166,6 +166,16 @@ public class RedisServer extends RedisNode {
}
public Long getNumberSlaves() {
return getNumberReplicas();
}
/**
* Get the number of connected replicas.
*
* @return
* @since 2.1
*/
public Long getNumberReplicas() {
return getLongValueOf(INFO.NUMBER_SLAVES);
}

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

@@ -641,12 +641,12 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
* @see org.springframework.data.redis.connection.RedisClusterCommands#clusterReplicate(org.springframework.data.redis.connection.RedisClusterNode, org.springframework.data.redis.connection.RedisClusterNode)
*/
@Override
public void clusterReplicate(RedisClusterNode master, RedisClusterNode slave) {
public void clusterReplicate(RedisClusterNode master, RedisClusterNode replica) {
RedisClusterNode masterNode = topologyProvider.getTopology().lookup(master);
clusterCommandExecutor.executeCommandOnSingleNode(
(JedisClusterCommandCallback<String>) client -> client.clusterReplicate(masterNode.getId()), slave);
(JedisClusterCommandCallback<String>) client -> client.clusterReplicate(masterNode.getId()), replica);
}

4
src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnection.java
View File

@@ -490,11 +490,11 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
* @see org.springframework.data.redis.connection.RedisClusterCommands#clusterReplicate(org.springframework.data.redis.connection.RedisClusterNode, org.springframework.data.redis.connection.RedisClusterNode)
*/
@Override
public void clusterReplicate(RedisClusterNode master, RedisClusterNode slave) {
public void clusterReplicate(RedisClusterNode master, RedisClusterNode replica) {
RedisClusterNode masterNode = topologyProvider.getTopology().lookup(master);
clusterCommandExecutor.executeCommandOnSingleNode(
(LettuceClusterCommandCallback<String>) client -> client.clusterReplicate(masterNode.getId()), slave);
(LettuceClusterCommandCallback<String>) client -> client.clusterReplicate(masterNode.getId()), replica);
}
/*