rik/jlibredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
860 Commits 2 Branches 0 Tags
4224eabd39dcf19206b26e3c4e87918d609a8ee0
Commit Graph

860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jungtaek Lim
4224eabd39 Merge branch 'support-sorted-set-with-lex' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-support-sorted-set-with-lex 2014-09-11 11:08:45 +09:00
Jungtaek Lim
bb9bc1cbe1 Merge branch 'pool-closeable-support' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-pool-closeable-support 2014-09-11 11:00:39 +09:00
Jungtaek Lim
a4f975db81 Merge branch 'master' of https://github.com/nrodrigues/jedis into nrodrigues-master 2014-09-11 10:52:29 +09:00
Jungtaek Lim
a3eeea7521 Merge branch 'renew-slots-info-when-moved-has-occurred' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-renew-slots-info-when-moved-has-occurred 2014-09-11 10:09:16 +09:00
Jungtaek Lim
3d7b412a57 Merge branch 'support-sorted-set-with-lex' of github.com:HeartSaVioR/jedis into support-sorted-set-with-lex 2014-09-10 21:44:07 +09:00
Jungtaek Lim
8a5eb60512 Merge branch 'master' into support-sorted-set-with-lex 
Conflicts:
	src/main/java/redis/clients/jedis/BinaryShardedJedis.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/Protocol.java
	src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java
 2014-09-10 21:43:32 +09:00
