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

579 Commits

Author SHA1 Message Date
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
bc9e49d6c9 Merge pull request #571 from rherget/master 
add a returnBrokenResource method to ShardedJedisPool
 2014-05-25 13:36:27 -04:00
Marcos Nils
20d1450124 Merge pull request #622 from mindwind/master 
ScanParams should be return this reference for chain code style like SortingParams
 2014-05-25 20:34:30 +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
Marcos Nils
c17a228b45 Merge pull request #637 from HeartSaVioR/fix-cluster-nodes-parse-error 
fix "cluster nodes" parse error when slot is in transition (fixes #635)
 2014-05-25 20:32:28 +03:00
Steve Parrington
742e83b1e0 Added override annotation to ShardedJedis.set() 2014-05-22 11:29:55 +01:00
Steve Parrington
51de5f72ab Added Set NXXX and EXPX options for JedisCluster and ShardedJedis 2014-05-21 16:09:47 +01: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
Jungtaek Lim
6485a7ec08 Add Binary Pipeline version of pfcount 2014-04-30 08:17:59 +09:00
Alok Singh
d9d039d060 Added pfcount(keys) to BinaryJedis interfaces 2014-04-29 08:58:15 -07:00
Alok Singh
b633024c11 Move pfcount(keys) method to multikey interfaces 2014-04-28 16:41:09 -07:00
Alok Singh
cd722e5a82 Add support for pfcount with multiple keys 2014-04-28 14:17:46 -07:00
mindwind
69de8d84d5 fix - ScanParams should be return this reference 
build pattern for chain code style
 2014-04-24 10:58:57 +08: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
c2cf79c972 Apply PF* (string, binary) commands to Pipeline 
* Apply PF* (string, binary) commands to Pipeline
* PF* Pipeline (string, binary) commands to interface
** pfadd / pfcount : BinaryRedisPipeline, RedisPipeline
** pfmerge : MultiKeyBinaryRedisPipeline, MultiKeyCommandsPipeline
 2014-04-05 23:48:49 +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
1345b5c1da Apply PF* commands to JedisCluster, ShardedJedis 
* Apply PF* commands to JedisCluster, ShardedJedis
* PF* commands to interface
** pfadd / pfcount : JedisCommands
** pfmerge : MultiKeyCommands
 2014-04-05 22:19:11 +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
a6b76ae665 Remove RedisTimeout that was added accidentally 2014-04-03 22:05:40 -03: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
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
Jonathan Leibiusky
f35567cc9f Merge branch 'null-check' of github.com:hgschmie/jedis into null-check 2014-03-12 10:28:44 -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
d9813a09dc Change ScanResult's cursor type to byte[] 
* It's less probabilities to conversion with byte[] <-> ?
 2014-03-05 08:30:09 +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
Marcos Nils
4e78b811be Merge JedisSlotBasedConnectionGuaranteedConnectionHandler to JedisSlotBasedConnectionHandler 2014-03-03 18:56:04 -03:00
Marcos Nils
b5fe10729b Merge branch 'fix-jedis-cluster-failover-to-slave' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-fix-jedis-cluster-failover-to-slave 2014-03-03 18:49:43 -03:00
Roland von Herget
b2eb5d6d1c add a returnBrokenResource method, this way we can throw away broken ShardedJedis objects (e.g. due to timeouts on one shard) 2014-02-28 14:36:53 +01: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
ddb1870a5f Fix bug in JedisCluster del command. Fix #568 2014-02-27 10:48:46 -03:00
Jungtaek Lim
fcea0fe0fe CLUSTERDOWN : JedisClusterException 2014-02-26 07:54:08 +09:00
Jungtaek Lim
882d662470 Make Jedis Cluster more likely to antirez's redis-rb-cluster 
JedisClusterCommand

* improvements on connection error handling
** if based on slot connection throws connection related exception, retry to random node
** if we retry with random node, but all nodes are unreachable, throw JedisConnectionException without retry
** try to release connection whether connection is broken or not

* bug fix : if asking flag is on, and success this time, set asking flag to off

JedisClusterConnectionHandler

* have flexibility on initializing slots cache
** allow some nodes connection failure - skip
** if current node is success initializing slots cache, skip other nodes
** if current node failed to initialize slots cache, discard all discovered nodes and slots

* set nodes if node does not exist in nodes
** it restricts JedisPool to replace - prevent IllegalStateException : Returned object not currently part of this pool

JedisSlotBasedConnectionGuaranteedConnectionHandler

* getConnection (random connection)
** check all connections by random sequence
** always return valid connection (able to ping-pong)
** throw exception if all connections are invalid

* some refactoring
 2014-02-25 18:29:09 +09:00
Marcos Nils
756113821f Make JedisClusterCRC16 multi-thread 2014-02-20 14:58:04 -03:00
Marcos Nils
3f8507a117 Remove unnecessary connection allocation 2014-02-20 14:39:51 -03:00
Marcos Nils
756dc8deec Merge with master 2014-02-18 22:30:40 -03:00
Marcos Nils
e4de67048e Make JedisCluster multihread by improving connection handling 2014-02-18 21:59:53 -03: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
Jonathan Leibiusky
8ac9bd612c Merge pull request #546 from HeartSaVioR/sentinel_unit_test_revised 
Sentinel unit test revised (use "sentinel failover", take care of "-failover-abort", etc)
 2014-02-17 17:14:54 -05:00
Mayank Dang
c4fb2b4adc Fix #550 : Removed redundant call to connectionPool.getResource() in method getConnectionFromSlot(int slot) in class JedisSlotBasedConnectionHandler 2014-02-17 16:52:19 +05:30
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