Commit Graph

441 Commits

Author SHA1 Message Date
3817f4c7ed Replace tabs with spaces 2015-09-01 13:13:24 +01:00
Tobias Ara Svensson
3257827f01 Fixes #791 Exceptions in close cause empty JedisPool and then deadlock 2014-11-24 12:23:42 +01:00
rdifalco
59a13121ab Addresses issues #779 and #775.
Conflicts:
	src/main/java/redis/clients/jedis/Protocol.java
2014-11-14 09:49:46 +09:00
Jungtaek Lim
57d2e2ea05 Merge branch 'jedis-pubsub-adaptor' of github.com:HeartSaVioR/jedis into HeartSaVioR-jedis-pubsub-adaptor 2014-11-11 08:00:32 +09:00
Jungtaek Lim
1873d55c2c Merge branch 'fixes-758' of github.com:HeartSaVioR/jedis into HeartSaVioR-fixes-758 2014-11-11 07:31:38 +09:00
Jungtaek Lim
8a33ab6e9a Remove Adaptor and update their own class (PubSub) 2014-11-07 23:11:43 +09:00
Jungtaek Lim
4ecca016a5 Introduce (Binary)JedisPubSubAdaptor
* Actually it's in JedisSentinelPool but not exposed to users
2014-11-04 22:42:17 +09:00
Jungtaek Lim
f7995a7771 Merge branch 'remove_deprecated_transactionblock_and_pipelineblock' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-remove_deprecated_transactionblock_and_pipelineblock
Conflicts:
	src/main/java/redis/clients/jedis/BinaryJedis.java
	src/main/java/redis/clients/jedis/PipelineBlock.java
	src/main/java/redis/clients/jedis/TransactionBlock.java
