Commit Graph

410 Commits

Author SHA1 Message Date
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
be163acd52 Merge remote-tracking branch 'upstream/master' 2012-04-14 01:10:26 -03:00
Jonathan Leibiusky
72ca494362 add missing command to Transaction, BinaryTransaction and Pipeline 2011-12-23 12:31:32 -03:00
Jonathan Leibiusky
6f4a32d2a1 add select to transaction 2011-12-23 11:44:39 -03:00
ivos
f3a5d62e2b Issue #158 is fixed: Response.get() returns null if redis returned null (i.e. when using zscore for a non existing member) 2011-12-14 09:18:36 -03:00
ivos
fb723db86d Issue #158 is fixed: Response.get() returns null if redis returned null (i.e. when using zscore for a non existing member) 2011-12-14 05:43:52 +01:00
Hamza Kaya
b17692ad9a Pipeline uses wrong response builder for get and getSet 2011-12-13 21:32:09 -03:00
Jonathan Leibiusky
79965d5d0a Merge remote branch 'raszi/findbugs'
Conflicts:
	src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java
2011-12-13 19:16:14 -03:00
Jonathan Leibiusky
cb1b19b5d4 Merge branch 'master' of https://github.com/ivowiblo/jedis
Conflicts:
	src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java
2011-12-13 18:08:17 -03:00
Jonathan Leibiusky
f27f809fa3 Merge pull request #208 from yaourt/brokenShardedTestFix
Broken sharded test fix
2011-12-13 13:03:10 -08:00
ivos
d97f30a01a Pipeline tests are authenticated. bgrewriteaof command test now supports scheduled status. 2011-12-13 21:33:14 +01:00
KARASZI István
04f603820f fixed some FindBugs errors 2011-09-26 17:45:49 +02:00
Yaourt
f82fb50897 Update ShardedJedisPipelineTest class name. 2011-09-16 22:40:39 +02:00
Yaourt
dcba7bd3b3 Rename test : Shar<>edJedisPipelineTest to ShardedJedisPipelineTest 2011-09-16 17:23:59 +02:00
Yaourt
fd0c57599c Fix broken test due to missing authent 2011-09-16 17:22:59 +02:00
Eric Hauser
b7ee1fe29a Merge pull request #189 from vsoskov/jedis
---

the exception is returned in the list with the not formatted and formatted values.
Response.get throws the exception.
2011-09-13 23:08:20 -04:00
Eric Hauser
bb806ae066 Merge pull request #154 from ewhauser/jedis
---

Per http://groups.google.com/group/jedis_redis/browse_thread/thread/38c94a90d97d429b
2011-09-12 23:13:18 -04:00
Eric Hauser
fe87266a53 Merge pull request #163 from grdmitro/jedis
---

Throwing Jedis connection exception on IO error rather than JedisException
2011-09-12 23:07:45 -04:00
Eric Hauser
90dd6a1068 Merge pull request #168 from kevinsawicki/jedis
---

This constructor type is available on the ```Jedis``` class and so I added it to ```JedisPool``` for consistency.

Conflicts:
	src/main/java/redis/clients/jedis/JedisPool.java
2011-09-12 23:06:24 -04:00
Eric Hauser
7803f5b0df Merge pull request #170 from kevinsawicki/jedis
---

