Skip to content

Commit 6b78e55

Browse files
author
chenby
committed
Support for java 25
Support for redis-8.4
1 parent 56140a0 commit 6b78e55

File tree

13 files changed

+23
-11
lines changed

13 files changed

+23
-11
lines changed

.github/workflows/maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
runs-on: ubuntu-latest
77
strategy:
88
matrix:
9-
java: [ '8', '11', '17', '21' ]
9+
java: [ '8', '11', '17', '21', '25' ]
1010
name: Build
1111
steps:
1212
- name: Setup redis 1

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
### 0.9.10
2+
3+
Support for redis 8.4.
4+
Support for Java 25.
5+
16
### 0.9.9
27

38
Fix script Make Homebrew and symlink friendly

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ WORKDIR /app
44
COPY . /app
55
RUN mvn clean install -Dmaven.test.skip=true
66

7-
FROM bellsoft/liberica-openjdk-alpine-musl:11
7+
FROM bellsoft/liberica-openjdk-alpine-musl:25
88
COPY --from=builder /app/target/redis-rdb-cli-release.zip /tmp/redis-rdb-cli-release.zip
99
WORKDIR /app
1010
# because of the cli has set shebang

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<dependency>
7171
<groupId>com.moilioncircle</groupId>
7272
<artifactId>redis-replicator</artifactId>
73-
<version>3.10.0</version>
73+
<version>3.11.0</version>
7474
<exclusions>
7575
<exclusion>
7676
<groupId>org.slf4j</groupId>

src/main/java/com/moilioncircle/redis/rdb/cli/cmd/XRst.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
import com.moilioncircle.redis.replicator.cmd.parser.LRemParser;
8080
import com.moilioncircle.redis.replicator.cmd.parser.LSetParser;
8181
import com.moilioncircle.redis.replicator.cmd.parser.LTrimParser;
82+
import com.moilioncircle.redis.replicator.cmd.parser.MSetExParser;
8283
import com.moilioncircle.redis.replicator.cmd.parser.MSetNxParser;
8384
import com.moilioncircle.redis.replicator.cmd.parser.MSetParser;
8485
import com.moilioncircle.redis.replicator.cmd.parser.MoveParser;
@@ -366,6 +367,8 @@ private Replicator dress(Replicator replicator) {
366367
// since redis 8.2
367368
replicator.addCommandParser(CommandName.name("XACKDEL"), new CombineCommandParser(new XAckDelParser()));
368369
replicator.addCommandParser(CommandName.name("XDELEX"), new CombineCommandParser(new XDelExParser()));
370+
// since redis 8.4
371+
replicator.addCommandParser(CommandName.name("MSETEX"), new CombineCommandParser(new MSetExParser()));
369372
return replicator;
370373
}
371374
}

src/main/java/com/moilioncircle/redis/rdb/cli/ext/DumpRawByteListener.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public DumpRawByteListener(Replicator replicator, int version, OutputStream out,
4242
this(replicator, version, out, escaper, true);
4343
}
4444

45-
//noinspection ThisEscapedInObjectConstruction
4645
public DumpRawByteListener(Replicator replicator, int version, OutputStream out, Escaper escaper, boolean listener) {
4746
this.version = version;
4847
this.listener = listener;

src/main/java/com/moilioncircle/redis/rdb/cli/ext/rct/CountRdbVisitor.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public class CountRdbVisitor extends AbstractRctRdbVisitor implements EventListe
4343

4444
private Map<String, Long> counter = new HashMap<>();
4545

46-
//noinspection ThisEscapedInObjectConstruction
4746
public CountRdbVisitor(Replicator replicator, Configure configure, Args.RctArgs args, Escaper escaper) {
4847
super(replicator, configure, args, escaper);
4948
replicator.addEventListener(this);

src/main/java/com/moilioncircle/redis/rdb/cli/ext/rct/MemoryRdbVisitor.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ public class MemoryRdbVisitor extends AbstractRctRdbVisitor implements Consumer<
9090
private boolean rdb6 = true;
9191
private Map<Long, Tuple2<Long, Long>> dbInfo = new LinkedHashMap<>();
9292

93-
//noinspection ThisEscapedInObjectConstruction
9493
public MemoryRdbVisitor(Replicator replicator, Configure configure, Args.RctArgs args, Escaper escaper) {
9594
super(replicator, configure, args, escaper);
9695
this.bytes = args.bytes;

src/main/java/com/moilioncircle/redis/rdb/cli/ext/rdt/SplitRdbVisitor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
public class SplitRdbVisitor extends AbstractRdtRdbVisitor {
4242

4343
public SplitRdbVisitor(Replicator replicator, Configure configure, Args.RdtArgs arg, Supplier<OutputStream> supplier) {
44-
super(replicator, configure, arg.filter, supplier);
44+
super(replicator, configure, arg.filter, supplier);;
4545
this.replicator.addEventListener((rep, event) -> {
4646
if (event instanceof PreRdbSyncEvent) {
4747
listener.reset(supplier.get());

src/main/java/com/moilioncircle/redis/rdb/cli/ext/rmt/ClusterRdbVisitor.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ public class ClusterRdbVisitor extends AbstractRmtRdbVisitor implements EventLis
6161
private final Configuration configuration;
6262
private ThreadLocal<XEndpoints> endpoints = new ThreadLocal<>();
6363

64-
//noinspection ThisEscapedInObjectConstruction
6564
public ClusterRdbVisitor(Replicator replicator, Configure configure, Filter filter, RedisURI uri, List<String> lines, boolean replace) throws IOException {
6665
super(replicator, configure, filter, replace);
6766
this.lines = lines;

0 commit comments

Comments
 (0)