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

182 Commits

Author SHA1 Message Date
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
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
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
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
Jungtaek Lim
a50cf3b15e Apply Sentinel runtime configuration API introduced on Redis 2.8.4 
* Implements new sentinel commands (failover, monitor, remove, set) 
* unit test included
** added 2 redis-server and 1 sentinel for failover test
* with some refactoring
** SentinelCommands : refactor to have interface
** HostAndPortUtil : same format to cluster setup
 2014-01-22 00:23:40 +09: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
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
5b15d48803 Refactor to have interfaces. 
Add cluster pipeline commands.
 2013-12-02 14:34:05 -05:00
Jonathan Leibiusky
77d244b96a Add CLUSTER INFO, CLUSTER SETSLOT and CLUSTER GETKEYSINSLOT commands 2013-12-02 14:05:35 -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
Daniel Josefsson
17f6ee63dc Added support for nested lists, and longs in lists. 2013-11-08 22:25:37 +00:00
Hisham Mardam-Bey
1f3b5f1977 Merge branch 'master' of https://github.com/anthonyu/jedis 2013-08-21 20:57:08 -04: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
anthonyu
bc86b1210b Pipeline eval and evalsha. 2013-08-20 19:43:32 -07:00
mindwind
d57bfb94a9 fix - CLIENT command 2013-07-05 09:13:09 +08:00
mindwind
27b9eba0c0 fix - srandmember missing parameter 2013-07-03 08:50:14 +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