2014-10-23 09:36:07 +09:00
Jungtaek Lim
7f45a2ca24 Apply "Format" to all files, Closes #765 2014-10-09 21:08:05 +09:00
Jungtaek Lim
a8891cb00c Add unit tests to check pipeline sync without any commands 2014-10-05 14:36:14 +09:00
Jungtaek Lim
7845dc350a Merge branch 'fast-fail-while-initializing-jedis-sentinel-pool' 2014-10-05 11:01:09 +09:00
Jungtaek Lim
67a1d390e7 Merge pull request #756 from HeartSaVioR/fix-crc16-encode-string-to-bytes
Fix CRC16 encode : string to bytes
2014-09-29 08:21:10 +09:00
Jungtaek Lim
2a36bf8cc3 Merge pull request #753 from HeartSaVioR/support-zrevrangebylex
Support zrevrangebylex command (closes #746)
2014-09-29 08:07:46 +09:00
Jungtaek Lim
69ca4040da Merge branch 'fix-invalid-file-mode' 2014-09-29 08:02:43 +09:00
Jungtaek Lim
a405ce205c Fix CRC16 encode : string to bytes
* should use SafeEncoder.encode() instead of String.getBytes()
2014-09-27 21:46:20 +09:00
Jungtaek Lim
61f8ff6918 Support zrevrangebylex command
* binary, string, pipeline (binary, string), sharded(binary, string), cluster (string)
2014-09-27 15:27:28 +09:00
Jungtaek Lim
c5336310bd Fail fast while initializing JedisSentinelPool
* wrong master name is specified
* all sentinel is down or not reached
2014-09-27 14:09:13 +09:00
Jungtaek Lim
cc3fe85608 Fix invalid file mode 755 -> 644 2014-09-27 13:23:48 +09:00
zhanghailei
1578cae9fc ASK Redirection don't update slot->node 2014-09-26 10:06:04 +08:00
Jungtaek Lim
f8c69b105a Remove unused & buggy method / class (related to ThreadLocal<Random>) 2014-09-19 07:51:53 +09:00
Jungtaek Lim
96c762b880 Optimize CRC16 calculation (with optimization of slot decision) 2014-09-18 09:33:10 +09:00
Marcos Nils
ce2ab6a937 Fixes #732. Tests are much more reliable now and we removed unnecessary redis cluster integration tests which randomly failed due to the nature of redis cluster 2014-09-14 20:37:48 -03:00
Marcos Nils
687716902d Add support for cluster reset command. Some tests were refactored per the inclusion of the new command 2014-09-14 15:43:18 -03:00
Jungtaek Lim
ad10f91b60 Use lookup table when calculating CRC16 XMODEM
* I borrowed it from b921931480
2014-09-12 17:50:43 +09:00
Mayank Dang
37a3c7b835 Merging with upstream, necessary changes, shifting poolConfig as private instance variable from JedisClusterConnectionHandler to JedisClusterInfoCache due to design change in previous commits. 2014-09-11 16:16:08 +05:30
Jungtaek Lim
fc594db9a3 Merge branch 'sentinel_config_err_handling' of https://github.com/wizwjw/jedis into wizwjw-sentinel_config_err_handling
Conflicts:
	src/main/java/redis/clients/jedis/JedisSentinelPool.java
	src/test/java/redis/clients/jedis/tests/JedisSentinelPoolTest.java
2014-09-11 13:10:01 +09:00
Jungtaek Lim
53c9344898 Merge pull request #722 from vermahim/master
pipelined transaction response fix
2014-09-11 11:37:35 +09:00
Jungtaek Lim
992ae7aadd Merge branch 'make-it-better-to-use-URI' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-make-it-better-to-use-URI 2014-09-11 11:21:17 +09:00
Jungtaek Lim
4224eabd39 Merge branch 'support-sorted-set-with-lex' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-support-sorted-set-with-lex 2014-09-11 11:08:45 +09:00
Jungtaek Lim
bb9bc1cbe1 Merge branch 'pool-closeable-support' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-pool-closeable-support 2014-09-11 11:00:39 +09:00
Jungtaek Lim
a4f975db81 Merge branch 'master' of https://github.com/nrodrigues/jedis into nrodrigues-master 2014-09-11 10:52:29 +09:00
Jungtaek Lim
3d7b412a57 Merge branch 'support-sorted-set-with-lex' of github.com:HeartSaVioR/jedis into support-sorted-set-with-lex 2014-09-10 21:44:07 +09:00
Jungtaek Lim
8a5eb60512 Merge branch 'master' into support-sorted-set-with-lex
Conflicts:
	src/main/java/redis/clients/jedis/BinaryShardedJedis.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/Protocol.java
	src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java
2014-09-10 21:43:32 +09:00
Jungtaek Lim
f931a4fc81 Replace Closer class to use its close() method 2014-09-10 21:15:02 +09:00
Jungtaek Lim
bfcecd73cb JedisURIHelper.getDBIndex() now returns 0 when db index is not provided 2014-09-10 20:46:57 +09:00
Ethan Urie
36810dfcba Closes #656. Added 2 more asserts to ensure the count decrements correctly. 2014-09-03 14:15:48 -04:00
Ethan Urie
a201e29d88 Closes #656. Add a getNumActive() method to JedisPool to provide access to the current state of the internal pool. 2014-09-02 14:54:36 -04:00
Himanshu Verma
b219345761 pipelined transaction response fix 2014-08-31 16:06:33 +05:30
Jungtaek Lim
582d00b5ca Merge branch 'double-weights' of https://github.com/markus-s24/jedis into markus-s24-double-weights 2014-08-30 21:03:37 +09:00
Jungtaek Lim
f6aced860a Merge branch 'master' of https://github.com/markus-s24/jedis into markus-s24-master 2014-08-29 14:19:41 +09:00
Jungtaek Lim
0a094ff0b4 Implements #701, add close() to JedisCluster 2014-08-28 23:49:52 +09:00
Markus Heiden
2eda9cd8fb Removed deprecated int based weights 2014-08-27 21:41:22 +02:00
Markus Heiden
ad5412d8cf Restored old method for int weights for backwards compatibility 2014-08-27 21:12:28 +02:00
Ivan Dyedov
9f4faf53ff fix binary version of hgetAll(), fixes #711 2014-08-26 11:50:56 -04:00
Markus Heiden
ae73a99a17 Adopted test to use decimal weight values 2014-08-23 19:39:19 +02:00
Jungtaek Lim
68a56938c1 Merge branch 'pipeline_getrange_fix' of https://github.com/UglyTroLL/jedis into UglyTroLL-pipeline_getrange_fix 2014-08-12 10:16:31 +09:00
Jungtaek Lim
5bf4a697fb Merge branch 'unsigned_long_cursor_remove_deprecated' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-unsigned_long_cursor_remove_deprecated
Conflicts:
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/JedisCluster.java
	src/main/java/redis/clients/jedis/ScanResult.java
	src/main/java/redis/clients/jedis/ShardedJedis.java
2014-08-12 10:07:26 +09:00
Jungtaek Lim
26d1f4ad90 Merge branch 'support-cluster-slots' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-support-cluster-slots 2014-08-12 09:48:53 +09:00
Nelson Rodrigues
dddc0d15f1 Add second jedis connection to waitForNewPromotedMaster call 2014-07-28 11:58:09 -07:00
Nelson Rodrigues
c02c663776 Add check that JedisSentinelPool accepts closing connections before and after failover 2014-07-28 11:34:00 -07:00