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

81 Commits

Author SHA1 Message Date
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
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
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
e7285ade5c Accept long parameter for pexpire 2014-03-05 17:04:47 -05:00
Jonathan Leibiusky
79f1dcb92b Merge branch 'master' of github.com:hgschmie/jedis into hgschmie-master 2014-02-11 12:22:01 -05: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
Henning Schmiedehausen
7449619fca Implement Closeable for Jedis, BinaryJedis etc. 
This allows a Jedis object to participate in try-with-resources when
using Java 7+. This change is fully backwards compatible to Java 6 and
previous releases of the Jedis client.
 2014-02-07 13:39:41 -08: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
Jonathan Leibiusky
265eab0cc9 Merge branch 'reset-state-of-jedis-client' of github.com:HeartSaVioR/jedis into HeartSaVioR-reset-state-of-jedis-client 2014-01-28 16:50:11 -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
Marcos Nils
dd0bbdaf91 Several changes have been added to this commit: 
- Add asking to cluster commands
- Make jedis cluster return connection to original pool
- Add tests for MOVED and ASK cluster responses
- Refactor connection handler to recalculate connections based on slots

This commit makes the first usable version of Jedis along with Redis Cluster
 2014-01-03 16:42:21 -03:00
Jungtaek Lim
3073f778b4 JedisPool / JedisSentinelPool resets returning object's state (watched, 
multi)

* BinaryClient / BinaryJedis : added feature to reset its state
(watched, multi)
* JedisPool / JedisSentinelPool : calls new feature (reset state) when
Jedis object returns to pool
* Unit Test included
 2013-12-21 01:33:46 +09:00
Jonathan Leibiusky
46734e646a add WAIT command 2013-12-05 09:35:13 -05:00
Jonathan Leibiusky
a27c67de66 add SCAN, HSCAN, SSCAN and ZSCAN 2013-12-03 16:55:52 -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
Hisham Mardam-Bey
a71c3dff17 Merge remote-tracking branch 'amimimor/master' 2013-08-21 20:32:27 -04:00
Hisham Mardam-Bey
625e2235fd Merge remote-tracking branch 'mindwind/master' 
Conflicts:
	src/main/java/redis/clients/jedis/BinaryClient.java
 2013-08-20 23:36:42 -04:00
mindwind
d57bfb94a9 fix - CLIENT command 2013-07-05 09:13:09 +08: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
69f5340aa6 add info optional parameter 2013-02-05 15:55:48 -03: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
5bde3da7f2 added interfaces for ScriptingCommands, AdvancedCommands most of jedis and binaryjedis are defined by interfaces 2012-12-26 11:45:57 -05: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
Jonathan Leibiusky
5244d82450 Merge branch 'Object' of git://github.com/ivowiblo/jedis 
Conflicts:
	src/main/java/redis/clients/jedis/BinaryJedisCommands.java
	src/main/java/redis/clients/jedis/BinaryShardedJedis.java
	src/main/java/redis/clients/jedis/Commands.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/Protocol.java
 2012-04-23 23:00:13 -03:00
Jonathan Leibiusky
05503212aa Merge branch 'variadic' of git://github.com/ivowiblo/jedis into variadic 
Conflicts:
	src/main/java/redis/clients/jedis/BinaryClient.java
	src/main/java/redis/clients/jedis/BinaryJedis.java
	src/main/java/redis/clients/jedis/BinaryShardedJedis.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-04-23 21:00:29 -03:00
Jonathan Leibiusky
3da2f2dd57 Merge branch 'slowlog' of git://github.com/ivowiblo/jedis into slowlog 
Conflicts:
	src/main/java/redis/clients/jedis/BinaryClient.java
	src/main/java/redis/clients/jedis/BinaryJedis.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/Protocol.java
 2012-04-23 20:35:55 -03:00
ivowiblo
d5c2b9965c Slowlog commands. The unit test is failing. 2012-04-19 02:53:26 -04:00
ivowiblo
d102ccf1b9 Object commands are supported 2012-04-19 00:32:23 -04:00