Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/main/java/redis/clients/jedis/BinaryShardedJedis.java
Original file line number Diff line number Diff line change
Expand Up @@ -875,12 +875,6 @@ public Long linsert(final byte[] key, final ListPosition where, final byte[] piv
return j.linsert(key, where, pivot, value);
}

public ShardedJedisPipeline pipelined() {
ShardedJedisPipeline pipeline = new ShardedJedisPipeline();
pipeline.setShardedJedis(this);
return pipeline;
}

public Long objectRefcount(final byte[] key) {
Jedis j = getShard(key);
return j.objectRefcount(key);
Expand Down
77 changes: 0 additions & 77 deletions src/main/java/redis/clients/jedis/ShardedJedisPipeline.java

This file was deleted.

154 changes: 0 additions & 154 deletions src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java

This file was deleted.

34 changes: 0 additions & 34 deletions src/test/java/redis/clients/jedis/tests/ShardedJedisPoolTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisShardInfo;
import redis.clients.jedis.ShardedJedis;
import redis.clients.jedis.ShardedJedisPipeline;
import redis.clients.jedis.ShardedJedisPool;
import redis.clients.jedis.exceptions.JedisExhaustedPoolException;

Expand Down Expand Up @@ -202,39 +201,6 @@ public void startWithUrl() throws URISyntaxException {
assertEquals("bar", jedis.get("foo"));
}

@Test
public void returnResourceShouldResetState() throws URISyntaxException {
GenericObjectPoolConfig<ShardedJedis> config = new GenericObjectPoolConfig<ShardedJedis>();
config.setMaxTotal(1);
config.setBlockWhenExhausted(false);

List<JedisShardInfo> shards = new ArrayList<JedisShardInfo>();
shards.add(new JedisShardInfo(new URI("redis://:foobared@localhost:6380")));
shards.add(new JedisShardInfo(new URI("redis://:foobared@localhost:6379")));

ShardedJedisPool pool = new ShardedJedisPool(config, shards);

ShardedJedis jedis = pool.getResource();
jedis.set("pipelined", String.valueOf(0));
jedis.set("pipelined2", String.valueOf(0));

ShardedJedisPipeline pipeline = jedis.pipelined();

pipeline.incr("pipelined");
pipeline.incr("pipelined2");

jedis.resetState();

pipeline = jedis.pipelined();
pipeline.incr("pipelined");
pipeline.incr("pipelined2");
List<Object> results = pipeline.syncAndReturnAll();

assertEquals(2, results.size());
jedis.close();
pool.destroy();
}

@Test
public void checkResourceIsCloseable() throws URISyntaxException {
GenericObjectPoolConfig<ShardedJedis> config = new GenericObjectPoolConfig<ShardedJedis>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
* This test is only executed when the server/cluster is Redis 6. or more.
*/
public class ShardedJedisPoolWithCompleteCredentialsTest {
private static HostAndPort hnp = HostAndPortUtil.getRedisServers().get(0);
private static HostAndPort redis1 = HostAndPortUtil.getRedisServers().get(0);
private static HostAndPort redis2 = HostAndPortUtil.getRedisServers().get(1);

Expand Down Expand Up @@ -245,39 +244,6 @@ public void connectWithURICredentials() throws URISyntaxException {
j2.aclDelUser("alice");
}

@Test
public void returnResourceShouldResetState() throws URISyntaxException {
GenericObjectPoolConfig<ShardedJedis> config = new GenericObjectPoolConfig<>();
config.setMaxTotal(1);
config.setBlockWhenExhausted(false);

List<JedisShardInfo> shards = new ArrayList<JedisShardInfo>();
shards.add(new JedisShardInfo(new URI("redis://default:foobared@localhost:6380")));
shards.add(new JedisShardInfo(new URI("redis://default:foobared@localhost:6379")));

ShardedJedisPool pool = new ShardedJedisPool(config, shards);

ShardedJedis jedis = pool.getResource();
jedis.set("pipelined", String.valueOf(0));
jedis.set("pipelined2", String.valueOf(0));

ShardedJedisPipeline pipeline = jedis.pipelined();

pipeline.incr("pipelined");
pipeline.incr("pipelined2");

jedis.resetState();

pipeline = jedis.pipelined();
pipeline.incr("pipelined");
pipeline.incr("pipelined2");
List<Object> results = pipeline.syncAndReturnAll();

assertEquals(2, results.size());
jedis.close();
pool.destroy();
}

@Test
public void checkResourceIsCloseable() throws URISyntaxException {
GenericObjectPoolConfig<ShardedJedis> config = new GenericObjectPoolConfig<>();
Expand Down