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

419 Commits

Author SHA1 Message Date
Jonathan Leibiusky
ad58f816b6 make sure that JedisSentinelPool use timeout, password and db 2013-09-15 15:33:22 -03:00
Hisham Mardam-Bey
ebf1380eea Fixed bug where timeout, password, and database were not set in the 
JedisSentinelPool overloaded contructor and hence not passed to JedisFactory.
 2013-09-12 21:52:29 -04:00
Jonathan Leibiusky
2ed1f073ff it might happen that it is alredy saving, so make sure that test won't fail because of this 2013-09-03 14:05:50 -03:00
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
52286d6942 Refactored the inline thread that monitors the master and turned it into its 
own class. The pool shuts down the monitors as well now.
 2013-08-24 17:14:03 -04:00
Hisham Mardam-Bey
c2a48afafd Initial JedisSentinelPool based on code from hamsterready/jedis-sentinel-pool. 
Given a master name and a set of sentinels this pool will subscribe to the
Sentinel notifications about master changes (+switch-master) and
re-establishes the pool to the new master when one is announced.
 2013-08-23 23:06:13 -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
Hisham Mardam-Bey
ed80e7ce70 Allow the Pool to be constructed without having an internal pool created. 
This is useful when extending the Pool without being able to create one at
construction time.
 2013-08-21 00:06:30 -04:00
anthonyu
2475f24f7e Fix formatting. 2013-08-20 20:43:50 -07: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
Vincent Rischmann
6dbad88250 Fix issue #438 2013-08-06 00:36:48 +02:00
mindwind
155aff09e0 fix - recover zadd with one score memeber 2013-07-15 15:57:03 +08:00
mindwind
5f11954d31 fix - pipeline zadd method signature 
from: zadd(String key, double score, String member)
to: zadd(String key, Map<Double, String> scoreMembers)
 2013-07-09 16:42:01 +08:00
mindwind
fffd119c63 fix - pipeline sort 2013-07-08 16:26:13 +08:00
mindwind
d57bfb94a9 fix - CLIENT command 2013-07-05 09:13:09 +08:00
mindwind
96c789aaab new - zcount with string min and max 2013-07-03 16:20:31 +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
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
mindwind
7b6006b669 merge - jedis pull request #429 2013-06-29 12:59:32 +08:00
mindwind
20a75417cd fix - suppress warnings 2013-06-29 12:58:25 +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
258ac300fc added variadic versions of lpush/rpush(x) functions 2013-01-10 02:39:48 -05:00
samhendley
6b5fccdc0a refactored pipelinebase so it is usable to implement SharedJedisPipeline as well. 2013-01-10 02:29:39 -05: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
4f9ddb3b5f fixed many pipeline requests that were returning the wrong types 2013-01-10 00:50:19 -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
samhendley
7b7c6c9602 fixed up some missing pipelined methods 2012-12-26 11:58:48 -05: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
cc0ef89b7d added binary version of MultiKey commands 2012-12-26 10:22:38 -05:00
samhendley
2006d80ac5 normalized BinaryJedisCommands to match JedisCommands (including setbit) 2012-12-25 16:00:43 -05:00
samhendley
429e45081e removed functions in Jedis that overrode BinaryJedis versions 2012-12-25 09:21:44 -05:00
samhendley
333ac221e1 extracted interfaces from Jedis 2012-12-24 11:41:53 -05:00
samhendley
c0bda88e2c Normalized Pipeline[] interfaces and extracted all of the non-shardable commands into the MultiKey* interfaces 2012-12-24 10:45:19 -05:00
samhendley
f9e818c92b Merge remote-tracking branch 'samhendley/binary_pipeline' 2012-12-22 11:08:01 -05:00
shendley
45be143e23 Fixed binary safe pipeline commands and added tests for pipelined hash functions 2012-12-18 10:26:56 -05:00