rik/jlibredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
564 Commits 2 Branches 0 Tags
18652b906b27b4a795fc0af562831df912adbc0e
Commit Graph

564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Hisham Mardam-Bey
597366343d Fixed up eval(sha) tests to better check that the lua script ran properly. 2013-10-05 18:13:30 -04:00
Hisham Mardam-Bey
2ee7430518 Fixed issue #456 (evalsha loses args). 2013-10-05 17:33:25 -04:00
Eoin Coffey
796f80d9c0 Allow JedisPool to set a custom client name 2013-10-05 16:44:52 -04:00
Hisham Mardam-Bey
bc4d0ed0b6 Added test from pull request #429. 2013-10-05 16:43:00 -04:00
Jungtaek Lim
35a2dfd4c0 JedisSentinelPool now takes care of multi failover 
* Now Pool.initPool() call closeInternalPool(), instead of destroy()
** calling destroy() in Pool.initPool() may have side effect, and JedisSentinelPool did
* modify unit test to test failover twice (needs +1 slave)
** modify configurations for additional slave
 2013-09-26 10:48:17 +09:00
Jonathan Leibiusky
08e9b0c7e7 [maven-release-plugin] prepare for next development iteration 2013-09-15 15:47:05 -03:00
Jonathan Leibiusky
0defe548c9 [maven-release-plugin] prepare release jedis-2.2.1 2013-09-15 15:46:58 -03:00
Jonathan Leibiusky
1aee3b396d ooppsss... forgot password for sentinel 2013-09-15 15:41:44 -03:00
Jonathan Leibiusky
6c8d23fadf rollback sentinel1 configuration, since I broke a test 2013-09-15 15:37:01 -03:00
Jonathan Leibiusky
ad58f816b6 make sure that JedisSentinelPool use timeout, password and db 2013-09-15 15:33:22 -03:00
Jonathan Leibiusky
4d9090827f don't push binaries to github 2013-09-15 15:32:31 -03:00
Hisham Mardam-Bey
ebf1380eea Fixed bug where timeout, password, and database were not set in the 
JedisSentinelPool overloaded contructor and hence not passed to JedisFactory.
 2013-09-12 21:52:29 -04:00
Jonathan Leibiusky
d7d9f06bd1 [maven-release-plugin] prepare for next development iteration 2013-09-06 16:09:18 -03:00
Jonathan Leibiusky
2f26176e35 [maven-release-plugin] prepare release jedis-2.2.0 2013-09-06 16:09:11 -03:00
Jonathan Leibiusky
54d6c50e91 move back to snaptshot 2013-09-06 15:53:54 -03:00
Jonathan Leibiusky
dd3e5493a5 add target to release jedis in maven central 2013-09-06 15:52:59 -03:00
Jonathan Leibiusky
690ad3c898 trying to release jedis in maven central 2013-09-06 15:49:51 -03:00
Jonathan Leibiusky
e93506591f add maven central pom stuff 2013-09-06 15:10:11 -03:00
Jonathan Leibiusky
2ed1f073ff it might happen that it is alredy saving, so make sure that test won't fail because of this 2013-09-03 14:05:50 -03:00
Jonathan Leibiusky
ad001d1a72 change version to 2.2 2013-09-03 14:00:32 -03:00
Jonathan Leibiusky
e0fa095db9 update dependencies version 
version bump
 2013-09-03 11:59:08 -03:00
Jonathan Leibiusky
fddd41d796 change makefile to accept "start" and "stop" to be able to start the testing environment and stopping it for manual testing purposes. 
raising down-after-milliseconds of sentinel 1 to avoid taking the master down and up all the time.
change sleep to 10 seconds after doing a "salveof" to avoid false negatives.
 2013-09-02 18:13:14 -03:00
Hisham Mardam-Bey
39d81d8f1f Added a JUnit test for JedisSentinelPool. 
This test will set up and get a master from a Redis master slave pair being
watched by 2 Sentinels. It pings the master, segfaults it, asks the pool for
another connection and makes sure it can ping it.

