Commit Graph

720 Commits

Author SHA1 Message Date
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
5d0f75a32f Merge branch 'master' of github.com:rdifalco/jedis into rdifalco-master
Conflicts:
	src/main/java/redis/clients/jedis/BinaryJedis.java
2014-11-13 13:20:59 +09:00
Marcos Lilljedahl
f9fb8843df Fixes #786 2014-11-12 11:17:43 -03: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
a170b9f0d2 Merge branch 'master' of github.com:xetorthio/jedis 2014-11-11 07:56:51 +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
Marcos Lilljedahl
161e509178 Fix disconnect socket closing to make it work with java 8 2014-11-06 22:45:04 -03: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
Philo Yang
6afabaca1d fix redirection's bug 2014-10-21 14:30:27 +08:00
rdifalco
076df8c92d Expanded deprecated comment, fixed a misspelling of DECRBY. 2014-10-19 13:22:17 -07:00
rdifalco
8f4dbaf89f Fixed infinite timeout handling. Increased code reuse so that there will be fewer copy and paste errors. 2014-10-18 12:22:07 -07:00
Jungtaek Lim
7f45a2ca24 Apply "Format" to all files, Closes #765 2014-10-09 21:08:05 +09:00
Jungtaek Lim
4db138921e Unify style 2014-10-09 09:06:43 +09:00
Jungtaek Lim
5575f08076 only Connection should take care of default host, port 2014-10-09 08:51:42 +09:00
Jungtaek Lim
b2fcbed66f Merge branch 'making_jedis_pool_cdi_compatible' of https://github.com/nykolaslima/jedis into nykolaslima-making_jedis_pool_cdi_compatible 2014-10-09 08:35:06 +09:00
Nykolas Lima
f7789213df using super instead of this to keep the code style 2014-10-08 17:37:29 -03:00
Jungtaek Lim
a8891cb00c Add unit tests to check pipeline sync without any commands 2014-10-05 14:36:14 +09:00
Jungtaek Lim
70809ee142 Merge branch 'master' of https://github.com/nilskp/jedis into fixes-758 2014-10-05 14:24:37 +09:00
Jungtaek Lim
7845dc350a Merge branch 'fast-fail-while-initializing-jedis-sentinel-pool' 2014-10-05 11:01:09 +09:00
Jungtaek Lim
9c296000a2 Remove unnecessary if state 2014-10-05 10:52:05 +09:00
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
nilskp
745f1b1e4e Updated fix to xetorthio/jedis#758 2014-10-04 11:22:45 -05:00
nilskp
6ea1959cc5 Fixes xetorthio/jedis#758 2014-10-03 15:36:09 -05: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
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
Nykolas Lima
833065b670 changing default constructor to use default host and port (localhost) 2014-09-27 13:37:42 -03: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
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
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
Nykolas Lima
f065b80ab0 we can't pass null because it will throw an exception. Using localhost instead 2014-09-19 17:09:27 -03:00
Nykolas Lima
a3f7e888da making Jedis compatible with CDI 2014-09-19 16:54:49 -03: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
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