Merge remote-tracking branch 'origin/develop-pipeline'

# Conflicts: # README.md # README_zh.md
codebaorg · Sep 17, 2024 · aa6ea5c · aa6ea5c
2 parents f292937 + ed4b53e
commit aa6ea5c
Show file tree

Hide file tree

Showing 88 changed files with 9,687 additions and 10,736 deletions.
diff --git a/README.md b/README.md
@@ -7,9 +7,9 @@
 
 **Supported JDK: 1.8 ... 21**
 
-**Supported Redisson: 3.15.5 ... 3.33.0**
+**Supported Redisson: 3.15.5 ... 3.35.0**
 
-**Supported Redis: 3.0 ... 7.4**
+**Supported Redis: 3.0 ... 7.2**
 
 ## Features
 
@@ -25,24 +25,26 @@
     <dependency>
        <groupId>org.codeba</groupId>
        <artifactId>redis-keeper-core</artifactId>
-       <version>2024.1.0</version>
+       <version>2024.2.0</version>
     </dependency> 
 
     <dependency>
        <groupId>org.codeba</groupId>
        <artifactId>redis-keeper-support</artifactId>
-       <version>2024.1.0</version>
+       <version>2024.2.0</version>
     </dependency> 
 
 #### Gradle
-    implementation group: 'org.codeba', name: 'redis-keeper-core', version: '2024.1.0'
 
-    implementation group: 'org.codeba', name: 'redis-keeper-support', version: '2024.1.0'
+    implementation group: 'org.codeba', name: 'redis-keeper-core', version: '2024.2.0'
+
+    implementation group: 'org.codeba', name: 'redis-keeper-support', version: '2024.2.0'
 
 #### Sbt
-    libraryDependencies += "org.codeba" % "redis-keeper-core" % "2024.1.0"
+
+    libraryDependencies += "org.codeba" % "redis-keeper-core" % "2024.2.0"
 
-    libraryDependencies += "org.codeba" % "redis-keeper-support" % "2024.1.0"
+    libraryDependencies += "org.codeba" % "redis-keeper-support" % "2024.2.0"
 
 
 #### Java
@@ -98,7 +100,7 @@ Optional<CacheTemplate> randomedTemplate = provider.randomTemplate("ds2");
 <dependency>
 	<groupId>org.codeba</groupId>
 	<artifactId>redis-keeper-spring-boot-starter</artifactId>
-	<version>2024.1.0</version>
+	<version>2024.2.0</version>
 </dependency>
 ```
 
@@ -201,6 +203,30 @@ public class AppTest {
         cacheTemplate.trySetRateLimiter(key, 100, 1);
         cacheTemplate.tryAcquire(key);
         cacheTemplate.tryAcquire(key, 10);
+        // pipeline execute
+        cacheTemplate.pipeline(kBatch -> {
+            kBatch.getString().setAsync(key, "bar");
+            kBatch.getGeo().geoAddAsync(key, 13.361389, 38.115556, "Sicily");
+            kBatch.getList().llenAsync(key);
+        });
+        // pipeline execute and get response
+        final List<?> responses = cacheTemplate.pipelineWithResponses(kBatch -> {
+            kBatch.getString().setAsync(key, "bar");
+            kBatch.getGeo().geoAddAsync(key, 13.361389, 38.115556, "Sicily");
+            kBatch.getList().llenAsync(key);
+        });
+        // pipeline execute async
+        final CompletableFuture<Void> voidCompletableFuture = cacheTemplate.pipelineAsync(kBatch -> {
+            kBatch.getString().setAsync(key, "bar");
+            kBatch.getGeo().geoAddAsync(key, 13.361389, 38.115556, "Sicily");
+            kBatch.getList().llenAsync(key);
+        });
+        // pipeline execute and get response async
+        final CompletableFuture<List<?>> listCompletableFuture = cacheTemplate.pipelineWithResponsesAsync(kBatch -> {
+            kBatch.getString().setAsync(key, "bar");
+            kBatch.getGeo().geoAddAsync(key, 13.361389, 38.115556, "Sicily");
+            kBatch.getList().llenAsync(key);
+        });
     }
 
 }
@@ -217,7 +243,7 @@ public class AppTest {
 <dependency>
 	<groupId>org.codeba</groupId>
 	<artifactId>redis-keeper-spring-boot-starter</artifactId>
-	<version>2024.1.0</version>
+	<version>2024.2.0</version>
 </dependency>
 ```
 
