diff --git a/README.md b/README.md index ac3c67d..0a05970 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Jedis is a blazingly small and sane [Redis](http://github.com/antirez/redis "Red Jedis was conceived to be EASY to use. -Jedis is fully compatible with redis 2.8.5. +Jedis is fully compatible with redis 2.6.14. ## Community diff --git a/src/test/java/redis/clients/jedis/tests/ConnectionTest.java b/src/test/java/redis/clients/jedis/tests/ConnectionTest.java index 5790562..9cbaa12 100644 --- a/src/test/java/redis/clients/jedis/tests/ConnectionTest.java +++ b/src/test/java/redis/clients/jedis/tests/ConnectionTest.java @@ -1,21 +1,11 @@ package redis.clients.jedis.tests; -import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; - import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import redis.clients.jedis.Connection; -import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisPool; -import redis.clients.jedis.SortingParams; import redis.clients.jedis.exceptions.JedisConnectionException; public class ConnectionTest extends Assert { @@ -51,51 +41,4 @@ public class ConnectionTest extends Assert { client.setTimeoutInfinite(); } - @Test - public void lala() throws InterruptedException { - final JedisPool jedisPool = new JedisPool("localhost"); - ExecutorService executor = Executors.newFixedThreadPool(10); - final AtomicBoolean ended = new AtomicBoolean(false); - - for (int n = 0; n < 10; n++) { - executor.execute(new Runnable() { - @Override - public void run() { - while (!ended.get()) { - Jedis jedis = jedisPool.getResource(); - SortingParams sortingParameters = new SortingParams(); - String sortBy = "1:2:*->status";// assume key is 1:2: - String filterSetName = "1:2:jobIds"; - sortingParameters.get("a", "b", "c");// assume that - // col1, - // col2, col3 are - // defined - sortingParameters.by(sortBy); - List filteredAndsortedList = null; - try { - filteredAndsortedList = jedis.sort(filterSetName, - sortingParameters); - System.out.println("Sorted List size " - + filteredAndsortedList.size()); - for (String str : filteredAndsortedList) { - // System.out.println(str); - } - } catch (Exception e) { - System.out.println("-----Exception thrown-----"); - System.out.println(e); - System.out.println(" returned value is " - + filteredAndsortedList); - e.printStackTrace(); - } finally { - jedisPool.returnResource(jedis); - } - } - } - }); - } - Thread.sleep(10000); - ended.set(true); - executor.shutdown(); - executor.awaitTermination(10, TimeUnit.SECONDS); - } } \ No newline at end of file diff --git a/src/test/java/redis/clients/jedis/tests/JedisTest.java b/src/test/java/redis/clients/jedis/tests/JedisTest.java index 8e4e524..b123b05 100644 --- a/src/test/java/redis/clients/jedis/tests/JedisTest.java +++ b/src/test/java/redis/clients/jedis/tests/JedisTest.java @@ -4,16 +4,13 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.util.HashMap; -import java.util.List; import java.util.Map; import org.junit.Test; import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisPool; import redis.clients.jedis.JedisShardInfo; import redis.clients.jedis.Protocol; -import redis.clients.jedis.SortingParams; import redis.clients.jedis.exceptions.JedisConnectionException; import redis.clients.jedis.exceptions.JedisDataException; import redis.clients.jedis.tests.commands.JedisCommandTestBase;