Commit Graph

631 Commits

Author SHA1 Message Date
Jonathan Leibiusky
d7c5823cbb Merge pull request #524 from xetorthio/reformat-all
Reformat all files in the project according to java conventions.
2014-01-31 08:25:16 -08:00
Jonathan Leibiusky
105ca9f5bb Reformat all files in the project according to java conventions. 2014-01-31 11:24:06 -05:00
Jonathan Leibiusky
3e99749b2e Merge branch 'missedbuffer' of github.com:ibuildthecloud/jedis into ibuildthecloud-missedbuffer 2014-01-28 16:53:53 -05:00
Jonathan Leibiusky
265eab0cc9 Merge branch 'reset-state-of-jedis-client' of github.com:HeartSaVioR/jedis into HeartSaVioR-reset-state-of-jedis-client 2014-01-28 16:50:11 -05:00
Marcos Nils
1844e29569 Fix typo in cluster snippet from README 2014-01-28 11:04:21 -03:00
Jonathan Leibiusky
dca7ab1bbd Merge pull request #516 from HeartSaVioR/fix-timing-issues-with-monitor-test
Fix ControlCommandsTest to don't hang from monitor test because of timing issue
2014-01-27 07:11:08 -08:00
Jungtaek Lim
642cec66d5 Fix ControlCommandsTest to don't hang from monitor test because of timing issue
* In monitor command test, input thread waits for monitor thread to monitor
** Monitor command test sometimes hang when input thread run earlier than monitor thread.
2014-01-27 12:47:21 +09:00
Jonathan Leibiusky
adcb0c0265 Merge pull request #515 from xetorthio/zadd_scoremembers
Change zadd parameter order to allow duplicated scoremembers but not members
2014-01-26 09:19:16 -08:00
Marcos Nils
b05d9adfb0 Change zadd parameter order to allow duplicated scoremembers but not members 2014-01-26 13:53:34 -03:00
Jonathan Leibiusky
51f103af16 Merge pull request #513 from mayank-kakodkar/master
Corrected documentation for Jedis.get(), it returns a Java null, not (nil)
2014-01-23 09:42:17 -08:00
Mayank Kakodkar
5f5b80e6e3 Corrected documentation for Jedis.get(), it returns a Java null, not (nil) 2014-01-23 21:03:46 +05:30
Jonathan Leibiusky
01842e4731 Merge branch 'fix-eval-argument-in-binary-jedis' of github.com:HeartSaVioR/jedis into HeartSaVioR-fix-eval-argument-in-binary-jedis 2014-01-18 11:39:31 -05:00
Marcos Nils
37f629765e Improve performance in MOVED and ASK response parsing 2014-01-17 12:06:20 -03:00
Jonathan Leibiusky
23b54c2cef Fix sentinel test not to be so sensitive to time 2014-01-16 20:37:47 -05:00
Jonathan Leibiusky
424ae75c7d Merge branch 'cluster' of github.com:marcosnils/jedis into marcosnils-cluster 2014-01-16 16:40:48 -05:00
Jonathan Leibiusky
842dcd2a95 Merge branch 'cluster' of github.com:marcosnils/jedis into marcosnils-cluster
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
2014-01-16 16:35:04 -05:00
Marcos Nils
354dd721e0 Update README.md 2014-01-16 19:23:18 -02:00
Marcos Nils
6c8d7a5045 Add fail in case test doesn't throw any exception 2014-01-16 18:14:55 -03:00
Marcos Nils
46733c5d5a Add test for redis cluster max redirections and refactor JedisClusterCommand exception handling 2014-01-16 18:04:27 -03:00
Marcos Nils
2f9564e1d3 Variable refactor in JedisClusterTest 2014-01-14 21:20:33 -03:00
Marcos Nils
ccf93714e6 Fix ClusterCommand tearDown as gossip may take some time to send data to nodes 2014-01-14 17:58:21 -03:00
Marcos Nils
a09a682f09 Remove sysout prints from test 2014-01-14 16:00:22 -03:00
Marcos Nils
4ab8ea2ef7 Move Jedis CRC16 util as it's being used in the project.
Changed Makefile to cleanup redis cluster node configuration before running tests
Add cleanup to ClusterCommandTest.
2014-01-14 15:57:53 -03:00
Marcos Nils
33716e237c Add JedisClusterException file 2014-01-03 16:45:22 -03:00
Marcos Nils
dd0bbdaf91 Several changes have been added to this commit:
- Add asking to cluster commands
- Make jedis cluster return connection to original pool
- Add tests for MOVED and ASK cluster responses
- Refactor connection handler to recalculate connections based on slots

