Commit Graph

35 Commits

Author SHA1 Message Date
Jungtaek Lim
1ed231cf15 Mark @Duplicated to TransactionBlock and PipelineBlock related classes /
methods
2014-02-10 07:55:27 +09:00
Jonathan Leibiusky
d5f984a9d6 Merge branch 'transaction-block-should-not-call-discard-when-exception-ocurred' of github.com:HeartSaVioR/jedis into HeartSaVioR-transaction-block-should-not-call-discard-when-exception-ocurred
Conflicts:
	src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java
2014-02-03 10:46:23 -05:00
Jonathan Leibiusky
105ca9f5bb Reformat all files in the project according to java conventions. 2014-01-31 11:24:06 -05:00
Jungtaek Lim
3073f778b4 JedisPool / JedisSentinelPool resets returning object's state (watched,
multi)

* BinaryClient / BinaryJedis : added feature to reset its state
(watched, multi)
* JedisPool / JedisSentinelPool : calls new feature (reset state) when
Jedis object returns to pool
* Unit Test included
2013-12-21 01:33:46 +09:00
Jungtaek Lim
10c131bbf0 BinaryJedis.multi(TransactionBlock) should not call discard when exception occurred
* In BinaryJedis.multi(TransactionBlock), multi & exec already fired before exception occured, so sending discard has no effect, and made another error
** add unit test (error inside TransactionBlock)
*** Transaction with error - Redis discards transaction automatically (execabort)
*** Transaction with error - Redis doesn't roll back (force to execute all)
2013-12-09 10:54:53 +09:00
Jonathan Leibiusky
18652b906b Merge branch 'speed-up-unit-test' of github.com:HeartSaVioR/jedis into upgrade_libs
Conflicts:
	src/test/java/redis/clients/jedis/tests/JedisPoolTest.java
	src/test/java/redis/clients/jedis/tests/JedisSentinelPoolTest.java
	src/test/java/redis/clients/jedis/tests/JedisSentinelTest.java
	src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java
	src/test/java/redis/clients/jedis/tests/ShardedJedisPoolTest.java
	src/test/java/redis/clients/jedis/tests/benchmark/PoolBenchmark.java
	src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java
2013-11-29 12:12:30 -05:00
Jonathan Leibiusky
bbb867781d upgrade to commons-pool 2 2013-11-28 08:13:57 -05:00
Jungtaek Lim
7e1a1a70b2 Speed up Sentinel related tests
* remove FIXME sleep codes for Sentinel related tests
** add functions for Sentinel tests (JedisSentinelTestUtil)
*** waitForSentinelRecognizeRedisReplication
*** waitForNewPromotedMaster
*** waitForSentinelsRecognizeEachOthers
**** TODO: there're no command for sentinel to list recognized sentinel
**** sleep 5.5 sec (sentinel pings to master every 5 sec)

* set HostAndPort class to public(no longer inner) class
** reason: We cannot know pool's current master if HostAndPort class is
private inner class / HostAndPort classes are duplicated (main/test)
** make getter method and parameterized constructor
*** set fields once, get anytime
2013-10-07 11:03:32 +09:00
samhendley
c8ddd237c3 extracted common Pipeline operations into PipelineBase and used that to simplify BinaryTransaction/Transaction 2013-01-10 01:16:54 -05:00
Jonathan Leibiusky
6f4a32d2a1 add select to transaction 2011-12-23 11:44:39 -03:00
Vladimir Soskov
22d4d3fc53 fixing Issue 188 2011-07-31 19:50:16 -07:00
Jonathan Leibiusky
44c3eef60e Add binary responses to binary transaction 2011-05-30 11:13:41 -03:00
Jonathan Leibiusky
525710aab6 remove unused test 2011-05-30 10:58:55 -03:00
Jonathan Leibiusky
00712f040d binary jedis watch command accepts several keys 2011-05-26 12:53:42 -03:00
Jonathan Leibiusky
86fdf63cc9 add publish to transaction 2011-05-11 19:53:20 -03:00
Jonathan Leibiusky
3fb7a52017 multi/exec block return formatted responses 2011-04-06 01:38:19 -03:00
Pieter Noordhuis
dac1d259c0 Don't wait for QUEUED replies in MULTI 2011-02-25 13:44:54 +01:00
Jonathan Leibiusky
2a4a43f4cd add JedisDataException and JedisConnectionException 2011-01-30 17:46:17 -03:00
Neil Gentleman
d18cc4bd13 incr/decr operate on 64-bit numbers. Switching from Integer to Long 2010-11-25 09:45:34 -03:00
Jonathan Leibiusky
970ea3adf4 add watch on several keys, and discard status return 2010-11-21 21:00:40 -03:00
Jonathan Leibiusky
098de44a07 add support for java 1.5 2010-11-21 19:53:43 -03:00
Jonathan Leibiusky
b013a74c44 Merge branch 'binaryAPI' of git://github.com/yaourt/jedis
Conflicts:
	src/main/java/redis/clients/jedis/Connection.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/ShardedJedis.java
2010-11-15 23:55:57 -03:00
Yaourt
e8704296fd Binary U test on Transaction ... 2010-11-08 14:59:57 +01:00
Yaourt
a2b3417fce Fix some more U tests ...
Now only PubSub are still broken ... (little refactoring required)
2010-11-05 10:47:21 +01:00
Yaourt
4a1d9928b5 Update the way the Redis host(s) can be configured for the tests.
There is now a single property : redis-hosts.
This property must contain at least 2 host definitions of the form "host:port" (comma separated).
Sharding tests need 2 hosts ...

If this is not the case, the default value used is "localhost:6379,localhost:6380".
Tests that required one host are using the first definition.
2010-09-15 10:49:36 +02:00
Yaourt
d61f4d79d8 Allow to execute tests against a remote server.
Update Maven pom to use "redis-host" and "redis-port" env. properties.
Default values point to localhost:6379.

Tests updated to use this properties and also defaulted to localhost:6379.
2010-09-13 10:57:30 +02:00
Jonathan Leibiusky
7c0505511e When in multi show a nice error if not using TransactionJedis 2010-08-27 17:22:21 -03:00
Jonathan Leibiusky
99f29abd7b Test will now flush everything before executing 2010-08-24 15:29:59 -03:00
Jonathan Leibiusky
1df234153b New exception management. Less exceptions... assume everything works 2010-08-04 20:15:08 -03:00
Jonathan Leibiusky
b4862828b0 Implemented AUTH 2010-08-03 23:47:52 -03:00
Jonathan Leibiusky
ef5518e581 Implemented BLPOP 2010-08-03 00:32:13 -03:00
Jonathan Leibiusky
4d078d747e Added unwatch command 2010-07-07 23:22:16 -03:00
Jonathan Leibiusky
ce1ebdd022 Added watch command 2010-07-07 23:14:25 -03:00
Jonathan Leibiusky
20acb5bc60 Refactored to support object multi bulk reply 2010-07-07 22:55:35 -03:00
Jonathan Leibiusky
81cc2cec8e Added transactions support 2010-07-05 00:35:47 -03:00