Skip to content

Commit aa6ea5c

Browse files
author
codeba
committed
Merge remote-tracking branch 'origin/develop-pipeline'
# Conflicts: # README.md # README_zh.md
2 parents f292937 + ed4b53e commit aa6ea5c

File tree

88 files changed

+9687
-10736
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+9687
-10736
lines changed

‎README.md‎

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
**Supported JDK: 1.8 ... 21**
99

10-
**Supported Redisson: 3.15.5 ... 3.33.0**
10+
**Supported Redisson: 3.15.5 ... 3.35.0**
1111

12-
**Supported Redis: 3.0 ... 7.4**
12+
**Supported Redis: 3.0 ... 7.2**
1313

1414
## Features
1515

@@ -25,24 +25,26 @@
2525
<dependency>
2626
<groupId>org.codeba</groupId>
2727
<artifactId>redis-keeper-core</artifactId>
28-
<version>2024.1.0</version>
28+
<version>2024.2.0</version>
2929
</dependency>
3030

3131
<dependency>
3232
<groupId>org.codeba</groupId>
3333
<artifactId>redis-keeper-support</artifactId>
34-
<version>2024.1.0</version>
34+
<version>2024.2.0</version>
3535
</dependency>
3636

3737
#### Gradle
38-
implementation group: 'org.codeba', name: 'redis-keeper-core', version: '2024.1.0'
3938

40-
implementation group: 'org.codeba', name: 'redis-keeper-support', version: '2024.1.0'
39+
implementation group: 'org.codeba', name: 'redis-keeper-core', version: '2024.2.0'
40+
41+
implementation group: 'org.codeba', name: 'redis-keeper-support', version: '2024.2.0'
4142

4243
#### Sbt
43-
libraryDependencies += "org.codeba" % "redis-keeper-core" % "2024.1.0"
44+
45+
libraryDependencies += "org.codeba" % "redis-keeper-core" % "2024.2.0"
4446

45-
libraryDependencies += "org.codeba" % "redis-keeper-support" % "2024.1.0"
47+
libraryDependencies += "org.codeba" % "redis-keeper-support" % "2024.2.0"
4648

4749

4850
#### Java
@@ -98,7 +100,7 @@ Optional<CacheTemplate> randomedTemplate = provider.randomTemplate("ds2");
98100
<dependency>
99101
<groupId>org.codeba</groupId>
100102
<artifactId>redis-keeper-spring-boot-starter</artifactId>
101-
<version>2024.1.0</version>
103+
<version>2024.2.0</version>
102104
</dependency>
103105
```
104106

@@ -201,6 +203,30 @@ public class AppTest {
201203
cacheTemplate.trySetRateLimiter(key, 100, 1);
202204
cacheTemplate.tryAcquire(key);
203205
cacheTemplate.tryAcquire(key, 10);
206+
// pipeline execute
207+
cacheTemplate.pipeline(kBatch -> {
208+
kBatch.getString().setAsync(key, "bar");
209+
kBatch.getGeo().geoAddAsync(key, 13.361389, 38.115556, "Sicily");
210+
kBatch.getList().llenAsync(key);
211+
});
212+
// pipeline execute and get response
213+
final List<?> responses = cacheTemplate.pipelineWithResponses(kBatch -> {
214+
kBatch.getString().setAsync(key, "bar");
215+
kBatch.getGeo().geoAddAsync(key, 13.361389, 38.115556, "Sicily");
216+
kBatch.getList().llenAsync(key);
217+
});
218+
// pipeline execute async
219+
final CompletableFuture<Void> voidCompletableFuture = cacheTemplate.pipelineAsync(kBatch -> {
220+
kBatch.getString().setAsync(key, "bar");
221+
kBatch.getGeo().geoAddAsync(key, 13.361389, 38.115556, "Sicily");
222+
kBatch.getList().llenAsync(key);
223+
});
224+
// pipeline execute and get response async
225+
final CompletableFuture<List<?>> listCompletableFuture = cacheTemplate.pipelineWithResponsesAsync(kBatch -> {
226+
kBatch.getString().setAsync(key, "bar");
227+
kBatch.getGeo().geoAddAsync(key, 13.361389, 38.115556, "Sicily");
228+
kBatch.getList().llenAsync(key);
229+
});
204230
}
205231

206232
}
@@ -217,7 +243,7 @@ public class AppTest {
217243
<dependency>
218244
<groupId>org.codeba</groupId>
219245
<artifactId>redis-keeper-spring-boot-starter</artifactId>
220-
<version>2024.1.0</version>
246+
<version>2024.2.0</version>
221247
</dependency>
222248
```
223249

