Commit Graph

915 Commits

Author SHA1 Message Date
Jungtaek Lim
35a1174fb1 Merge branch 'improving_javadoc' of https://github.com/nykolaslima/jedis into nykolaslima-improving_javadoc 2014-10-05 10:18:44 +09:00
Nykolas Lima
d7105914aa adding information about redis versions 2014-10-03 14:23:00 -03:00
Nykolas Lima
a3422bd898 ttl return -1 if key does not have an associated expire but return -2 if key does not exists 2014-10-03 13:57:34 -03:00
Jungtaek Lim
321e5136be Merge branch 'master' of github.com:xetorthio/jedis 2014-10-03 23:51:03 +09:00
Jungtaek Lim
e9cd3b36c1 Modify YourKit logo to black font 2014-10-03 23:49:51 +09:00
Jungtaek Lim
5bed301ae9 Merge pull request #759 from HeartSaVioR/master
Add sponsorship : YourKit
2014-10-03 23:23:22 +09:00
Jungtaek Lim
22bd2acfc7 Add sponsorship : YourKit 2014-10-03 23:21:06 +09:00
Jungtaek Lim
4c6d83554e Merge pull request #748 from xuwei-k/override-hashCode
override HostAndPort#hashCode
2014-09-29 08:22:27 +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
3697e01caa Merge pull request #755 from HeartSaVioR/remove-redundant-synchronize-from-jedis-cluster-info-cache
Remove redundant synchronized from JedisClusterInfoCache
2014-09-29 08:19:25 +09:00
Jungtaek Lim
9e17186121 Merge pull request #754 from HeartSaVioR/fix-reversed-parameters-zrangebylex-with-pipeline
Fix zrangebylex with pipelined (parameters reversed)
2014-09-29 08:16:56 +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
8e5c35307f Merge branch 'Hailei-jedis-cluster-fix-asking' 2014-09-29 07:59:31 +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
9a6d3f35fe Remove redundant synchronized from JedisClusterInfoCache
* JedisClusterInfoCache already uses RWLock so synchonized keyword is not necessary
** it just slow down whole throughput
2014-09-27 20:42:22 +09:00
Jungtaek Lim
2b1cb8fe31 Fix zrangebylex with pipelined (parameters reversed) 2014-09-27 15:41:13 +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
cc3fe85608 Fix invalid file mode 755 -> 644 2014-09-27 13:23:48 +09:00
xuwei-k
653d6c006c override HostAndPort#hashCode 2014-09-26 11:41:11 +09:00
zhanghailei
1578cae9fc ASK Redirection don't update slot->node 2014-09-26 10:06:04 +08:00
Jungtaek Lim
7836531ad7 Version bump for README.md 2014-09-22 15:54:52 +09:00
Jonathan Leibiusky
723fee7e27 Version bump 2014-09-21 16:23:04 -04:00
Jungtaek Lim
6bf917039e Merge pull request #743 from HeartSaVioR/master
Remove unused & buggy method / class (related to ThreadLocal<Random>)
2014-09-19 07:55:34 +09:00
Jungtaek Lim
f8c69b105a Remove unused & buggy method / class (related to ThreadLocal<Random>) 2014-09-19 07:51:53 +09:00
Jungtaek Lim
45fce4368e Merge pull request #741 from HeartSaVioR/optimize-crc16-calculation
Optimize CRC16 calculation (with optimization of slot decision)
2014-09-18 09:54:38 +09:00
Jungtaek Lim
96c762b880 Optimize CRC16 calculation (with optimization of slot decision) 2014-09-18 09:33:10 +09:00
Marcos Nils
167221b81a Merge pull request #737 from xetorthio/improve_test_stability
Improve test stability
2014-09-14 20:50:26 -03: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
Marcos Nils
56d1798943 Merge pull request #735 from HeartSaVioR/use-threadlocal-random-instead-of-creating-random-each-time
Use ThreadLocal<Random> instead of creating Random each time
2014-09-13 13:57:56 -03:00
Jungtaek Lim
e4441ec5b3 use ThreadLocal<Random> instead of creating Random each time
* We can't use ThreadLocalRandom because we need to support JDK6
2014-09-13 10:54:48 +09:00
Marcos Nils
2f18da67f1 Merge pull request #733 from HeartSaVioR/crc16-lookup-table
Use lookup table when calculating CRC16 XMODEM
2014-09-12 10:51:39 -03:00
Jungtaek Lim
10307ecd2e Hide lookup table to prevent broken 2014-09-12 18:00:35 +09: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
8492757f7a Merge branch 'feature_blocklist_parameter' of https://github.com/catinred2/jedis into catinred2-feature_blocklist_parameter
Conflicts:
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/JedisCluster.java
2014-09-11 11:31:29 +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
a3eeea7521 Merge branch 'renew-slots-info-when-moved-has-occurred' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-renew-slots-info-when-moved-has-occurred 2014-09-11 10:09:16 +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