Commit Graph

75 Commits

Author SHA1 Message Date
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
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
Jungtaek Lim
7255a8cae1 fix "cluster nodes" parse error when slot is in transition
* extract cluster nodes info. parser from JedisClusterConnectionHandler
* unit test for migrating slot included
2014-05-21 08:08:12 +09:00
Marcos Nils
4b07966e74 Checks for buffer out of bounds before writing to the stream. Fixes #636 2014-05-20 11:42:16 -03:00
Jonathan Leibiusky
62b98a3e63 Add tests to check returning null to pool 2014-03-12 10:31:22 -04:00
Henning Schmiedehausen
46eef9530b add a number of null check to return methods.
This allows calling these methods on error cleanup paths without having
to surround them with if checks all the time.
2014-02-27 10:58:46 -08:00
Marcos Nils
756113821f Make JedisClusterCRC16 multi-thread 2014-02-20 14:58:04 -03:00
Marcos Nils
ba9989e64c Add support for redis cluster hashtags 2014-02-12 00:39:12 -03:00
Jonathan Leibiusky
105ca9f5bb Reformat all files in the project according to java conventions. 2014-01-31 11:24:06 -05:00
Jonathan Leibiusky
3e99749b2e Merge branch 'missedbuffer' of github.com:ibuildthecloud/jedis into ibuildthecloud-missedbuffer 2014-01-28 16:53:53 -05:00
Marcos Nils
4ab8ea2ef7 Move Jedis CRC16 util as it's being used in the project.
Changed Makefile to cleanup redis cluster node configuration before running tests
Add cleanup to ClusterCommandTest.
2014-01-14 15:57:53 -03:00
Jonathan Leibiusky
bbb867781d upgrade to commons-pool 2 2013-11-28 08:13:57 -05: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
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
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
mindwind
8b3ea5f2de new - dump and restore command 2013-06-29 14:17:44 +08:00
Darren Shepherd
5e2cdb9c08 When writing a negative sign the write(char) method goes directly to the output stream and by-passes the internal RedisOutputStream buffer causing random corruption of the output. Casting the char to a byte ensures write(byte) is called which will properly buffer the output. 2013-03-29 22:28:01 -07:00
Jonathan Leibiusky
b9442ea540 Merge pull request #330 from zhupan/master
Sharded Performance improvement
2012-08-13 07:25:28 -07:00
panos
63b40b71f7 Sharded Performance improvement
'SortedMap.isEmpty()' performance is much higher than
'SortedMap.size()==0'
2012-08-13 10:35:51 +08:00
Jonathan Leibiusky
8f9763a7e9 add url support 2012-08-01 16:49:44 -03:00
Jonathan Leibiusky
05503212aa Merge branch 'variadic' of git://github.com/ivowiblo/jedis into variadic
Conflicts:
	src/main/java/redis/clients/jedis/BinaryClient.java
	src/main/java/redis/clients/jedis/BinaryJedis.java
	src/main/java/redis/clients/jedis/BinaryShardedJedis.java
	src/main/java/redis/clients/jedis/Client.java
	src/main/java/redis/clients/jedis/Commands.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/ShardedJedis.java
2012-04-23 21:00:29 -03:00
Jonathan Leibiusky
3da2f2dd57 Merge branch 'slowlog' of git://github.com/ivowiblo/jedis into slowlog
Conflicts:
	src/main/java/redis/clients/jedis/BinaryClient.java
	src/main/java/redis/clients/jedis/BinaryJedis.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/Protocol.java
2012-04-23 20:35:55 -03:00
ivowiblo
c765bc3910 Style refactor 2012-04-19 03:04:06 -04:00
ivowiblo
d5c2b9965c Slowlog commands. The unit test is failing. 2012-04-19 02:53:26 -04:00
ivowiblo
8aca0b77f9 Variadic commands 2012-04-18 15:22:43 -04:00
Ivo Ramirez
53f829fb10 JedisPool accepts BinaryJedis as a resource for return. Issue #171
Conflicts:

	src/main/java/redis/clients/util/Pool.java
2012-04-17 16:56:26 -04:00
Eric Hauser
fe87266a53 Merge pull request #163 from grdmitro/jedis
---

Throwing Jedis connection exception on IO error rather than JedisException
2011-09-12 23:07:45 -04:00
Kevin Sawicki
3abaf71e0a Mark inner classes static that don't reference parent class. 2011-06-29 09:34:57 -07:00
Dmytro
6e4e1c39f4 Throwing Jedis connection exception on IO error rather than JedisException 2011-06-15 09:46:48 +01:00
Dario Guzik
202d68a21c optimize 2011-05-15 18:34:15 -03:00
Dario Guzik
37587df2b6 MasterSlave consistency and old mode compatibility with shard names 2011-05-15 18:22:34 -03:00
Jonathan Leibiusky
66b0a5784d fix md5 hashing as MessageDigest is not threadsafe, now using ThreadLocal 2011-05-11 19:45:07 -03:00
Jonathan Leibiusky
0d6d37b95f throw JedisDataException when sending NULL values to redis as it is not a valid value in the protocol 2011-05-11 19:22:31 -03:00
Jonathan Leibiusky
90e68fa482 Merge branch 'ordered_shards_iteration' of https://github.com/grdmitro/jedis into grdmitro-ordered_shards_iteration 2011-04-06 01:57:14 -03:00
Dmytro
f16d91550d made shard iterable in the same order as in config during creation 2011-04-05 15:41:28 +01:00
Jonathan Leibiusky
74ca0e1d71 Merge branch 'MasterSlaveConsistency' of https://github.com/TioBorracho/jedis into TioBorracho-MasterSlaveConsistency 2011-03-25 10:56:57 -03:00
Dmytro
cb0d76051d made getShardInfo(byte[]) public 2011-03-21 15:03:34 +00:00
Dmytro
dc89193635 Revert "made getShardInfo(byte[]) public"
This reverts commit 0801b01ccb.
2011-03-21 14:58:29 +00:00
Dmytro
0801b01ccb made getShardInfo(byte[]) public 2011-03-21 14:32:50 +00:00
Dario Guzik
3d1603b59b Generate shard nodes by shard position. Shards are now host/port independent 2011-03-02 17:53:27 -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
ad26ea23ad fix consistent hashing, both MD5 and Murmur, 2010-12-02 01:46:31 -03:00
Jonathan Leibiusky
81ec9f8af3 add checks when server closes idle connections 2010-11-30 12:27:22 -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
ad149e8252 Remove @override to make it java 1.5 compliant 2010-11-22 10:21:56 -03:00
Jonathan Leibiusky
098de44a07 add support for java 1.5 2010-11-21 19:53:43 -03:00
Jonathan Leibiusky
71eb4c5b4a replace custom pool implementation with apache's 2010-11-21 18:16:31 -03:00
Jonathan Leibiusky
e7582644b1 Merge branch 'ApacheCommonsPool' of git://github.com/yaourt/jedis 2010-11-21 17:31:15 -03:00