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

392 Commits

Author SHA1 Message Date
Jungtaek Lim
a4f975db81 Merge branch 'master' of https://github.com/nrodrigues/jedis into nrodrigues-master 2014-09-11 10:52:29 +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
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
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
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
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
Alok Singh
cd722e5a82 Add support for pfcount with multiple keys 2014-04-28 14:17:46 -07:00
Jungtaek Lim
bbc9078c3f Fix Pipeline NPE or sth with multi 
* followings are now throwing JedisDataException: it was uncontrolled or controlled by Redis itself
** exec without multi
** discard without multi
** multi within multi
* updates unit test

actually Redis returns ERR and we can pick, but Pipeline + multi has some complex sequence
so it can just throw NPE without ERR
 2014-04-29 00:05:49 +09:00
Jungtaek Lim
986acc8c9e Revert "Revert "Add support for HLL"" 
This reverts commit ac53759f97.

Sorry for double reverting, I should revert "merged commit", not origin commit

Conflicts:
	src/main/java/redis/clients/jedis/BinaryClient.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/test/java/redis/clients/jedis/tests/commands/HyperLogLogCommandsTest.java
 2014-04-06 00:19:16 +09:00
Jungtaek Lim
334314d3c5 Merge branch 'master' into hll-resurrect-afefb71e57b0258a52b465b2b4e57c132aef4db9 
it resurrects afefb71e57

Conflicts:
	src/main/java/redis/clients/jedis/BinaryClient.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/test/java/redis/clients/jedis/tests/commands/HyperLogLogCommandsTest.java
 2014-04-06 00:11:40 +09:00
Jungtaek Lim
11f05ec161 Apply binary PF* commands to BinaryJedis, BinaryShardedJedis 
* Apply binary PF* commands to BinaryJedis, BinaryShardedJedis
* binary PF* commands to interface
** pfadd / pfcount : BinaryJedisCommands
** pfmerge : MultiKeyBinaryCommands
 2014-04-05 23:21:47 +09:00
Jungtaek Lim
ac53759f97 Revert "Add support for HLL" 
This reverts commit afefb71e57.
 2014-04-05 18:46:06 +09:00
Jungtaek Lim
96591a1528 Merge pull request #613 from xetorthio/hll 
Add support for HLL commands
 2014-04-05 18:35:07 +09:00
Marcos Nils
afefb71e57 Add support for HLL 2014-04-03 22:01:15 -03:00
Vijay Ramesh
ce1156be44 JedisSentinelPool#return[Broken]Resource should handle nulls the same was as JedisPool 2014-04-03 16:44:35 -07:00
UglyTroLL
5d3600485f Indent fix 2014-03-18 19:51:51 -07:00
UglyTroLL
1fd5b57575 Fixed #595: 
The byte version of pipeline.getrange should returns byte[] instead of Long.

TESTED:
export TEST=PipeliningTest
make test
 2014-03-18 18:29:03 -07:00
Jonathan Leibiusky
12ab600dee Merge pull request #549 from HeartSaVioR/make_multi_in_pipeline_and_sync_work_smoothly 
Fix multi in Pipeline and sync() - JedisDataException (fixes #547)
 2014-03-12 10:41:51 -04:00
Jonathan Leibiusky
62b98a3e63 Add tests to check returning null to pool 2014-03-12 10:31:22 -04:00
Aniket Schneider
e7285ade5c Accept long parameter for pexpire 2014-03-05 17:04:47 -05:00
Jungtaek Lim
e1f50b5fae Change method naming : ScanResult.getBinaryCursor to ScanResult.getCursorAsBytes 2014-03-05 21:30:36 +09:00
Jungtaek Lim
0cd32a6103 Expose *SCAN commands to BinaryJedis 
* method signatures are a bit similar to Jedis's *SCAN
** but it takes parameters to byte[] instead of String
* ScanParams : allow match pattern with byte[]
* ScanResult : add method to get cursor with byte[] type
* *SCAN for BinaryJedis unit tests included
 2014-03-04 23:54:44 +09:00
Jungtaek Lim
670e019a89 Implements Closeable to Pooled Jedis & ShardedJedis 
* Implement Closeable from Jedis, ShardedJedis with Pooled
** resources from JedisPool, JedisSentinelPool, ShardedJedis, ShardedJedisPool
* Connection class : check whether Jedis Connection is broken
** when it's time to throw JedisConnectionException, mark Connection to broken
 2014-02-23 23:50:40 +09:00
Jonathan Leibiusky
b7d551149a It is better to point everything to localhost and we just make sure 
there is not redis running on port 1234 when renning the tests.
 2014-02-17 18:01:19 -05:00
Jungtaek Lim
68ee4e49d0 Set dependency to Response when multi in pipeline and build dependency 
first if Response's dependency found and not built

* there's some dependency with exec response and command responses
within multi
* if command responses's get() called before exec response's build(), it
calls exec response's build() first
* unit test included
 2014-02-17 13:37:06 +09:00
Jungtaek Lim
05d63bbda4 Shift Redis/Sentinel instances to remove unused index 
* Redis instances : 6, 7, 8 -> 5, 6, 7
* Sentinel instances : 4 -> 3
 2014-02-15 20:22:50 +09:00