This commit also restores the pom.xml file's scm information back to
xetorthio and adds the default Sentinel port to the Procotol.
 2013-08-28 23:10:50 -04:00
Hisham Mardam-Bey
e17679f568 [maven-release-plugin] prepare for next development iteration 2013-08-24 17:33:22 -04:00
Hisham Mardam-Bey
e47e8a414e [maven-release-plugin] prepare release jedis-2.2.1 2013-08-24 17:33:18 -04:00
Hisham Mardam-Bey
52286d6942 Refactored the inline thread that monitors the master and turned it into its 
own class. The pool shuts down the monitors as well now.
 2013-08-24 17:14:03 -04:00
Hisham Mardam-Bey
c2a48afafd Initial JedisSentinelPool based on code from hamsterready/jedis-sentinel-pool. 
Given a master name and a set of sentinels this pool will subscribe to the
Sentinel notifications about master changes (+switch-master) and
re-establishes the pool to the new master when one is announced.
 2013-08-23 23:06:13 -04:00
Hisham Mardam-Bey
404c5632c7 [maven-release-plugin] prepare for next development iteration 2013-08-21 23:38:24 -04:00
Hisham Mardam-Bey
1f6db132b1 [maven-release-plugin] prepare release jedis-2.2.0 2013-08-21 23:38:20 -04:00
Hisham Mardam-Bey
928339bd28 Updated release information. 2013-08-21 23:16:09 -04:00
Hisham Mardam-Bey
50516d3b70 Clean up README a bit, we're past Redis 2.0.0 2013-08-21 23:12:36 -04:00
Hisham Mardam-Bey
d377bcf6d3 Fail if the Sentinel does not return the slave. 2013-08-21 23:04:07 -04:00
Hisham Mardam-Bey
33e64bdb6e Changed redis.clients.jedis.tests.commands.AllKindOfValuesCommandsTest#ttl so that it passes assertion. Once this issue is resolved in Redis the test can be fixed. 2013-08-21 23:03:53 -04:00
Hisham Mardam-Bey
9b78d19dcf Merge branch 'fix-issue-438' of https://github.com/vrischmann/jedis 2013-08-21 21:01:03 -04:00
Hisham Mardam-Bey
1f3b5f1977 Merge branch 'master' of https://github.com/anthonyu/jedis 2013-08-21 20:57:08 -04:00
Hisham Mardam-Bey
a71c3dff17 Merge remote-tracking branch 'amimimor/master' 2013-08-21 20:32:27 -04:00
Hisham Mardam-Bey
ed80e7ce70 Allow the Pool to be constructed without having an internal pool created. 
This is useful when extending the Pool without being able to create one at
construction time.
 2013-08-21 00:06:30 -04:00
anthonyu
2475f24f7e Fix formatting. 2013-08-20 20:43:50 -07:00
Hisham Mardam-Bey
625e2235fd Merge remote-tracking branch 'mindwind/master' 
Conflicts:
	src/main/java/redis/clients/jedis/BinaryClient.java
 2013-08-20 23:36:42 -04:00
anthonyu
bc86b1210b Pipeline eval and evalsha. 2013-08-20 19:43:32 -07:00
Vincent Rischmann
6dbad88250 Fix issue #438 2013-08-06 00:36:48 +02:00
mindwind
155aff09e0 fix - recover zadd with one score memeber 2013-07-15 15:57:03 +08:00
mindwind
a1471e66e9 del 2013-07-15 15:56:34 +08:00
mindwind
5f11954d31 fix - pipeline zadd method signature 
from: zadd(String key, double score, String member)
to: zadd(String key, Map<Double, String> scoreMembers)
 2013-07-09 16:42:01 +08:00
mindwind
fffd119c63 fix - pipeline sort 2013-07-08 16:26:13 +08:00
mindwind
d57bfb94a9 fix - CLIENT command 2013-07-05 09:13:09 +08:00
mindwind
96c789aaab new - zcount with string min and max 2013-07-03 16:20:31 +08:00