Speed up Sentinel related tests
* remove FIXME sleep codes for Sentinel related tests ** add functions for Sentinel tests (JedisSentinelTestUtil) *** waitForSentinelRecognizeRedisReplication *** waitForNewPromotedMaster *** waitForSentinelsRecognizeEachOthers **** TODO: there're no command for sentinel to list recognized sentinel **** sleep 5.5 sec (sentinel pings to master every 5 sec) * set HostAndPort class to public(no longer inner) class ** reason: We cannot know pool's current master if HostAndPort class is private inner class / HostAndPort classes are duplicated (main/test) ** make getter method and parameterized constructor *** set fields once, get anytime
This commit is contained in:
39
src/main/java/redis/clients/jedis/HostAndPort.java
Normal file
39
src/main/java/redis/clients/jedis/HostAndPort.java
Normal file
@@ -0,0 +1,39 @@
|
||||
package redis.clients.jedis;
|
||||
|
||||
public class HostAndPort {
|
||||
private String host;
|
||||
private int port;
|
||||
|
||||
public HostAndPort(String host, int port) {
|
||||
this.host = host;
|
||||
this.port = port;
|
||||
}
|
||||
|
||||
public String getHost() {
|
||||
return host;
|
||||
}
|
||||
|
||||
public int getPort() {
|
||||
return port;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (obj instanceof HostAndPort) {
|
||||
HostAndPort hp = (HostAndPort) obj;
|
||||
|
||||
// localhost and 127.0.0.1 is same
|
||||
return port == hp.port &&
|
||||
(host.equals(hp.host) ||
|
||||
(host.equals("localhost") && hp.host.equals("127.0.0.1")) ||
|
||||
(host.equals("127.0.0.1") && hp.host.equals("localhost")) );
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return host + ":" + port;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user