Commit Graph

117 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Marcos Nils
4ab54d955d Change pubSub to pubsub 2014-02-03 12:44:40 -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
Jonathan Leibiusky
842dcd2a95 Merge branch 'cluster' of github.com:marcosnils/jedis into marcosnils-cluster
Conflicts:
	src/main/java/redis/clients/jedis/BinaryClient.java
	src/main/java/redis/clients/jedis/Client.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/Protocol.java
2014-01-16 16:35:04 -05:00
Jonathan Leibiusky
a27c67de66 add SCAN, HSCAN, SSCAN and ZSCAN 2013-12-03 16:55:52 -05:00
Jonathan Leibiusky
5b15d48803 Refactor to have interfaces.
Add cluster pipeline commands.
2013-12-02 14:34:05 -05:00
Jonathan Leibiusky
dde278152f Add CLUSTER ADDSLOTS and CLUSTER DELSLOTS commands 2013-12-02 11:36:55 -05:00
Jonathan Leibiusky
403f2b292c Add CLUSTER MEET command 2013-12-02 10:01:19 -05:00
Jonathan Leibiusky
e7e2bfaedf Launch 3 nodes on ports 7379 to 7381 with cluster enabled.
Add command CLUSTER NODES
2013-12-02 09:53:40 -05:00
Jonathan Leibiusky
18652b906b Merge branch 'speed-up-unit-test' of github.com:HeartSaVioR/jedis into upgrade_libs
Conflicts:
	src/test/java/redis/clients/jedis/tests/JedisPoolTest.java
	src/test/java/redis/clients/jedis/tests/JedisSentinelPoolTest.java
	src/test/java/redis/clients/jedis/tests/JedisSentinelTest.java
	src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java
	src/test/java/redis/clients/jedis/tests/ShardedJedisPoolTest.java
	src/test/java/redis/clients/jedis/tests/benchmark/PoolBenchmark.java
	src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java
2013-11-29 12:12:30 -05:00
Hisham Mardam-Bey
a71c3dff17 Merge remote-tracking branch 'amimimor/master' 2013-08-21 20:32:27 -04:00
mindwind
7655994933 new - supplement transaction missing api and fix some args type definition which is inconsistent with jedis 2013-07-01 14:30:19 +08:00
mindwind
1080d136ec new - command for redis 2.6 2013-06-29 23:15:56 +08:00
mindwind
e7a88a49e9 new - pexpire, pexpireat and pttl command 2013-06-29 15:13:21 +08:00
mindwind
8b3ea5f2de new - dump and restore command 2013-06-29 14:17:44 +08:00
amitm
24c6b7c867 support for new 'set' command (redis 2.6.12+) 2013-05-13 12:40:24 +03:00
Eric Treworgy
6af41cdac2 merging with master branch. Required refactoring of Pipeline code. 2013-02-20 12:24:15 -08:00
Jonathan Leibiusky
846397d985 Merge branch 'master' of git://github.com/hamsterready/jedis into hamsterready-master
Conflicts:
	src/main/java/redis/clients/jedis/BinaryClient.java
	src/main/java/redis/clients/jedis/Client.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/Protocol.java
2013-01-30 10:50:58 -03:00
samhendley
258ac300fc added variadic versions of lpush/rpush(x) functions 2013-01-10 02:39:48 -05:00
samhendley
4c7cc57ede Added bitcount to standard interfaces and bitop to MultiKey interfaces (since it is non-shardable)
Merge branch 'impl-bitcount-and-bitop' of git://github.com/koron/jedis

Conflicts:
	src/main/java/redis/clients/jedis/JedisCommands.java
2013-01-09 23:49:05 -05:00
Eric Treworgy
610f7d4546 Added incrByFloat and hincrByFloat commands (binary and standard) + support for pipelining and sharding 2013-01-07 12:33:19 -08:00
samhendley
2006d80ac5 normalized BinaryJedisCommands to match JedisCommands (including setbit) 2012-12-25 16:00:43 -05:00
Maciej Lopacinski
69b5291f80 SENTINEL commands 2012-11-18 19:58:13 +01:00
MURAOKA Taro
4570329924 implemented bitcount and bitop commands for Redis 2.6 2012-08-23 10:29:36 +09:00
Jonathan Leibiusky
4f5acab0fb Merge branch 'Issue242' of git://github.com/ivowiblo/jedis into issue242
Conflicts:
	src/main/java/redis/clients/jedis/BinaryClient.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-05-06 19:47:00 -03:00
ivowiblo
129e358c9d Now methods accepting infinit and exclusions are supported as String and byte[] overloads 2012-05-03 23:30:44 -04:00