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

799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jungtaek Lim
a3345f5a17 Merge pull request #612 from vijaykramesh/sentinel_pool_null_check_on_broken 
handle nulls in JedisSentinelPool#return[Broken]Resource
 2014-04-04 11:23:31 +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
Jungtaek Lim
7a8e8f994d Append 'package' command in Makefile 2014-03-28 23:16:30 +09:00
Marcos Nils
752973de12 Merge pull request #605 from HeartSaVioR/fix-readme-with-invalid-download-link 
Fix invalid link to download (it's deprecated) - replace to releases
 2014-03-27 11:38:34 -03:00
Jungtaek Lim
b7db408a67 Fix invalid link to download (it's deprecated) - replace to releases 2014-03-27 23:33:00 +09:00
Jungtaek Lim
e7bc4f5d65 Merge pull request #601 from HeartSaVioR/master 
Reflect recent version to maven dependency explain
 2014-03-22 18:37:40 +09:00
Jungtaek Lim
d7f88789ea Reflect recent version to maven dependency explain 2014-03-22 18:00:34 +09:00
Jonathan Leibiusky
bcd40b4e34 [maven-release-plugin] prepare for next development iteration 2014-03-12 13:14:51 -04:00
Jonathan Leibiusky
70fa35f3ba [maven-release-plugin] prepare release jedis-2.4.2 2014-03-12 13:14:49 -04:00
Jonathan Leibiusky
d00e8b6444 revert back version 2014-03-12 13:13:48 -04:00
Jonathan Leibiusky
ec03c0940e [maven-release-plugin] prepare for next development iteration 2014-03-12 10:44:02 -04:00
Jonathan Leibiusky
e449923ec0 [maven-release-plugin] prepare release jedis-2.4.2 2014-03-12 10:44:00 -04: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
0c16cbde8b Merge pull request #587 from xetorthio/null-check 
add a number of null check to return methods.
 2014-03-12 10:36:33 -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
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
e9cf469200 Merge pull request #554 from xetorthio/jediscluster_multithread 
Make JedisCluster multihread by improving connection handling
 2014-02-21 10:44:36 -05: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
bfa4a80b01 [maven-release-plugin] prepare for next development iteration 2014-02-17 18:12:23 -05:00
Jonathan Leibiusky
89ccd8dfdd [maven-release-plugin] prepare release jedis-2.4.1 2014-02-17 18:12:21 -05: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
Marcos Nils
752305a60a Merge pull request #551 from mayankdang/master 
Fix #550 : Removed redundant call to connectionPool.getResource()
 2014-02-17 09:36:56 -02: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
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