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

663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Leibiusky
3bca5d8460 Merge branch 'unsigned_long_cursor_with_compatibility' of github.com:HeartSaVioR/jedis into HeartSaVioR-unsigned_long_cursor_with_compatibility 2014-02-11 11:29:18 -05:00
Jonathan Leibiusky
d8ec0f8a5c version bump 2014-02-11 11:21:18 -05:00
Jonathan Leibiusky
08ed0006e8 Merge pull request #539 from xetorthio/cluster_bugfix 
Fix test to make jedis work with latest git master version of redis
 2014-02-11 10:25:55 -05:00
Marcos Nils
e59e4a0d2a Fix test to make jedis work with latest git master version of redis 2014-02-11 02:51:58 -03:00
Jonathan Leibiusky
dbae544602 Merge pull request #528 from jideji/eval-with-nested-lists-and-longs 
Eval with nested lists and longs
 2014-02-10 15:36:05 -05:00
Jungtaek Lim
ed81f37d1b Introduce *scan with "string" cursor parameter to support unsigned long 
cursor

* overload all *scan method to change "int" cursor to "string" cursor
* set @Deprecated and leave reason to deprecate and when to remove to
current *scan method
* modify unit tests to make it work with new *scan method
 2014-02-10 07:08:39 +09:00
Daniel Josefsson
f81f75177c Simplified unit test for compatibility with JDK6. 2014-02-08 10:10:45 +00:00
Daniel Josefsson
40c8a93340 Merge branch 'master' into eval-with-nested-lists-and-longs 
Conflicts:
	src/main/java/redis/clients/jedis/Jedis.java
	src/test/java/redis/clients/jedis/tests/commands/ScriptingCommandsTest.java
 2014-02-05 22:24:23 +00:00
Jonathan Leibiusky
51a4bf9a56 [maven-release-plugin] prepare for next development iteration 2014-02-05 10:51:37 -05:00
Jonathan Leibiusky
f7f689efaf [maven-release-plugin] prepare release jedis-2.3.1 2014-02-05 10:51:36 -05:00
Jonathan Leibiusky
75bc754227 Update README to indicate that redis 2.8.5 is supported 2014-02-05 10:48:40 -05:00
Jonathan Leibiusky
28e7d2af10 Revert "Update README on supported redis version" 
This reverts commit b35e1f9482.
 2014-02-05 10:47:11 -05:00
Jonathan Leibiusky
179498d4a3 Merge pull request #527 from xetorthio/node_parsing 
Fix #526. Node parsing error uppon :0
 2014-02-05 10:38:21 -05:00
Jonathan Leibiusky
b35e1f9482 Update README on supported redis version 2014-02-05 10:34:17 -05:00
Marcos Nils
a69dd4e242 Add exception handling in caso of unexecpected errors 2014-02-05 00:06:29 -03:00
Marcos Nils
d846149ae1 Fix #526. Node parsing error uppon :0 2014-02-04 22:34:48 -03:00
Jonathan Leibiusky
2d04a3845b [maven-release-plugin] prepare for next development iteration 2014-02-03 11:09:50 -05:00
Jonathan Leibiusky
aa63c98d8e [maven-release-plugin] prepare release jedis-2.3.0 2014-02-03 11:09:48 -05:00
Marcos Nils
35291bf17d Make makefile remove temp files as it makes tests to fail sometimes 2014-02-03 13:01:20 -03:00
Jonathan Leibiusky
56cec8f6ec version bump to 2.3.0-snapshot 2014-02-03 10:50:59 -05:00
Jonathan Leibiusky
bfecfcb744 Merge pull request #523 from xetorthio/pubsub 
Add pubsub commands
 2014-02-03 07:47:49 -08: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
Marcos Nils
4ab54d955d Change pubSub to pubsub 2014-02-03 12:44:40 -03:00
Marcos Nils
4b53160a74 Remove unnecessary Builder and fix merge issue. Fixes #520 2014-02-01 20:52:41 -03:00
Marcos Nils
bd19193cb6 Merged with master 2014-02-01 20:41:14 -03:00
Marcos Nils
319a241de0 Remove unnecessary imports 2014-02-01 20:15:52 -03:00
Marcos Nils
8bec9fd373 Implement missing pubsub commands and fix indentation 2014-02-01 20:14:18 -03:00
Jonathan Leibiusky
8fef62e21d Merge branch 'pubsub-concurrency' of github.com:ibuildthecloud/jedis into ibuildthecloud-pubsub-concurrency 
Conflicts:
	src/main/java/redis/clients/jedis/Connection.java
	src/main/java/redis/clients/jedis/JedisPubSub.java
 2014-01-31 13:28:29 -05:00
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
Darren Shepherd
f11c1622de Allow safe multi-threaded access to JedisPubSub 
If Thread A calls a subscribe method on Jedis it will block on a socket read
call waiting for messages or subscription notifications.  Thread B is now free
to call additional methods on JedisPubSub to change the current subscriptions
that thread A is waiting for.  Essentially Thread A will do reads on the
socket and Thread B will do writes.

An issue occurs in that while Thread A is doing reads, in the
getObjectMultiBulkReply() method there is an implicit flush() call.  This
means both Thread A and Thread B may do a write to the socket.  Under this
situation if Thread A does a flush while Thread B is writing the internal
buffer will be corrupted.  The fix is to make thread A never call flush().
This allows Thread A to be solely reads and Thread B to be solely writes.

Additionally since Thread B is sending commands, the internal pipeline count
is incremented and never decremented.  So when Thread A terminates it's read
it resets the pipeline count.
 2014-01-16 23:48:08 -07: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