@@ -236,7 +262,7 @@ public class MyCacheTemplate extends DefaultRedissonTemplate implements CacheTem
236262
}
237263

238264
public void test() {
239-
final RedissonClient redissonClient = getDataSource();
265+
final RedissonClient redissonClient = getDataSource();
240266
redissonClient.someMehotd();
241267
System.out.println("hello world");
242268
}
@@ -311,7 +337,7 @@ public class AppTest {
311337
<dependency>
312338
<groupId>org.codeba</groupId>
313339
<artifactId>redis-keeper-spring-boot-starter</artifactId>
314-
<version>2024.1.0</version>
340+
<version>2024.2.0</version>
315341
</dependency>
316342
```
317343

‎README_zh.md‎

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
**支持 JDK: 1.8 ... 21**
99

10-
**支持 Redisson: 3.15.5 ... 3.33.0**
10+
**支持 Redisson: 3.15.5 ... 3.35.0**
1111

12-
**支持 Redis: 3.0 ... 7.4**
12+
**支持 Redis: 3.0 ... 7.2**
1313

1414
## 特征
1515

@@ -25,24 +25,26 @@
2525
<dependency>
2626
<groupId>org.codeba</groupId>
2727
<artifactId>redis-keeper-core</artifactId>
28-
<version>2024.1.0</version>
28+
<version>2024.2.0</version>
2929
</dependency>
3030

3131
<dependency>
3232
<groupId>org.codeba</groupId>
3333
<artifactId>redis-keeper-support</artifactId>
34-
<version>2024.1.0</version>
34+
<version>2024.2.0</version>
3535
</dependency>
3636

3737
#### Gradle
38-
implementation group: 'org.codeba', name: 'redis-keeper-core', version: '2024.1.0'
3938

40-
implementation group: 'org.codeba', name: 'redis-keeper-support', version: '2024.1.0'
39+
implementation group: 'org.codeba', name: 'redis-keeper-core', version: '2024.2.0'
40+
41+
implementation group: 'org.codeba', name: 'redis-keeper-support', version: '2024.2.0'
4142

4243
#### Sbt
43-
libraryDependencies += "org.codeba" % "redis-keeper-core" % "2024.1.0"
44+
45+
libraryDependencies += "org.codeba" % "redis-keeper-core" % "2024.2.0"
4446

45-
libraryDependencies += "org.codeba" % "redis-keeper-support" % "2024.1.0"
47+
libraryDependencies += "org.codeba" % "redis-keeper-support" % "2024.2.0"
4648

4749

4850
#### Java
@@ -98,7 +100,7 @@ Optional<CacheTemplate> randomedTemplate = provider.randomTemplate("ds2");
98100
<dependency>
99101
<groupId>org.codeba</groupId>
100102
<artifactId>redis-keeper-spring-boot-starter</artifactId>
101-
<version>2024.1.0</version>
103+
<version>2024.2.0</version>
102104
</dependency>
103105
```
104106

@@ -201,6 +203,30 @@ public class AppTest {
201203
cacheTemplate.trySetRateLimiter(key, 100, 1);
202204
cacheTemplate.tryAcquire(key);
203205
cacheTemplate.tryAcquire(key, 10);
206+
// pipeline execute
207+
cacheTemplate.pipeline(kBatch -> {
208+
kBatch.getString().setAsync(key, "bar");
209+
kBatch.getGeo().geoAddAsync(key, 13.361389, 38.115556, "Sicily");
210+
kBatch.getList().llenAsync(key);
211+
});
212+
// pipeline execute and get response
213+
final List<?> responses = cacheTemplate.pipelineWithResponses(kBatch -> {
214+
kBatch.getString().setAsync(key, "bar");
215+
kBatch.getGeo().geoAddAsync(key, 13.361389, 38.115556, "Sicily");
216+
kBatch.getList().llenAsync(key);
217+
});
218+
// pipeline execute async
219+
final CompletableFuture<Void> voidCompletableFuture = cacheTemplate.pipelineAsync(kBatch -> {
220+
kBatch.getString().setAsync(key, "bar");
221+
kBatch.getGeo().geoAddAsync(key, 13.361389, 38.115556, "Sicily");
222+
kBatch.getList().llenAsync(key);
223+
});
224+
// pipeline execute and get response async
225+
final CompletableFuture<List<?>> listCompletableFuture = cacheTemplate.pipelineWithResponsesAsync(kBatch -> {
226+
kBatch.getString().setAsync(key, "bar");
227+
kBatch.getGeo().geoAddAsync(key, 13.361389, 38.115556, "Sicily");
228+
kBatch.getList().llenAsync(key);
229+
});
204230
}
205231

206232
}
@@ -218,7 +244,7 @@ public class AppTest {
218244
<dependency>
219245
<groupId>org.codeba</groupId>
220246
<artifactId>redis-keeper-spring-boot-starter</artifactId>
221-
<version>2024.1.0</version>
247+
<version>2024.2.0</version>
222248
</dependency>
223249
```
224250

@@ -237,7 +263,7 @@ public class MyCacheTemplate extends DefaultRedissonTemplate implements CacheTem
237263
}
238264

239265
public void test() {
240-
final RedissonClient redissonClient = getDataSource();
266+
final RedissonClient redissonClient = getDataSource();
241267
redissonClient.someMehotd();
242268
System.out.println("hello world");
243269
}
@@ -313,7 +339,7 @@ public class AppTest {
313339
<dependency>
314340
<groupId>org.codeba</groupId>
315341
<artifactId>redis-keeper-spring-boot-starter</artifactId>
316-
<version>2024.1.0</version>
342+
<version>2024.2.0</version>
317343
</dependency>
318344
```
319345

‎pom.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<!--
33
~ Copyright (c) 2024-2025, redis-keeper ([email protected])
44
~
5-
~ Licensed under the Apache License, Version 2.0 (the "License");
6-
~ you may not use this file except in compliance with the License.
7-
~ You may obtain a copy of the License at
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
88
~
9-
~ http://www.apache.org/licenses/LICENSE-2.0
9+
~ http://www.apache.org/licenses/LICENSE-2.0
1010
~
11-
~ Unless required by applicable law or agreed to in writing, software
12-
~ distributed under the License is distributed on an "AS IS" BASIS,
13-
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
~ See the License for the specific language governing permissions and
15-
~ limitations under the License.
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
1616
-->
1717

1818
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -22,7 +22,7 @@
2222

2323
<groupId>org.codeba</groupId>
2424
<artifactId>redis-keeper</artifactId>
25-
<version>2024.1.0</version>
25+
<version>2024.2.0</version>
2626

2727
<name>redis-keeper</name>
2828
<description>Redis-keeper is a lightweight multi-data source management tool for redis.</description>
@@ -43,8 +43,8 @@
4343
<maven.compiler.target>8</maven.compiler.target>
4444
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4545

46-
<redis-keeper.version>2024.1.0</redis-keeper.version>
47-
<redisson.version>3.15.5</redisson.version>
46+
<redis-keeper.version>2024.2.0</redis-keeper.version>
47+
<redisson.version>3.35.0</redisson.version>
4848

4949
<spring.version>5.3.27</spring.version>
5050
<spring-boot.version>2.7.11</spring-boot.version>

‎redis-keeper-core/pom.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<!--
22
~ Copyright (c) 2024-2025, redis-keeper ([email protected])
33
~
4-
~ Licensed under the Apache License, Version 2.0 (the "License");
5-
~ you may not use this file except in compliance with the License.
6-
~ You may obtain a copy of the License at
4+
~ Licensed under the Apache License, Version 2.0 (the "License");
5+
~ you may not use this file except in compliance with the License.
6+
~ You may obtain a copy of the License at
77
~
8-
~ http://www.apache.org/licenses/LICENSE-2.0
8+
~ http://www.apache.org/licenses/LICENSE-2.0
99
~
10-
~ Unless required by applicable law or agreed to in writing, software
11-
~ distributed under the License is distributed on an "AS IS" BASIS,
12-
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
~ See the License for the specific language governing permissions and
14-
~ limitations under the License.
10+
~ Unless required by applicable law or agreed to in writing, software
11+
~ distributed under the License is distributed on an "AS IS" BASIS,
12+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
~ See the License for the specific language governing permissions and
14+
~ limitations under the License.
1515
-->
1616

1717
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.codeba</groupId>
2222
<artifactId>redis-keeper</artifactId>
23-
<version>2024.1.0</version>
23+
<version>2024.2.0</version>
2424
</parent>
2525

2626
<artifactId>redis-keeper-core</artifactId>

0 commit comments

Comments
 (0)