rik/jlibredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now Sharded will handle connections instead of Info, so connection won't be shared between instances of ShardedJedis

Browse Source
This commit is contained in:
Jonathan Leibiusky
2010-11-22 12:49:18 -03:00
parent ad149e8252
commit a1815f3881
7 changed files with 58 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/redis/clients/jedis/BinaryShardedJedis.java
View File

@@ -31,8 +31,8 @@ public class BinaryShardedJedis extends Sharded<Jedis, JedisShardInfo>
}
public void disconnect() throws IOException {
for (JedisShardInfo jedis : getAllShards()) {
jedis.getResource().disconnect();
for (Jedis jedis : getAllShards()) {
jedis.disconnect();
}
}

6
src/main/java/redis/clients/jedis/ShardedJedis.java
View File

@@ -29,9 +29,9 @@ public class ShardedJedis extends BinaryShardedJedis implements JedisCommands {
}
public void disconnect() throws IOException {
for (JedisShardInfo jedis : getAllShards()) {
jedis.getResource().quit();
jedis.getResource().disconnect();
for (Jedis jedis : getAllShards()) {
jedis.quit();
jedis.disconnect();
}
}

11
src/main/java/redis/clients/jedis/ShardedJedisPool.java
View File

@@ -51,9 +51,9 @@ public class ShardedJedisPool extends Pool<ShardedJedis> {
boolean done = false;
while (!done) {
try {
for (JedisShardInfo shard : jedis.getAllShards()) {
if (!shard.getResource().isConnected()) {
shard.getResource().connect();
for (Jedis shard : jedis.getAllShards()) {
if (!shard.isConnected()) {
shard.connect();
}
}
done = true;
@@ -82,9 +82,8 @@ public class ShardedJedisPool extends Pool<ShardedJedis> {
public boolean validateObject(final Object obj) {
try {
ShardedJedis jedis = (ShardedJedis) obj;
for (JedisShardInfo shard : jedis.getAllShards()) {
if (!shard.getResource().isConnected()
|| !shard.getResource().ping().equals("PONG")) {
for (Jedis shard : jedis.getAllShards()) {
if (!shard.isConnected() || !shard.ping().equals("PONG")) {
return false;
}
}