Jungtaek Lim
7f45a2ca24
Apply "Format" to all files, Closes #765
2014-10-09 21:08:05 +09:00
Jungtaek Lim
5575f08076
only Connection should take care of default host, port
2014-10-09 08:51:42 +09:00
Jungtaek Lim
b2fcbed66f
Merge branch 'making_jedis_pool_cdi_compatible' of https://github.com/nykolaslima/jedis into nykolaslima-making_jedis_pool_cdi_compatible
2014-10-09 08:35:06 +09:00
Nykolas Lima
f7789213df
using super instead of this to keep the code style
2014-10-08 17:37:29 -03:00
Jungtaek Lim
35a1174fb1
Merge branch 'improving_javadoc' of https://github.com/nykolaslima/jedis into nykolaslima-improving_javadoc
2014-10-05 10:18:44 +09:00
Nykolas Lima
d7105914aa
adding information about redis versions
2014-10-03 14:23:00 -03:00
Nykolas Lima
a3422bd898
ttl return -1 if key does not have an associated expire but return -2 if key does not exists
2014-10-03 13:57:34 -03:00
Nykolas Lima
833065b670
changing default constructor to use default host and port (localhost)
2014-09-27 13:37:42 -03:00
Jungtaek Lim
61f8ff6918
Support zrevrangebylex command
...
* binary, string, pipeline (binary, string), sharded(binary, string), cluster (string)
2014-09-27 15:27:28 +09:00
Nykolas Lima
f065b80ab0
we can't pass null because it will throw an exception. Using localhost instead
2014-09-19 17:09:27 -03:00
Nykolas Lima
a3f7e888da
making Jedis compatible with CDI
2014-09-19 16:54:49 -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
8492757f7a
Merge branch 'feature_blocklist_parameter' of https://github.com/catinred2/jedis into catinred2-feature_blocklist_parameter
...
Conflicts:
src/main/java/redis/clients/jedis/Jedis.java
src/main/java/redis/clients/jedis/JedisCluster.java
2014-09-11 11:31:29 +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
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
431ae79ff1
Follow up changes on "pubsub numsub" output
...
* String, String to String, Long
* We're avoiding to break backward compatibility
** convert Long to String so that return type is same to old type
2014-08-28 18:14:49 +09:00
Ming
a30598b7cb
add blpop/brpop with timeout parameter interface to JedisCommands
2014-08-14 10:37:28 +08:00
Jungtaek Lim
e6d08f46fb
Merge branch 'remove-pexpire-int' of https://github.com/aniketschneider/jedis into aniketschneider-remove-pexpire-int
...
Conflicts:
src/main/java/redis/clients/jedis/Client.java
2014-08-12 10:12:44 +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
xuyifei
088d86a60f
Update Jedis.java
...
edit the rpop note (just makei it Specific
2014-07-17 16:40:22 +08: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
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
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
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
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
Alok Singh
cd722e5a82
Add support for pfcount with multiple keys
2014-04-28 14:17:46 -07:00
Jungtaek Lim
409740f06c
Support Sorted Set with LEX commands
...
* new commands : ZLEXCOUNT, ZRANGEBYLEX, ZREMRANGEBYLEX
** added commands to Jedis, ShardedJedis, JedisCluster, PipelineBase with Binary
/ Normal(String)
** description links
*** http://redis.io/commands/zlexcount
*** http://redis.io/commands/zrangebylex
*** http://redis.io/commands/zremrangebylex
** Unit test included
2014-04-22 23:39:37 +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
Marcos Nils
afefb71e57
Add support for HLL
2014-04-03 22:01:15 -03:00
Aniket Schneider
92f6785a58
Remove deprecated pexpire(key, int) methods
2014-03-05 17:04:51 -05:00
Aniket Schneider
e7285ade5c
Accept long parameter for pexpire
2014-03-05 17:04:47 -05: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
ba767cc5d4
Merge branch 'introduce-new-sentinel-commands-added-to-Redis-2.8' of github.com:HeartSaVioR/jedis into HeartSaVioR-introduce-new-sentinel-commands-added-to-Redis-2.8
2014-02-11 12:11:57 -05:00
Jonathan Leibiusky
3bca5d8460
Merge branch 'unsigned_long_cursor_with_compatibility' of github.com:HeartSaVioR/jedis into HeartSaVioR-unsigned_long_cursor_with_compatibility
2014-02-11 11:29:18 -05:00
Jungtaek Lim
0aacd48c81
Remove all @Deprecated things about *scan
...
* remove all @Deprecated methods about *scan
* rename ScanResult.getStringCursor() to ScanResult.getCursor()
** its original name
* let unit tests follow this change
2014-02-10 07:28:46 +09:00
Jungtaek Lim
ed81f37d1b
Introduce *scan with "string" cursor parameter to support unsigned long
...
cursor
* overload all *scan method to change "int" cursor to "string" cursor
* set @Deprecated and leave reason to deprecate and when to remove to
current *scan method
* modify unit tests to make it work with new *scan method
2014-02-10 07:08:39 +09:00
Daniel Josefsson
40c8a93340
Merge branch 'master' into eval-with-nested-lists-and-longs
...
Conflicts:
src/main/java/redis/clients/jedis/Jedis.java
src/test/java/redis/clients/jedis/tests/commands/ScriptingCommandsTest.java
2014-02-05 22:24:23 +00:00
Jungtaek Lim
a5363582a6
Apply "Java Convention" to met Jedis's preferred source code Convention
2014-02-05 07:52:53 +09:00
Jungtaek Lim
6efeb45952
Merge branch 'master' into introduce-new-sentinel-commands-added-to-Redis-2.8
...
Conflicts:
Makefile
src/main/java/redis/clients/jedis/Jedis.java
2014-02-05 00:26:14 +09:00
Marcos Nils
4ab54d955d
Change pubSub to pubsub
2014-02-03 12:44:40 -03:00
Marcos Nils
4b53160a74
Remove unnecessary Builder and fix merge issue. Fixes #520
2014-02-01 20:52:41 -03:00
Marcos Nils
bd19193cb6
Merged with master
2014-02-01 20:41:14 -03:00
Marcos Nils
8bec9fd373
Implement missing pubsub commands and fix indentation
2014-02-01 20:14:18 -03:00
Jonathan Leibiusky
105ca9f5bb
Reformat all files in the project according to java conventions.
2014-01-31 11:24:06 -05:00
Marcos Nils
b05d9adfb0
Change zadd parameter order to allow duplicated scoremembers but not members
2014-01-26 13:53:34 -03:00
Mayank Kakodkar
5f5b80e6e3
Corrected documentation for Jedis.get(), it returns a Java null, not (nil)
2014-01-23 21:03:46 +05:30