Jungtaek Lim
f931a4fc81 Replace Closer class to use its close() method 2014-09-10 21:15:02 +09:00
Ethan Urie
36810dfcba Closes #656. Added 2 more asserts to ensure the count decrements correctly. 2014-09-03 14:15:48 -04:00
Ethan Urie
a201e29d88 Closes #656. Add a getNumActive() method to JedisPool to provide access to the current state of the internal pool. 2014-09-02 14:54:36 -04:00
Jungtaek Lim
ebaba79119 Merge branch 'markus-s24-double-weights' 2014-08-30 21:03:39 +09:00
Jungtaek Lim
582d00b5ca Merge branch 'double-weights' of https://github.com/markus-s24/jedis into markus-s24-double-weights 2014-08-30 21:03:37 +09:00
Jungtaek Lim
d3d5d476e3 Merge branch 'markust push origin master-s24-master' 2014-08-29 14:20:08 +09:00
Jungtaek Lim
f6aced860a Merge branch 'master' of https://github.com/markus-s24/jedis into markus-s24-master 2014-08-29 14:19:41 +09:00
Jungtaek Lim
db6d8c0daf Merge branch 'HeartSaVioR-present-close-to-jedis-cluster' 2014-08-29 11:30:12 +09:00
Jungtaek Lim
babedd5be0 Merge branch 'present-close-to-jedis-cluster' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-present-close-to-jedis-cluster 2014-08-29 11:30:04 +09:00
Marcos Nils
3a3b73fca8 Merge pull request #718 from HeartSaVioR/pubsub-numsub-output-changed 
Follow up changes on "pubsub numsub" output (Fixes #714)
 2014-08-28 20:46:06 -03:00
Jungtaek Lim
0a094ff0b4 Implements #701, add close() to JedisCluster 2014-08-28 23:49:52 +09:00
Jungtaek Lim
431ae79ff1 Follow up changes on "pubsub numsub" output 
* String, String to String, Long
* We're avoiding to break backward compatibility
** convert Long to String so that return type is same to old type
 2014-08-28 18:14:49 +09:00
Jungtaek Lim
419f0c7d17 Merge branch '50onRed-fix-hgetall' 2014-08-28 09:38:09 +09:00
Markus Heiden
2eda9cd8fb Removed deprecated int based weights 2014-08-27 21:41:22 +02:00
Markus Heiden
ad5412d8cf Restored old method for int weights for backwards compatibility 2014-08-27 21:12:28 +02:00
Ivan Dyedov
9f4faf53ff fix binary version of hgetAll(), fixes #711 2014-08-26 11:50:56 -04:00
Markus Heiden
ae73a99a17 Adopted test to use decimal weight values 2014-08-23 19:39:19 +02:00
Markus Heiden
52ac566dd3 Changed weights from ints to doubles 2014-08-23 18:14:50 +02:00
Jungtaek Lim
c42965dcd5 Merge branch 'pipeline-and-transaction-can-handle-responses-on-their-own-status' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-pipeline-and-transaction-can-handle-responses-on-their-own-status 2014-08-13 07:18:48 +09:00
Jungtaek Lim
68a56938c1 Merge branch 'pipeline_getrange_fix' of https://github.com/UglyTroLL/jedis into UglyTroLL-pipeline_getrange_fix 2014-08-12 10:16:31 +09:00
Jungtaek Lim
e6d08f46fb Merge branch 'remove-pexpire-int' of https://github.com/aniketschneider/jedis into aniketschneider-remove-pexpire-int 
Conflicts:
	src/main/java/redis/clients/jedis/Client.java
 2014-08-12 10:12:44 +09:00
Jungtaek Lim
5bf4a697fb Merge branch 'unsigned_long_cursor_remove_deprecated' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-unsigned_long_cursor_remove_deprecated 
Conflicts:
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/JedisCluster.java
	src/main/java/redis/clients/jedis/ScanResult.java
	src/main/java/redis/clients/jedis/ShardedJedis.java
 2014-08-12 10:07:26 +09:00
Jungtaek Lim
26d1f4ad90 Merge branch 'support-cluster-slots' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-support-cluster-slots 2014-08-12 09:48:53 +09:00
Jungtaek Lim
1e94acd7da Merge branch 'fix/complete-interface' of https://github.com/lstrojny/jedis into lstrojny-fix/complete-interface 2014-08-12 09:40:45 +09:00
Jungtaek Lim
514144d472 Fix indentation (code formatting...) 2014-08-08 10:56:39 +09:00
Jungtaek Lim
1877185153 Merge branch 'master' into pipeline-and-transaction-can-handle-responses-on-their-own-status 
* it's broken with later features, resetState()
* fixed resetState() to make it work with this PR

Conflicts:
	src/main/java/redis/clients/jedis/BinaryJedis.java
	src/main/java/redis/clients/jedis/Connection.java
	src/main/java/redis/clients/jedis/Pipeline.java
	src/main/java/redis/clients/jedis/Transaction.java
	src/main/java/redis/clients/jedis/TransactionBlock.java
 2014-08-08 10:46:43 +09:00
Jonathan Leibiusky
2d93fa0e2b version bump 2014-08-04 11:20:52 -04:00
Jungtaek Lim
03c0af2581 Merge pull request #685 from HeartSaVioR/master 
Fixed critical JedisCluster bug : hlen calls hdel
 2014-08-04 09:40:20 +09:00
Jungtaek Lim
d7cd3a0af6 Fixed critical JedisCluster bug : hlen calls hdel 2014-08-04 09:28:17 +09:00
Nelson Rodrigues
056e6e9db2 Do master failover detection in JedisSentielPool.getResource 2014-08-02 14:36:09 -07:00
Nelson Rodrigues
dddc0d15f1 Add second jedis connection to waitForNewPromotedMaster call 2014-07-28 11:58:09 -07:00
Nelson Rodrigues
c81bdc0849 Properly close jedis connection in case of exceptions 2014-07-28 11:45:34 -07:00
Nelson Rodrigues
d52cc06b72 Let the user choose whether to testOnBorrow or testOnReturn 
Force testOnBorrow if neither is specified.
 2014-07-28 11:44:23 -07:00
Nelson Rodrigues
fceb719848 Proper master failover detection depends on testOnBorrow 2014-07-28 11:35:39 -07:00
Nelson Rodrigues
c02c663776 Add check that JedisSentinelPool accepts closing connections before and after failover 2014-07-28 11:34:00 -07:00
Nelson Rodrigues
9013078d40 Fix race condition in JedisSentinelPoolTest 
The test was issuing the failover command and only afterwards
connecting to the pub-sub channel to receive failover notifications.
If the failover occurred fast enought the pub-sub listener would never
get the notification.

Run the failover command on a separate Jedis connection after we're
absolutely sure that we're subscribed to the pub-sub channel.
 2014-07-28 10:56:21 -07:00
Nelson Rodrigues
9e128b4520 Add an extra sentinel server to tests 
Adds an extra sentinel server monitoring the mymaster failover cluster,
makes the tests more interesting.
 2014-07-28 10:55:09 -07:00
Nelson Rodrigues
75d2ba751b Race condition when switching masters in JedisSentinelPool 
Instead of recreating GenericObjectPool, we change the
underlying factory destination host. When returning
objects to the pool we make sure they are pointing at
the correct master.
 2014-07-25 18:55:19 -07:00
Jungtaek Lim
4f693872b9 Merge pull request #677 from macgngsta/master 
Fixed Gradle build file
 2014-07-18 12:53:01 +09:00
Greg Tam
c2624c6c93 fixed the name of archiveBaseName to archivesBaseName 2014-07-17 15:11:02 -06:00
Jungtaek Lim
e67a80f694 Merge pull request #675 from evenX86/patch-1 
fix comment which describe LPOP from rpop method
 2014-07-17 19:10:13 +09:00
xuyifei
088d86a60f Update Jedis.java 
edit the rpop note (just makei it Specific
 2014-07-17 16:40:22 +08:00
Jungtaek Lim
15ab934945 Re-format source to respect Jedis convention 2014-07-02 23:52:42 +09:00
Jungtaek Lim
4b72a4d254 Replace synchronized keyword lock to ReaderWriterLock 2014-07-02 23:46:15 +09:00