This corrects a [findbugs](http://findbugs.sourceforge.net/) warning about how iteration over a key set followed by a call to ```get``` is less efficient than iterating over an entry set.
2011-09-12 22:58:43 -04:00
Eric Hauser
7b24682def Merge pull request #173 from kevinsawicki/jedis
---

This was discovered by running [findbugs](http://findbugs.sourceforge.net/) against the Jedis source.
2011-09-12 22:57:16 -04:00
Eric Hauser
e9d8886eb2 Merge pull request #197 from michaelcameron/jedis
---

We would like to add the ability to specify the database number on the pool config. We have a number of integration/functional tests in different projects using redis and would like to keep them separate. Setting up a number of redis server instances on different ports would become unwieldy.

The changes add the ability to specify the database number for jedis pools with associated test. I did not add the ability to create a raw jedis connection with a database number because the current implementation of pool creates the jedis object first, then if a password exists it calls the auth command. However, if a password is required, then the select command on the jedis create would fail. I also did not change the shard constructor of jedis to use a database number (which actually does have the constructor of jedis call the auth command). 

I could clean up the implementation to always have the jedis constructor call auth if a password exists, then select the database if it is non-zero, and changing sharding info to contain a database config value. Let me know if you want me to make these bigger changes.
2011-09-12 22:53:30 -04:00
Eric Hauser
dba5e2c3d4 Merge pull request #199 from sehugg/jedis
---

The subscribe and psubscribe operations call setTimeoutInfinite() since they never return on their own. If the Redis server goes away without closing the connection, the connection can hang indefinitely. Turning on keep-alive will allow the connection to eventually timeout and attempt reconnection.

Note that keepalive must also be enabled on your server, see the Linux HOWTOs on how to do this.
2011-09-12 22:49:12 -04:00
Eric Hauser
a9ef10bb00 fix ignore that was placed on wrong test 2011-09-12 22:48:58 -04:00
wjw465150
a688c610ae wjw465150 add socket performance 2011-09-12 22:47:17 -04:00
Eric Hauser
3e8ac6e094 Merge pull request #207 from ewhauser/feature/ignore-broken-pubsub-test
Ignore broken test in pubsub until logic can be confirmed as broken
2011-09-12 19:41:21 -07:00
Eric Hauser
b178e25d37 ignoring broken test until jonathon can comment on the correct logic 2011-09-12 22:38:39 -04:00
Eric Hauser
e55eed4ef2 Merge pull request #205 from ewhauser/feature/ignore-intellij-files
Add IntelliJ generated files to .gitignore
2011-09-09 22:03:40 -07:00
Eric Hauser
420192ba05 adding intellij generated files to .gitignore 2011-09-10 00:57:58 -04:00
Jonathan Leibiusky
9d48a07c3e Merge pull request #166 from kevinsawicki/patch-1
Fence code blocks in README with languages.
2011-08-31 05:30:22 -07:00
Jonathan Leibiusky
8a5948a84a Merge pull request #167 from kevinsawicki/docs
Fix @see tags referencing int params that are now long
2011-08-31 05:29:37 -07:00
Jonathan Leibiusky
ef3a532902 Merge pull request #172 from kevinsawicki/docs2
Fix broken @see and @link javadoc tags
2011-08-31 05:28:51 -07:00
Jonathan Leibiusky
c9d856c122 Merge pull request #193 from gigq/master
Comments on exists were incorrect
2011-08-31 05:22:28 -07:00
Michael Cameron
fb33b262e4 Add ability to specify database number in pool config 2011-08-26 16:47:37 -05:00
Justin Sanders
0aab8cb63b Fixed comments in exists, return values were incorrect 2011-08-16 11:15:07 -04:00
Vladimir Soskov
ec0b58e183 fixing Issue 188 - Pipline.syncAndReturnAll changes 2011-07-31 20:28:51 -07:00
Vladimir Soskov
22d4d3fc53 fixing Issue 188 2011-07-31 19:50:16 -07:00
Kevin Sawicki
3abaf71e0a Mark inner classes static that don't reference parent class. 2011-06-29 09:34:57 -07:00
Kevin Sawicki
bbb6d666ac Fix broken @see and @link tags 2011-06-28 10:52:46 -07:00
Kevin Sawicki
e9644a4529 Add JedisPool constructor that takes only host string 2011-06-24 16:44:12 -07:00
Kevin Sawicki
97bbfdc2d6 Iterate over entry set instead of key set. 2011-06-24 16:40:36 -07:00
Kevin Sawicki
234336b58b Fix @see tags referencing int params that are now long 2011-06-23 16:49:28 -07:00
Kevin Sawicki
f25901d64e Fence code blocks in README with languages. 2011-06-23 14:56:46 -07:00
Dmytro
6e4e1c39f4 Throwing Jedis connection exception on IO error rather than JedisException 2011-06-15 09:46:48 +01:00
Jonathan Leibiusky
6c3ec9fc14 Merge pull request #162 from tnm/master
update to 2.0.0 in README
2011-06-13 10:55:09 -07:00
Ted Nyman
a77153aaa0 update maven dep version number, and license date 2011-06-13 10:40:08 -07:00
Jonathan Leibiusky
f9608e9364 Merge pull request #159 from amalloy/patch-1
Edited README.md via GitHub
2011-06-07 19:47:46 -07:00
Alan Malloy
ede74672d1 Edited README.md via GitHub 2011-06-07 19:45:18 -07:00
Jonathan Leibiusky
cbca00a78e Merge pull request #153 from ewhauser/master
Exception thrown when trying to get a key with pipeline that does not exist
2011-06-03 08:01:50 -07:00
Jonathan Leibiusky
9006178a05 JedisPool timeout was broken. Values <= 0 where treated as -1, where 0 is infinite 2011-06-03 11:48:55 -03:00