Commit Graph

341 Commits

Author SHA1 Message Date
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
5a6d98ac56 fix broken instance reference to protocol 2012-04-19 16:48:18 -04:00
Eric Hauser
94e3d25ab8 Merge pull request #211 from raszi/9d4d11ef466d7a890e763bb1b98b044e3d8635b4
My previous static Protocol fix
2012-04-19 11:51:29 -07:00
Tom Martin
dbd7c8b53f Fix NPE in BuilderFactory for Double. 2012-04-19 13:38:40 +02:00
ivowiblo
c765bc3910 Style refactor 2012-04-19 03:04:06 -04:00
ivowiblo
e008f403b1 SLOWLOG RESET is fixed 2012-04-19 02:59:52 -04:00
ivowiblo
d5c2b9965c Slowlog commands. The unit test is failing. 2012-04-19 02:53:26 -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
ivowiblo
8aca0b77f9 Variadic commands 2012-04-18 15:22:43 -04:00
ivowiblo
e4f7f61d00 Pipeline.sort with dstkey uses right Response type 2012-04-18 00:33:20 -04:00
ivowiblo
ded776f859 Pool.java back to the original 2012-04-18 00:27:00 -04:00
Ivo Ramirez
e8c27e0d15 Jedis does support lpushx and rpushx
Conflicts:

	src/main/java/redis/clients/jedis/BinaryJedisCommands.java
	src/main/java/redis/clients/jedis/Pipeline.java
2012-04-18 00:23:38 -04:00
ivowiblo
088f84b6b2 Extra space is removed 2012-04-17 21:37:33 -04:00
Ivo Ramirez
75e52b9a26 z*range commands now receive long instead of int. #242 2012-04-17 21:34:56 -04:00
ivowiblo
0f978f5236 Unused import is removed 2012-04-17 21:13:37 -04:00
Jonathan Leibiusky
d136225281 remove unused import 2012-04-17 18:45:31 -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
aa05406e4a Merge branch 'patch-1' of git://github.com/thesmith/jedis into thesmith-patch-1 2012-04-17 18:35:36 -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
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
Ivo Ramirez
3c86ebcd36 Script commands are supported. 2012-04-14 08:45:26 -03:00
Ivo Ramirez
9dc89626ac Eval and Evalsha is now supported
Conflicts:

	src/main/java/redis/clients/jedis/Client.java
	src/main/java/redis/clients/jedis/Jedis.java
2012-04-14 08:41:27 -03:00
Ben Smith
df3c57940a Fixing Sharded Pipeline as the zrange should be built with a STRING_ZSET 2012-03-23 17:02:16 +00:00
Shaofeng Niu
f010bc0f32 add variadic arguments support to lpush and rpush 2012-02-14 17:42:06 +08: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
Hamza Kaya
b17692ad9a Pipeline uses wrong response builder for get and getSet 2011-12-13 21:32:09 -03:00
KARASZI István
9d4d11ef46 no need to instantiate the Protocol class that can be static 2011-09-26 15:40:16 +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
wjw465150
a688c610ae wjw465150 add socket performance 2011-09-12 22:47:17 -04: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
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