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

887 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcos Nils
ce2ab6a937 Fixes #732. Tests are much more reliable now and we removed unnecessary redis cluster integration tests which randomly failed due to the nature of redis cluster 2014-09-14 20:37:48 -03:00
Marcos Nils
687716902d Add support for cluster reset command. Some tests were refactored per the inclusion of the new command 2014-09-14 15:43:18 -03:00
Marcos Nils
56d1798943 Merge pull request #735 from HeartSaVioR/use-threadlocal-random-instead-of-creating-random-each-time 
Use ThreadLocal<Random> instead of creating Random each time
 2014-09-13 13:57:56 -03:00
Jungtaek Lim
e4441ec5b3 use ThreadLocal<Random> instead of creating Random each time 
* We can't use ThreadLocalRandom because we need to support JDK6
 2014-09-13 10:54:48 +09:00
Marcos Nils
2f18da67f1 Merge pull request #733 from HeartSaVioR/crc16-lookup-table 
Use lookup table when calculating CRC16 XMODEM
 2014-09-12 10:51:39 -03:00
Jungtaek Lim
10307ecd2e Hide lookup table to prevent broken 2014-09-12 18:00:35 +09:00
Jungtaek Lim
ad10f91b60 Use lookup table when calculating CRC16 XMODEM 
* I borrowed it from b921931480
 2014-09-12 17:50:43 +09:00
Mayank Dang
37a3c7b835 Merging with upstream, necessary changes, shifting poolConfig as private instance variable from JedisClusterConnectionHandler to JedisClusterInfoCache due to design change in previous commits. 2014-09-11 16:16:08 +05:30
Jungtaek Lim
fc594db9a3 Merge branch 'sentinel_config_err_handling' of https://github.com/wizwjw/jedis into wizwjw-sentinel_config_err_handling 
Conflicts:
	src/main/java/redis/clients/jedis/JedisSentinelPool.java
	src/test/java/redis/clients/jedis/tests/JedisSentinelPoolTest.java
 2014-09-11 13:10:01 +09:00
Jungtaek Lim
53c9344898 Merge pull request #722 from vermahim/master 
pipelined transaction response fix
 2014-09-11 11:37:35 +09:00
Jungtaek Lim
8492757f7a Merge branch 'feature_blocklist_parameter' of https://github.com/catinred2/jedis into catinred2-feature_blocklist_parameter 
Conflicts:
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/JedisCluster.java
 2014-09-11 11:31:29 +09:00
Jungtaek Lim
992ae7aadd Merge branch 'make-it-better-to-use-URI' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-make-it-better-to-use-URI 2014-09-11 11:21:17 +09:00
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
Jungtaek Lim
bfcecd73cb JedisURIHelper.getDBIndex() now returns 0 when db index is not provided 2014-09-10 20:46:57 +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
Himanshu Verma
9b824c3aad pipelined transaction response fix : indentation fix 2014-09-01 11:12:26 +05:30
Himanshu Verma
b219345761 pipelined transaction response fix 2014-08-31 16:06:33 +05:30
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
Ming
a30598b7cb add blpop/brpop with timeout parameter interface to JedisCommands 2014-08-14 10:37:28 +08:00
Ming
c62672e3a0 add timeout parameter to blpop/brpop 2014-08-13 14:44:17 +08: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