From 74b9b6221086478a7aceba2bcd0290c70721dd39 Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Wed, 26 Apr 2017 21:19:41 +0300 Subject: [PATCH 1/8] Update CHANGELOG.md --- CHANGELOG.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index caf082d79..07c8bceb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,31 @@ Try __ULTRA-FAST__ [Redisson PRO](https://redisson.pro) edition. ## Please take part in [Redisson survey](https://www.surveymonkey.com/r/QXQZH5D) +### 26-Apr-2017 - versions 2.9.0 and 3.4.0 released + +Feature - __`MapReduceService` added__ More details [here](https://github.com/redisson/redisson/wiki/9.-distributed-services/#95-distributed-mapreduce-service) +Feature - `readAllMap` and `readAllMapAsync` methods added to `RMap` +Feature - `readAllKeySet` and `getReadWriteLock` methods added to `RMultimap` +Feature - `RKeys.delete` by objects method added +Feature - `RRemoteService.deregister` method added +Feature - `retryAttempts`, `retryInterval` and `timeout` methods added to `RBatch` object +Feature - `RMapCache.fastPutIfAbsent` with ttl added (thanks to Dobi) +Feature - `EvictionPolicy.WEAK` added for `RLocalCachedMap` +Feature - `LocalCachedMapOptions.invalidationPolicy` introduced for `RLocalCachedMap` +Feature - `expire`, `expireAt`, `move`, `migrate`, `clearExpire`, `renamenx`, `rename`, `remainTimeToLive` methods added to RKey +Improvement - `EvictionPolicy.LRU` optimization for `RLocalCachedMap` +Fixed - `RTopic.onSubscribe` should be invoked after failover process +Fixed - Spring boot with redisson 3.3.2 fails without optional actuator dependency (thanks to Rick Perkowski) +Fixed - `RedissonCacheMap.putIfAbsentAsync` doesn't take in account ttl and minIdleTime params (thanks to Dobi) +Fixed - Spring cache should put NullValue object instead of null +Fixed - Fixed error - No field factory in class Ljava/net/URL +Fixed - Spring cache's method with `@Cacheable(sync=true)` annotation never expires (thanks to Dobi) +Fixed - spring schema file corrected (thanks to Rui Gu) +Fixed - Prevent to set URL.factory to null in case of concurrent URL creation in the URLBuilder (thanks to Björn-Ole Ebers) +Fixed - `RMap.addAndGet` causes bad argument (thanks to Rui Gu) +Fixed - `RedissonSpringCacheManager` creates new cache on each `getCache` call +Fixed - wrong value codec encoder usage for `RedissonLocalCachedMap.fastPutAsync` method + ### 21-Mar-2017 - versions 2.8.2 and 3.3.2 released Feature - Redisson's Spring custom namespace support (thanks to Rui Gu) From d84f3f5aded8e5c9dd5bf0dc31d0978b74ed4e5a Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Wed, 26 Apr 2017 21:21:38 +0300 Subject: [PATCH 2/8] Update README.md --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index eb5f8909a..f5d5f3f03 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ Redisson: Redis based In-Memory Data Grid for Java. ==== -[Quick start](https://github.com/redisson/redisson#quick-start) | [Documentation](https://github.com/redisson/redisson/wiki) | [Javadocs](http://www.javadoc.io/doc/org.redisson/redisson/3.3.2) | [Changelog](https://github.com/redisson/redisson/blob/master/CHANGELOG.md) | [Code examples](https://github.com/redisson/redisson-examples) | [Support chat](https://gitter.im/mrniko/redisson) | [Ultra-fast version](https://redisson.pro) +[Quick start](https://github.com/redisson/redisson#quick-start) | [Documentation](https://github.com/redisson/redisson/wiki) | [Javadocs](http://www.javadoc.io/doc/org.redisson/redisson/3.4.0) | [Changelog](https://github.com/redisson/redisson/blob/master/CHANGELOG.md) | [Code examples](https://github.com/redisson/redisson-examples) | [Support chat](https://gitter.im/mrniko/redisson) | [Ultra-fast version](https://redisson.pro) Based on high-performance async and lock-free Java Redis client and [Netty](http://netty.io) framework. ## Please take part in [Redisson survey](https://www.surveymonkey.com/r/QXQZH5D) | Stable Release Version | JDK Version compatibility | Release Date | | ------------- | ------------- | ------------| -| 3.3.2 | 1.8+ | 21.03.2017 | -| 2.8.2 | 1.6, 1.7, 1.8 and Android | 21.03.2017 | +| 3.4.0 | 1.8+ | 26.04.2017 | +| 2.9.0 | 1.6, 1.7, 1.8 and Android | 26.04.2017 | __NOTE__: Both version lines have same features except `CompletionStage` interface added in 3.x.x @@ -47,7 +47,7 @@ Features * [Reactive Streams](https://github.com/redisson/redisson/wiki/3.-operations-execution#32-reactive-way) * [Redis pipelining](https://github.com/redisson/redisson/wiki/10.-additional-features#102-execution-batches-of-commands) (command batches) * Supports Android platform -* Supports auto-reconnect +* Supports auto-reconnection * Supports failed to send command auto-retry * Supports OSGi * Supports many popular codecs ([Jackson JSON](https://github.com/FasterXML/jackson), [Avro](http://avro.apache.org/), [Smile](http://wiki.fasterxml.com/SmileFormatSpec), [CBOR](http://cbor.io/), [MsgPack](http://msgpack.org/), [Kryo](https://github.com/EsotericSoftware/kryo), [FST](https://github.com/RuedigerMoeller/fast-serialization), [LZ4](https://github.com/jpountz/lz4-java), [Snappy](https://github.com/xerial/snappy-java) and JDK Serialization) @@ -82,23 +82,23 @@ Quick start org.redisson redisson - 3.3.2 + 3.4.0 org.redisson redisson - 2.8.2 + 2.9.0 #### Gradle // JDK 1.8+ compatible - compile 'org.redisson:redisson:3.3.2' + compile 'org.redisson:redisson:3.4.0' // JDK 1.6+ compatible - compile 'org.redisson:redisson:2.8.2' + compile 'org.redisson:redisson:2.9.0' #### Java @@ -123,11 +123,11 @@ RExecutorService executor = redisson.getExecutorService("myExecutorService"); Downloads =============================== -[Redisson 3.3.2](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson&v=3.3.2&e=jar), -[Redisson node 3.3.2](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson-all&v=3.3.2&e=jar) +[Redisson 3.4.0](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson&v=3.4.0&e=jar), +[Redisson node 3.4.0](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson-all&v=3.4.0&e=jar) -[Redisson 2.8.2](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson&v=2.8.2&e=jar), -[Redisson node 2.8.2](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson-all&v=2.8.2&e=jar) +[Redisson 2.9.0](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson&v=2.9.0&e=jar), +[Redisson node 2.9.0](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson-all&v=2.9.0&e=jar) ### Supported by From 5a4e268f9df5e98fa0d9730b572a33d9f5a355f8 Mon Sep 17 00:00:00 2001 From: Rui Gu Date: Thu, 27 Apr 2017 00:50:59 +0100 Subject: [PATCH 3/8] added map reduce service to service section --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f5d5f3f03..af443b9de 100644 --- a/README.md +++ b/README.md @@ -38,9 +38,9 @@ Features * [Distributed locks and synchronizers](https://github.com/redisson/redisson/wiki/8.-Distributed-locks-and-synchronizers) Lock, FairLock, MultiLock, RedLock, ReadWriteLock, Semaphore, PermitExpirableSemaphore, CountDownLatch * [Distributed services](https://github.com/redisson/redisson/wiki/9.-distributed-services) - Remote service, Live Object service, Executor service, Scheduler service -* [Spring Cache](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#141-spring-cache) implementation -* [Hibernate Cache](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#142-hibernate-cache) implementation +    Remote service, Live Object service, Executor service, Scheduler service, MapReduce service +* [Spring Cache](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#141-spring-cache) implementation   +* [Hibernate Cache](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#142-hibernate-cache) implementation * [JCache API (JSR-107)](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#143-jcache-api-jsr-107-implementation) implementation * [Tomcat Session Manager](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks#144-tomcat-redis-session-manager) implementation * [Spring Session](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#145-spring-session) implementation From 205955f9a481ea43e1b9a4bb0232e4a26095cfc0 Mon Sep 17 00:00:00 2001 From: Rui Gu Date: Thu, 27 Apr 2017 00:52:32 +0100 Subject: [PATCH 4/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index af443b9de..18152d3bf 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ Features * [Distributed locks and synchronizers](https://github.com/redisson/redisson/wiki/8.-Distributed-locks-and-synchronizers) Lock, FairLock, MultiLock, RedLock, ReadWriteLock, Semaphore, PermitExpirableSemaphore, CountDownLatch * [Distributed services](https://github.com/redisson/redisson/wiki/9.-distributed-services) -    Remote service, Live Object service, Executor service, Scheduler service, MapReduce service + Remote service, Live Object service, Executor service, Scheduler service, MapReduce service * [Spring Cache](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#141-spring-cache) implementation   * [Hibernate Cache](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#142-hibernate-cache) implementation * [JCache API (JSR-107)](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#143-jcache-api-jsr-107-implementation) implementation From e7034f81aed8995e1b00dd26d4f2906400a4ee29 Mon Sep 17 00:00:00 2001 From: Steve Draper Date: Thu, 27 Apr 2017 08:55:10 -0500 Subject: [PATCH 5/8] Fixed local cache resolution of getAllAsync --- .../src/main/java/org/redisson/RedissonLocalCachedMap.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/redisson/src/main/java/org/redisson/RedissonLocalCachedMap.java b/redisson/src/main/java/org/redisson/RedissonLocalCachedMap.java index 0c332b689..d81febe2e 100644 --- a/redisson/src/main/java/org/redisson/RedissonLocalCachedMap.java +++ b/redisson/src/main/java/org/redisson/RedissonLocalCachedMap.java @@ -853,7 +853,8 @@ public class RedissonLocalCachedMap extends RedissonMap implements R Set mapKeys = new HashSet(keys); for (Iterator iterator = mapKeys.iterator(); iterator.hasNext();) { K key = iterator.next(); - CacheValue value = cache.get(key); + final CacheKey cacheKey = toCacheKey(key); + CacheValue value = cache.get(cacheKey); if (value != null) { result.put(key, (V)value.getValue()); iterator.remove(); From 5e34084161e3a0dc9599dbe04e49de02af58b6d8 Mon Sep 17 00:00:00 2001 From: Nikita Date: Thu, 27 Apr 2017 16:57:01 +0300 Subject: [PATCH 6/8] Fixed - reference to avro module has been removed. #865 --- redisson/src/main/java/org/redisson/codec/DefenceModule.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/redisson/src/main/java/org/redisson/codec/DefenceModule.java b/redisson/src/main/java/org/redisson/codec/DefenceModule.java index 377751b24..c24e624be 100644 --- a/redisson/src/main/java/org/redisson/codec/DefenceModule.java +++ b/redisson/src/main/java/org/redisson/codec/DefenceModule.java @@ -24,7 +24,6 @@ import com.fasterxml.jackson.databind.DeserializationConfig; import com.fasterxml.jackson.databind.deser.ValueInstantiator; import com.fasterxml.jackson.databind.deser.ValueInstantiators.Base; import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.dataformat.avro.PackageVersion; /** * Fix for https://github.com/FasterXML/jackson-databind/issues/1599 @@ -68,10 +67,6 @@ public class DefenceModule extends SimpleModule { } - public DefenceModule() { - super(PackageVersion.VERSION); - } - @Override public void setupModule(SetupContext context) { context.addValueInstantiators(new DefenceValueInstantiator()); From 61f070af4e7587e71e74184e950eca4c0a5ec581 Mon Sep 17 00:00:00 2001 From: Nikita Date: Thu, 27 Apr 2017 17:25:11 +0300 Subject: [PATCH 7/8] [maven-release-plugin] prepare release redisson-2.9.1 --- pom.xml | 4 ++-- redisson-all/pom.xml | 4 ++-- redisson-tomcat/pom.xml | 2 +- redisson-tomcat/redisson-tomcat-6/pom.xml | 2 +- redisson-tomcat/redisson-tomcat-7/pom.xml | 2 +- redisson-tomcat/redisson-tomcat-8/pom.xml | 2 +- redisson/pom.xml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index dc1a31cb8..feb386279 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.redisson redisson-parent - 2.9.1-SNAPSHOT + 2.9.1 pom Redisson @@ -27,7 +27,7 @@ scm:git:git@github.com:redisson/redisson.git scm:git:git@github.com:redisson/redisson.git scm:git:git@github.com:redisson/redisson.git - HEAD + redisson-2.9.1 diff --git a/redisson-all/pom.xml b/redisson-all/pom.xml index 4fa84aaaa..0bb68c47f 100644 --- a/redisson-all/pom.xml +++ b/redisson-all/pom.xml @@ -4,7 +4,7 @@ org.redisson redisson-parent - 2.9.1-SNAPSHOT + 2.9.1 ../ @@ -26,7 +26,7 @@ scm:git:git@github.com:mrniko/redisson.git scm:git:git@github.com:mrniko/redisson.git scm:git:git@github.com:mrniko/redisson.git - redisson-parent-0.9.0 + redisson-2.9.1 diff --git a/redisson-tomcat/pom.xml b/redisson-tomcat/pom.xml index 3e86006d5..00da8e954 100644 --- a/redisson-tomcat/pom.xml +++ b/redisson-tomcat/pom.xml @@ -4,7 +4,7 @@ org.redisson redisson-parent - 2.9.1-SNAPSHOT + 2.9.1 ../ diff --git a/redisson-tomcat/redisson-tomcat-6/pom.xml b/redisson-tomcat/redisson-tomcat-6/pom.xml index 57ad5c99d..104ee8ec4 100644 --- a/redisson-tomcat/redisson-tomcat-6/pom.xml +++ b/redisson-tomcat/redisson-tomcat-6/pom.xml @@ -4,7 +4,7 @@ org.redisson redisson-tomcat - 2.9.1-SNAPSHOT + 2.9.1 ../ diff --git a/redisson-tomcat/redisson-tomcat-7/pom.xml b/redisson-tomcat/redisson-tomcat-7/pom.xml index cfbbe1b89..9d85e0be3 100644 --- a/redisson-tomcat/redisson-tomcat-7/pom.xml +++ b/redisson-tomcat/redisson-tomcat-7/pom.xml @@ -4,7 +4,7 @@ org.redisson redisson-tomcat - 2.9.1-SNAPSHOT + 2.9.1 ../ diff --git a/redisson-tomcat/redisson-tomcat-8/pom.xml b/redisson-tomcat/redisson-tomcat-8/pom.xml index 68da67d25..326897e41 100644 --- a/redisson-tomcat/redisson-tomcat-8/pom.xml +++ b/redisson-tomcat/redisson-tomcat-8/pom.xml @@ -4,7 +4,7 @@ org.redisson redisson-tomcat - 2.9.1-SNAPSHOT + 2.9.1 ../ diff --git a/redisson/pom.xml b/redisson/pom.xml index acb4a3797..7d5adb9ab 100644 --- a/redisson/pom.xml +++ b/redisson/pom.xml @@ -4,7 +4,7 @@ org.redisson redisson-parent - 2.9.1-SNAPSHOT + 2.9.1 ../ From a704017ace43dd2ff09e6a7b55b7a67541c3ec62 Mon Sep 17 00:00:00 2001 From: Nikita Date: Thu, 27 Apr 2017 17:25:19 +0300 Subject: [PATCH 8/8] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- redisson-all/pom.xml | 4 ++-- redisson-tomcat/pom.xml | 2 +- redisson-tomcat/redisson-tomcat-6/pom.xml | 2 +- redisson-tomcat/redisson-tomcat-7/pom.xml | 2 +- redisson-tomcat/redisson-tomcat-8/pom.xml | 2 +- redisson/pom.xml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index feb386279..8f80aad73 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.redisson redisson-parent - 2.9.1 + 2.9.2-SNAPSHOT pom Redisson @@ -27,7 +27,7 @@ scm:git:git@github.com:redisson/redisson.git scm:git:git@github.com:redisson/redisson.git scm:git:git@github.com:redisson/redisson.git - redisson-2.9.1 + HEAD diff --git a/redisson-all/pom.xml b/redisson-all/pom.xml index 0bb68c47f..fd97ba4cd 100644 --- a/redisson-all/pom.xml +++ b/redisson-all/pom.xml @@ -4,7 +4,7 @@ org.redisson redisson-parent - 2.9.1 + 2.9.2-SNAPSHOT ../ @@ -26,7 +26,7 @@ scm:git:git@github.com:mrniko/redisson.git scm:git:git@github.com:mrniko/redisson.git scm:git:git@github.com:mrniko/redisson.git - redisson-2.9.1 + redisson-parent-0.9.0 diff --git a/redisson-tomcat/pom.xml b/redisson-tomcat/pom.xml index 00da8e954..77867c582 100644 --- a/redisson-tomcat/pom.xml +++ b/redisson-tomcat/pom.xml @@ -4,7 +4,7 @@ org.redisson redisson-parent - 2.9.1 + 2.9.2-SNAPSHOT ../ diff --git a/redisson-tomcat/redisson-tomcat-6/pom.xml b/redisson-tomcat/redisson-tomcat-6/pom.xml index 104ee8ec4..e68031e52 100644 --- a/redisson-tomcat/redisson-tomcat-6/pom.xml +++ b/redisson-tomcat/redisson-tomcat-6/pom.xml @@ -4,7 +4,7 @@ org.redisson redisson-tomcat - 2.9.1 + 2.9.2-SNAPSHOT ../ diff --git a/redisson-tomcat/redisson-tomcat-7/pom.xml b/redisson-tomcat/redisson-tomcat-7/pom.xml index 9d85e0be3..12f8db34a 100644 --- a/redisson-tomcat/redisson-tomcat-7/pom.xml +++ b/redisson-tomcat/redisson-tomcat-7/pom.xml @@ -4,7 +4,7 @@ org.redisson redisson-tomcat - 2.9.1 + 2.9.2-SNAPSHOT ../ diff --git a/redisson-tomcat/redisson-tomcat-8/pom.xml b/redisson-tomcat/redisson-tomcat-8/pom.xml index 326897e41..f8457da22 100644 --- a/redisson-tomcat/redisson-tomcat-8/pom.xml +++ b/redisson-tomcat/redisson-tomcat-8/pom.xml @@ -4,7 +4,7 @@ org.redisson redisson-tomcat - 2.9.1 + 2.9.2-SNAPSHOT ../ diff --git a/redisson/pom.xml b/redisson/pom.xml index 7d5adb9ab..9e96bcc9b 100644 --- a/redisson/pom.xml +++ b/redisson/pom.xml @@ -4,7 +4,7 @@ org.redisson redisson-parent - 2.9.1 + 2.9.2-SNAPSHOT ../