@@ -236,7 +262,7 @@ public class MyCacheTemplate extends DefaultRedissonTemplate implements CacheTem
     }
 
     public void test() {
-	final RedissonClient redissonClient = getDataSource();
+	    final RedissonClient redissonClient = getDataSource();
         redissonClient.someMehotd();
         System.out.println("hello world");
     }
@@ -311,7 +337,7 @@ public class AppTest {
 <dependency>
 	<groupId>org.codeba</groupId>
 	<artifactId>redis-keeper-spring-boot-starter</artifactId>
-	<version>2024.1.0</version>
+	<version>2024.2.0</version>
 </dependency>
 ```
 

diff --git a/README_zh.md b/README_zh.md
@@ -7,9 +7,9 @@
 
 **支持 JDK: 1.8 ... 21**
 
-**支持 Redisson: 3.15.5 ... 3.33.0**
+**支持 Redisson: 3.15.5 ... 3.35.0**
 
-**支持 Redis: 3.0 ... 7.4**
+**支持 Redis: 3.0 ... 7.2**
 
 ## 特征
 
@@ -25,24 +25,26 @@
     <dependency>
        <groupId>org.codeba</groupId>
        <artifactId>redis-keeper-core</artifactId>
-       <version>2024.1.0</version>
+       <version>2024.2.0</version>
     </dependency> 
 
     <dependency>
        <groupId>org.codeba</groupId>
        <artifactId>redis-keeper-support</artifactId>
-       <version>2024.1.0</version>
+       <version>2024.2.0</version>
     </dependency>
 
 #### Gradle
-    implementation group: 'org.codeba', name: 'redis-keeper-core', version: '2024.1.0'
 
-    implementation group: 'org.codeba', name: 'redis-keeper-support', version: '2024.1.0'
+    implementation group: 'org.codeba', name: 'redis-keeper-core', version: '2024.2.0'
+
+    implementation group: 'org.codeba', name: 'redis-keeper-support', version: '2024.2.0'
 
 #### Sbt
-    libraryDependencies += "org.codeba" % "redis-keeper-core" % "2024.1.0"
+
+    libraryDependencies += "org.codeba" % "redis-keeper-core" % "2024.2.0"
 
-    libraryDependencies += "org.codeba" % "redis-keeper-support" % "2024.1.0"
+    libraryDependencies += "org.codeba" % "redis-keeper-support" % "2024.2.0"
 
 
 #### Java
@@ -98,7 +100,7 @@ Optional<CacheTemplate> randomedTemplate = provider.randomTemplate("ds2");
 <dependency>
 	<groupId>org.codeba</groupId>
 	<artifactId>redis-keeper-spring-boot-starter</artifactId>
-	<version>2024.1.0</version>
+	<version>2024.2.0</version>
 </dependency>
 ```
 
@@ -201,6 +203,30 @@ public class AppTest {
         cacheTemplate.trySetRateLimiter(key, 100, 1);
         cacheTemplate.tryAcquire(key);
         cacheTemplate.tryAcquire(key, 10);
+        // pipeline execute
+        cacheTemplate.pipeline(kBatch -> {
+            kBatch.getString().setAsync(key, "bar");
+            kBatch.getGeo().geoAddAsync(key, 13.361389, 38.115556, "Sicily");
+            kBatch.getList().llenAsync(key);
+        });
+        // pipeline execute and get response
+        final List<?> responses = cacheTemplate.pipelineWithResponses(kBatch -> {
+            kBatch.getString().setAsync(key, "bar");
+            kBatch.getGeo().geoAddAsync(key, 13.361389, 38.115556, "Sicily");
+            kBatch.getList().llenAsync(key);
+        });
+        // pipeline execute async
+        final CompletableFuture<Void> voidCompletableFuture = cacheTemplate.pipelineAsync(kBatch -> {
+            kBatch.getString().setAsync(key, "bar");
+            kBatch.getGeo().geoAddAsync(key, 13.361389, 38.115556, "Sicily");
+            kBatch.getList().llenAsync(key);
+        });
+        // pipeline execute and get response async
+        final CompletableFuture<List<?>> listCompletableFuture = cacheTemplate.pipelineWithResponsesAsync(kBatch -> {
+            kBatch.getString().setAsync(key, "bar");
+            kBatch.getGeo().geoAddAsync(key, 13.361389, 38.115556, "Sicily");
+            kBatch.getList().llenAsync(key);
+        });
     }
 
 }
