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

804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nelson Rodrigues
dddc0d15f1 Add second jedis connection to waitForNewPromotedMaster call 2014-07-28 11:58:09 -07:00
Nelson Rodrigues
c81bdc0849 Properly close jedis connection in case of exceptions 2014-07-28 11:45:34 -07:00
Nelson Rodrigues
d52cc06b72 Let the user choose whether to testOnBorrow or testOnReturn 
Force testOnBorrow if neither is specified.
 2014-07-28 11:44:23 -07:00
Nelson Rodrigues
fceb719848 Proper master failover detection depends on testOnBorrow 2014-07-28 11:35:39 -07:00
Nelson Rodrigues
c02c663776 Add check that JedisSentinelPool accepts closing connections before and after failover 2014-07-28 11:34:00 -07:00
Nelson Rodrigues
9013078d40 Fix race condition in JedisSentinelPoolTest 
The test was issuing the failover command and only afterwards
connecting to the pub-sub channel to receive failover notifications.
If the failover occurred fast enought the pub-sub listener would never
get the notification.

Run the failover command on a separate Jedis connection after we're
absolutely sure that we're subscribed to the pub-sub channel.
 2014-07-28 10:56:21 -07:00
Nelson Rodrigues
9e128b4520 Add an extra sentinel server to tests 
Adds an extra sentinel server monitoring the mymaster failover cluster,
makes the tests more interesting.
 2014-07-28 10:55:09 -07:00
Nelson Rodrigues
75d2ba751b Race condition when switching masters in JedisSentinelPool 
Instead of recreating GenericObjectPool, we change the
underlying factory destination host. When returning
objects to the pool we make sure they are pointing at
the correct master.
 2014-07-25 18:55:19 -07:00
Jungtaek Lim
4f693872b9 Merge pull request #677 from macgngsta/master 
Fixed Gradle build file
 2014-07-18 12:53:01 +09:00
Greg Tam
c2624c6c93 fixed the name of archiveBaseName to archivesBaseName 2014-07-17 15:11:02 -06:00
Jungtaek Lim
e67a80f694 Merge pull request #675 from evenX86/patch-1 
fix comment which describe LPOP from rpop method
 2014-07-17 19:10:13 +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
76df52ef9d Merge pull request #668 from HeartSaVioR/fix-build-related-to-change-of-cluster-nodes-output 
fix build after CLUSTER NODES output has been changed
 2014-07-02 08:01:51 +09:00
Jungtaek Lim
0f472c97a2 fix build after CLUSTER NODES output has been changed 
* https://github.com/antirez/redis/issues/1848
* we don't need to handle :0 by changes
 2014-07-02 07:42:29 +09:00
Jonathan Leibiusky
e05eaa2b07 [maven-release-plugin] prepare for next development iteration 2014-05-29 11:44:57 -04:00
Jonathan Leibiusky
fdce5fb692 [maven-release-plugin] prepare release jedis-2.5.1 2014-05-29 11:44:56 -04:00
Jonathan Leibiusky
d02e56c4f8 Merge pull request #651 from xetorthio/protocol_bound_fix 
Checks for buffer out of bounds before writing to the stream. Fixes #636
 2014-05-29 11:43:16 -04:00
Jungtaek Lim
74b527d629 Merge pull request #648 from dustinlineweber/patch-1 
stupid-small update to README.md
 2014-05-28 05:48:10 +09:00
Dustin Lineweber
58ebeed00e Update README.md 2014-05-27 15:37:42 -05:00
Jonathan Leibiusky
7e8b09e610 [maven-release-plugin] prepare for next development iteration 2014-05-27 12:50:25 -04:00
Jonathan Leibiusky
9aab05f9d0 [maven-release-plugin] prepare release jedis-2.5.0 2014-05-27 12:50:23 -04: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
0a8aa7ae1d Merge pull request #606 from HeartSaVioR/append-package-command-in-makefile 
Append 'package' command in Makefile
 2014-05-25 23:05:39 +03:00
