Commit Graph

14 Commits

Author SHA1 Message Date
Jonathan Leibiusky
b7d551149a It is better to point everything to localhost and we just make sure
there is not redis running on port 1234 when renning the tests.
2014-02-17 18:01:19 -05:00
Jonathan Leibiusky
18652b906b Merge branch 'speed-up-unit-test' of github.com:HeartSaVioR/jedis into upgrade_libs
Conflicts:
	src/test/java/redis/clients/jedis/tests/JedisPoolTest.java
	src/test/java/redis/clients/jedis/tests/JedisSentinelPoolTest.java
	src/test/java/redis/clients/jedis/tests/JedisSentinelTest.java
	src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java
	src/test/java/redis/clients/jedis/tests/ShardedJedisPoolTest.java
	src/test/java/redis/clients/jedis/tests/benchmark/PoolBenchmark.java
	src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java
2013-11-29 12:12:30 -05:00
Jonathan Leibiusky
bbb867781d upgrade to commons-pool 2 2013-11-28 08:13:57 -05:00
Jungtaek Lim
7e1a1a70b2 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
2013-10-07 11:03:32 +09:00
Jonathan Leibiusky
8f9763a7e9 add url support 2012-08-01 16:49:44 -03:00
KARASZI István
04f603820f fixed some FindBugs errors 2011-09-26 17:45:49 +02:00
Jonathan Leibiusky
6e0be01f6f code cleanup 2011-05-15 21:56:46 -03:00
Dario Guzik
37587df2b6 MasterSlave consistency and old mode compatibility with shard names 2011-05-15 18:22:34 -03:00
Jonathan Leibiusky
2a4a43f4cd add JedisDataException and JedisConnectionException 2011-01-30 17:46:17 -03:00
Jonathan Leibiusky
6f92f5fc9c pool doesn't throw Exception anymore but JedisException 2010-12-10 17:36:44 -03:00
Jonathan Leibiusky
a1815f3881 Now Sharded will handle connections instead of Info, so connection won't be shared between instances of ShardedJedis 2010-11-22 12:49:18 -03:00
Jonathan Leibiusky
71eb4c5b4a replace custom pool implementation with apache's 2010-11-21 18:16:31 -03:00
Jonathan Leibiusky
b013a74c44 Merge branch 'binaryAPI' of git://github.com/yaourt/jedis
Conflicts:
	src/main/java/redis/clients/jedis/Connection.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/ShardedJedis.java
2010-11-15 23:55:57 -03:00
Jonathan Leibiusky
f62548931c Add a pool for sharded jedis 2010-11-10 13:41:41 -03:00