@@ -218,7 +244,7 @@ public class AppTest {
 <dependency>
 	<groupId>org.codeba</groupId>
 	<artifactId>redis-keeper-spring-boot-starter</artifactId>
-	<version>2024.1.0</version>
+	<version>2024.2.0</version>
 </dependency>
 ```
 
@@ -237,7 +263,7 @@ public class MyCacheTemplate extends DefaultRedissonTemplate implements CacheTem
     }
 
     public void test() {
-	final RedissonClient redissonClient = getDataSource();
+	    final RedissonClient redissonClient = getDataSource();
         redissonClient.someMehotd();
         System.out.println("hello world");
     }
@@ -313,7 +339,7 @@ public class AppTest {
 <dependency>
 	<groupId>org.codeba</groupId>
 	<artifactId>redis-keeper-spring-boot-starter</artifactId>
-	<version>2024.1.0</version>
+	<version>2024.2.0</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -2,17 +2,17 @@
 <!--
   ~ Copyright (c) 2024-2025, redis-keeper (mimang447@gmail.com)
   ~
-  ~    Licensed under the Apache License, Version 2.0 (the "License");
-  ~    you may not use this file except in compliance with the License.
-  ~    You may obtain a copy of the License at
+  ~     Licensed under the Apache License, Version 2.0 (the "License");
+  ~     you may not use this file except in compliance with the License.
+  ~     You may obtain a copy of the License at
   ~
-  ~        http://www.apache.org/licenses/LICENSE-2.0
+  ~         http://www.apache.org/licenses/LICENSE-2.0
   ~
-  ~    Unless required by applicable law or agreed to in writing, software
-  ~    distributed under the License is distributed on an "AS IS" BASIS,
-  ~    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~    See the License for the specific language governing permissions and
-  ~    limitations under the License.
+  ~     Unless required by applicable law or agreed to in writing, software
+  ~     distributed under the License is distributed on an "AS IS" BASIS,
+  ~     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~     See the License for the specific language governing permissions and
+  ~     limitations under the License.
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -22,7 +22,7 @@
 
     <groupId>org.codeba</groupId>
     <artifactId>redis-keeper</artifactId>
-    <version>2024.1.0</version>
+    <version>2024.2.0</version>
 
     <name>redis-keeper</name>
     <description>Redis-keeper is a lightweight multi-data source management tool for redis.</description>
@@ -43,8 +43,8 @@
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <redis-keeper.version>2024.1.0</redis-keeper.version>
-        <redisson.version>3.15.5</redisson.version>
+        <redis-keeper.version>2024.2.0</redis-keeper.version>
+        <redisson.version>3.35.0</redisson.version>
 
         <spring.version>5.3.27</spring.version>
         <spring-boot.version>2.7.11</spring-boot.version>

diff --git a/redis-keeper-core/pom.xml b/redis-keeper-core/pom.xml
@@ -1,17 +1,17 @@
 <!--
   ~ Copyright (c) 2024-2025, redis-keeper (mimang447@gmail.com)
   ~
-  ~    Licensed under the Apache License, Version 2.0 (the "License");
-  ~    you may not use this file except in compliance with the License.
-  ~    You may obtain a copy of the License at
+  ~     Licensed under the Apache License, Version 2.0 (the "License");
+  ~     you may not use this file except in compliance with the License.
+  ~     You may obtain a copy of the License at
   ~
-  ~        http://www.apache.org/licenses/LICENSE-2.0
+  ~         http://www.apache.org/licenses/LICENSE-2.0
   ~
-  ~    Unless required by applicable law or agreed to in writing, software
-  ~    distributed under the License is distributed on an "AS IS" BASIS,
-  ~    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~    See the License for the specific language governing permissions and
-  ~    limitations under the License.
+  ~     Unless required by applicable law or agreed to in writing, software
+  ~     distributed under the License is distributed on an "AS IS" BASIS,
+  ~     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~     See the License for the specific language governing permissions and
+  ~     limitations under the License.
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.codeba</groupId>
         <artifactId>redis-keeper</artifactId>
-        <version>2024.1.0</version>
+        <version>2024.2.0</version>
     </parent>
 
     <artifactId>redis-keeper-core</artifactId>