Marcos Nils
667eeaf815 Merge pull request #626 from HeartSaVioR/fix-pipeline-throws-npe-without-multi 
Fix Pipeline throws NPE using exec without multi (fixes #623)
 2014-05-25 22:52:41 +03:00
Marcos Nils
1fba7de9bc Change back commons pool to 2.0 as 2.2 isn't fully tested 2014-05-25 16:51:47 -03:00
Marcos Nils
4ca3596df1 Merge branch 'PumpkinJack-master' 2014-05-25 16:44:45 -03:00
Marcos Nils
f3834e1a1b Merge branch 'master' of https://github.com/PumpkinJack/jedis into PumpkinJack-master 2014-05-25 16:43:33 -03:00
Marcos Nils
e0cf204fc4 Merge branch 'HeartSaVioR-introduce-undocumented-jedis-cluster-commands' 2014-05-25 16:31:00 -03:00
Marcos Nils
1782aaeeb1 Manual merge of #581 2014-05-25 16:30:41 -03:00
Marcos Nils
d8c3629fde Merge branch 'etreworgy-impl-incrbyfloat' 2014-05-25 15:32:45 -03:00
Marcos Nils
50052e90ad Manually merge #400 2014-05-25 15:32:12 -03:00
Marcos Nils
0d5062c347 Merge branch 'master' of github.com:xetorthio/jedis 2014-05-25 15:23:59 -03:00
Marcos Nils
a21d1fae37 Merge branch 'HeartSaVioR-expose-scan-commands-to-binary-jedis' 2014-05-25 15:22:38 -03:00
Marcos Nils
3131279b5b Manually merge with #574 2014-05-25 15:22:20 -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
Jonathan Leibiusky
bc9e49d6c9 Merge pull request #571 from rherget/master 
add a returnBrokenResource method to ShardedJedisPool
 2014-05-25 13:36:27 -04:00
Marcos Nils
20d1450124 Merge pull request #622 from mindwind/master 
ScanParams should be return this reference for chain code style like SortingParams
 2014-05-25 20:34:30 +03:00
Jonathan Leibiusky
8f52dc743f Merge pull request #615 from xetorthio/hll-resurrect-afefb71e57b0258a52b465b2b4e57c132aef4db9 
Support for HLL
 2014-05-25 13:34:13 -04:00
Marcos Nils
c17a228b45 Merge pull request #637 from HeartSaVioR/fix-cluster-nodes-parse-error 
fix "cluster nodes" parse error when slot is in transition (fixes #635)
 2014-05-25 20:32:28 +03:00
Jonathan Leibiusky
aca1b32f6e Merge pull request #641 from Lolecule/set_nxxx_expx_on_jedis_cluster 
Added Set NXXX and EXPX options for JedisCluster and ShardedJedis
 2014-05-25 13:31:36 -04:00
Steve Parrington
742e83b1e0 Added override annotation to ShardedJedis.set() 2014-05-22 11:29:55 +01:00
Steve Parrington
51de5f72ab Added Set NXXX and EXPX options for JedisCluster and ShardedJedis 2014-05-21 16:09:47 +01:00
Jungtaek Lim
7255a8cae1 fix "cluster nodes" parse error when slot is in transition 
* extract cluster nodes info. parser from JedisClusterConnectionHandler
* unit test for migrating slot included
 2014-05-21 08:08:12 +09:00
Marcos Nils
4b07966e74 Checks for buffer out of bounds before writing to the stream. Fixes #636 2014-05-20 11:42:16 -03:00
PumpkinJack
942fc1d77b add the time() method 2014-05-04 15:15:21 +08:00
PumpkinJack
e17a312d92 To solving the error (at Pool.java 35 : The type 
org.apache.commons.pool2.impl.AbandonedConfig cannot be resolved. It is
indirectly referenced from required .class files), we update
common-pool2 (2.0 -> 2.2)
 2014-05-04 15:03:18 +08:00
PumpkinJack
c63e901232 add 'time()' method to MultiKeyPipellineBase 2014-05-03 17:25:10 +08:00
Jungtaek Lim
6485a7ec08 Add Binary Pipeline version of pfcount 2014-04-30 08:17:59 +09:00
Jungtaek Lim
219f9b3716 Merge pull request #627 from aloksingh/hll-pfcount-with-multiple-keys 
Add support for pfcount with multiple keys
 2014-04-30 06:54:22 +09:00