This commit makes the first usable version of Jedis along with Redis Cluster
2014-01-03 16:42:21 -03:00
Marcos Nils
1b26815799 Add functionality to recalculate slots when receiving MOVED response from node.
Add test to check for ASK responses (implementation missing)
2014-01-02 20:52:17 -03:00
Marcos Nils
b2d22e2060 Add slot based connection which routes requests according to key slot 2013-12-28 00:59:35 -03:00
Marcos Nils
9f767a0848 Add automatic discovery of cluster nodes 2013-12-27 23:09:44 -03:00
Jungtaek Lim
53b3e041f3 Fix BinaryJedis.eval() method bug (argument)
* append unit test for BinaryJedis
2013-12-23 14:19:28 +09:00
Marcos Nils
af72248c22 Implement all Jedis cluster commands and rename RedisSlot class 2013-12-20 16:56:29 -03:00
Marcos Nils
0bc27ac3a2 Refactor redis cluster connection handler and add JedisAskDataException handling 2013-12-20 15:28:32 -03: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
Marcos Nils
c008070045 Add JedisClusterCommand and updated code to use it respectively 2013-12-10 10:25:41 -03:00
Marcos Nils
0ebbf02c94 Change Moved cluster test and add confirmation for jedis cluster tests 2013-12-09 15:17:13 -03:00
Marcos Nils
726c3151b6 Add RedisSlot helper to calculate key slot 2013-12-08 01:08:14 -03:00
Marcos Nils
a8987ed865 Add first test to thorw MovedDataException when receiving MOVED from a cluster node 2013-12-07 17:55:17 -03:00
Jonathan Leibiusky
46734e646a add WAIT command 2013-12-05 09:35:13 -05:00
Jonathan Leibiusky
0c00108f96 Merge pull request #490 from xetorthio/speedup_tests
Speedup tests
2013-12-03 16:51:04 -08:00
Jonathan Leibiusky
8624d1695d make JedisSentinelPool fast 2013-12-03 19:47:15 -05:00
Jonathan Leibiusky
3b7127c811 make JedisTest fast 2013-12-03 19:06:53 -05:00
Jonathan Leibiusky
4a4768b1d2 speed up JedisSentinelTest 2013-12-03 19:03:19 -05:00
Jonathan Leibiusky
20d686ec94 make list command tests even faster 2013-12-03 18:43:34 -05:00
Jonathan Leibiusky
ce3497e341 make object command tests fast 2013-12-03 18:28:31 -05:00
Jonathan Leibiusky
e17d24c710 make list command tests fast 2013-12-03 18:20:49 -05:00
Jonathan Leibiusky
ceac8123d6 make control command tests fast 2013-12-03 17:54:35 -05:00
Jonathan Leibiusky
58123034f5 make pubsub test fast 2013-12-03 17:43:15 -05:00
Jonathan Leibiusky
1c8e222655 Merge pull request #489 from xetorthio/scan_commands
add SCAN, HSCAN, SSCAN and ZSCAN
2013-12-03 13:58:41 -08:00
Jonathan Leibiusky
a27c67de66 add SCAN, HSCAN, SSCAN and ZSCAN 2013-12-03 16:55:52 -05:00
Jonathan Leibiusky
efbb710343 Change string size to make test fail faster 2013-12-03 08:31:24 -05:00
Jonathan Leibiusky
fa614bd2b8 Merge branch 'handles-client-output-buffer-limit' of github.com:HeartSaVioR/jedis into HeartSaVioR-handles-client-output-buffer-limit 2013-12-03 07:41:07 -05:00