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

245 Commits

Author SHA1 Message Date
Jonathan Leibiusky
fddd41d796 change makefile to accept "start" and "stop" to be able to start the testing environment and stopping it for manual testing purposes. 
raising down-after-milliseconds of sentinel 1 to avoid taking the master down and up all the time.
change sleep to 10 seconds after doing a "salveof" to avoid false negatives.
 2013-09-02 18:13:14 -03:00
Hisham Mardam-Bey
39d81d8f1f Added a JUnit test for JedisSentinelPool. 
This test will set up and get a master from a Redis master slave pair being
watched by 2 Sentinels. It pings the master, segfaults it, asks the pool for
another connection and makes sure it can ping it.

This commit also restores the pom.xml file's scm information back to
xetorthio and adds the default Sentinel port to the Procotol.
 2013-08-28 23:10:50 -04:00
Hisham Mardam-Bey
d377bcf6d3 Fail if the Sentinel does not return the slave. 2013-08-21 23:04:07 -04:00
Hisham Mardam-Bey
33e64bdb6e Changed redis.clients.jedis.tests.commands.AllKindOfValuesCommandsTest#ttl so that it passes assertion. Once this issue is resolved in Redis the test can be fixed. 2013-08-21 23:03:53 -04:00
Hisham Mardam-Bey
9b78d19dcf Merge branch 'fix-issue-438' of https://github.com/vrischmann/jedis 2013-08-21 21:01:03 -04: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
anthonyu
2475f24f7e Fix formatting. 2013-08-20 20:43:50 -07:00
anthonyu
bc86b1210b Pipeline eval and evalsha. 2013-08-20 19:43:32 -07:00
Vincent Rischmann
6dbad88250 Fix issue #438 2013-08-06 00:36:48 +02: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
Jonathan Leibiusky
69f5340aa6 add info optional parameter 2013-02-05 15:55:48 -03:00
Jonathan Leibiusky
9d538a06fd when a script returns Null value, jedis throws NullPointerException 2013-02-05 15:44:35 -03:00
Jonathan Leibiusky
23e50a363e Change the way we test sentinel commands so it is automatic 2013-01-30 15:24:53 -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
Jonathan Leibiusky
406d52b271 fix tests, since ttl now return -2 or -1 depending if the key exists 
already
 2013-01-30 10:41:12 -03:00
samhendley
c8ddd237c3 extracted common Pipeline operations into PipelineBase and used that to simplify BinaryTransaction/Transaction 2013-01-10 01:16:54 -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
samhendley
1a96769481 updated scripting test to be more tolerant of changing error messages (changed since 2.6.0) 2013-01-09 22:52:38 -05:00
shendley
45be143e23 Fixed binary safe pipeline commands and added tests for pipelined hash functions 2012-12-18 10:26:56 -05:00
Maciej Lopacinski
69b5291f80 SENTINEL commands 2012-11-18 19:58:13 +01:00
Ben Smith
909be715bc adding del to sharded jedis pipeline 2012-10-21 17:17:26 +01:00
MURAOKA Taro
4570329924 implemented bitcount and bitop commands for Redis 2.6 2012-08-23 10:29:36 +09:00
Jonathan Leibiusky
beb999d50a when setting timeout infinite, make sure it is connected first 2012-08-02 16:57:14 -03:00
Jonathan Leibiusky
8f9763a7e9 add url support 2012-08-01 16:49:44 -03:00
Jonathan Leibiusky
42f19c7322 Merge branch 'pipeline_multi' of https://github.com/ivowiblo/jedis into pipeline_multi 2012-05-06 19:20:44 -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
ivowiblo
d526a32b12 Pipeline.exec() now returns a response 2012-04-29 02:55:22 -04:00
ivowiblo
6bc2ac0a4f Pipeline supports Multi. Issue #251 is fixed. 2012-04-29 02:43:39 -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
Eric Hauser
94e3d25ab8 Merge pull request #211 from raszi/9d4d11ef466d7a890e763bb1b98b044e3d8635b4 
My previous static Protocol fix
 2012-04-19 11:51:29 -07:00
ivowiblo
d5c2b9965c Slowlog commands. The unit test is failing. 2012-04-19 02:53:26 -04:00
ivowiblo
dd88c51db8 Tests for Variadic commands 2012-04-19 01:51:02 -04:00
ivowiblo
d102ccf1b9 Object commands are supported 2012-04-19 00:32:23 -04:00
Jonathan Leibiusky
f3dbc65bd1 Merge branch 'scriptsupport' of git://github.com/ivowiblo/jedis into ivowiblo-scriptsupport 2012-04-18 18:10:45 -03:00
Jonathan Leibiusky
caac6480ac Merge branch 'variadic_arg_support' of git://github.com/shaofengniu/jedis into shaofengniu-variadic_arg_support 2012-04-17 18:40:17 -03:00
Jonathan Leibiusky
b2648381e2 Merge branch 'Issue171' of git://github.com/ivowiblo/jedis into ivowiblo-issue171 2012-04-17 18:30:30 -03:00
Ivo Ramirez
53f829fb10 JedisPool accepts BinaryJedis as a resource for return. Issue #171 
Conflicts:

	src/main/java/redis/clients/util/Pool.java
 2012-04-17 16:56:26 -04:00
ivowiblo
c9b413c323 Select support to pipeline. Thanks to @ib84 2012-04-17 16:40:54 -04:00
ivowiblo
9e13233bbf DS_Store files removed 2012-04-17 16:06:03 -04:00
ivowiblo
df75c72825 Eval and Evalsha api improved 2012-04-14 22:54:43 -03:00
Ivo Ramirez
df1dfce327 SCRIPT KILL command fixed 2012-04-14 10:26:14 -03:00
Ivo Ramirez
9bf19c6237 Binary scripting API is tested 2012-04-14 10:17:41 -03:00
ivowiblo
96d405a6e3 scripting support 2012-04-14 09:10:00 -03:00
Ivo Ramirez
3c86ebcd36 Script commands are supported. 2012-04-14 08:45:26 -03:00