Commit Graph

422 Commits

Author SHA1 Message Date
Jungtaek Lim
61f8ff6918 Support zrevrangebylex command
* binary, string, pipeline (binary, string), sharded(binary, string), cluster (string)
2014-09-27 15:27:28 +09:00
Jungtaek Lim
f8c69b105a Remove unused & buggy method / class (related to ThreadLocal<Random>) 2014-09-19 07:51:53 +09:00
Jungtaek Lim
96c762b880 Optimize CRC16 calculation (with optimization of slot decision) 2014-09-18 09:33:10 +09:00
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
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
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
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
b219345761 pipelined transaction response fix 2014-08-31 16:06:33 +05:30
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
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
0a094ff0b4 Implements #701, add close() to JedisCluster 2014-08-28 23:49:52 +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
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
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
Nelson Rodrigues
dddc0d15f1 Add second jedis connection to waitForNewPromotedMaster call 2014-07-28 11:58:09 -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
Jungtaek Lim
0f472c97a2 fix build after CLUSTER NODES output has been changed
* https://github.com/antirez/redis/issues/1848
* we don't need to handle :0 by changes
2014-07-02 07:42:29 +09:00
Jungtaek Lim
fd23f8b8f7 Support CLUSTER SLOTS command
* CLUSTER SLOTS returns a Redis-formatted mapping from slot ranges to IP/Port pairs serving that slot range
* description link including output format
** e14829de30
* Unit test included
2014-07-02 06:46:58 +09:00
Jungtaek Lim
4c4446a71f Remove unused (by accident?) import 2014-06-24 09:23:19 +09:00
Jungtaek Lim
1d29b759fe Make it better to use URI from Jedis / JedisPool
* no need to provide password / DB index when user uses URI
* can provide timeout when user users URI
2014-06-15 21:50:38 +09:00
Mayank Dang
19fc1f87cf Merge remote-tracking branch 'upstream/master' 2014-05-30 16:16:23 +05:30
Jonathan Leibiusky
d02e56c4f8 Merge pull request #651 from xetorthio/protocol_bound_fix
Checks for buffer out of bounds before writing to the stream. Fixes #636
2014-05-29 11:43:16 -04:00
Mayank Dang
334d2ec19b Added test case for testing if PoolConfig applies to ClusterPools 2014-05-29 20:50:23 +05:30
Mayank Dang
0e25cf65fb Merging upstream 2014-05-29 20:44:40 +05:30
Jungtaek Lim
6f8d46ae4f Merge branch 'master' into implements-closeable-to-pooled-jedis-shardedjedis
Conflicts:
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/JedisSentinelPool.java
	src/main/java/redis/clients/jedis/ShardedJedis.java
	src/test/java/redis/clients/jedis/tests/JedisPoolTest.java
2014-05-26 11:18:45 +09:00
Marcos Nils
667eeaf815 Merge pull request #626 from HeartSaVioR/fix-pipeline-throws-npe-without-multi
Fix Pipeline throws NPE using exec without multi (fixes #623)
2014-05-25 22:52:41 +03:00
Marcos Nils
1782aaeeb1 Manual merge of #581 2014-05-25 16:30:41 -03:00
Marcos Nils
50052e90ad Manually merge #400 2014-05-25 15:32:12 -03:00
Marcos Nils
0d5062c347 Merge branch 'master' of github.com:xetorthio/jedis 2014-05-25 15:23:59 -03:00
Marcos Nils
3131279b5b Manually merge with #574 2014-05-25 15:22:20 -03:00
Marcos Nils
213d186c8d Merge pull request #576 from aniketschneider/pexpire-long-with-deprecation
Accept long parameter for pexpire
2014-05-25 21:12:33 +03:00
Marcos Nils
6106f5bbe6 Manually merge #578 to master 2014-05-25 15:01:24 -03:00
Jonathan Leibiusky
8f52dc743f Merge pull request #615 from xetorthio/hll-resurrect-afefb71e57b0258a52b465b2b4e57c132aef4db9
Support for HLL
2014-05-25 13:34:13 -04:00