Skip to content

Commit d06be8d

Browse files
author
chenby
committed
Merge remote-tracking branch 'origin/master' into dev
# Conflicts: # pom.xml # src/main/resources/.version
2 parents 08a56e4 + c1ef7c1 commit d06be8d

3 files changed

Lines changed: 14 additions & 7 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### 0.9.8
2+
3+
Add support for redis 8.2.
4+
15
### 0.9.7
26

37
Add support for redis 8.0.

pom.xml

Lines changed: 5 additions & 7 deletions
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.9.0</version>
73+
<version>3.10.0</version>
7474
<exclusions>
7575
<exclusion>
7676
<groupId>org.slf4j</groupId>
@@ -87,7 +87,7 @@
8787
<dependency>
8888
<groupId>redis.clients</groupId>
8989
<artifactId>jedis</artifactId>
90-
<version>6.0.0</version>
90+
<version>6.2.0</version>
9191
</dependency>
9292
<dependency>
9393
<groupId>info.picocli</groupId>
@@ -109,8 +109,6 @@
109109
<artifactId>influxdb-java</artifactId>
110110
<version>2.25</version>
111111
</dependency>
112-
113-
<!-- test -->
114112
<dependency>
115113
<groupId>junit</groupId>
116114
<artifactId>junit</artifactId>
@@ -120,7 +118,7 @@
120118
<dependency>
121119
<groupId>com.google.guava</groupId>
122120
<artifactId>guava</artifactId>
123-
<version>33.4.8-jre</version>
121+
<version>33.5.0-jre</version>
124122
<scope>test</scope>
125123
</dependency>
126124
</dependencies>
@@ -135,7 +133,7 @@
135133
<plugin>
136134
<groupId>org.apache.maven.plugins</groupId>
137135
<artifactId>maven-compiler-plugin</artifactId>
138-
<version>3.14.0</version>
136+
<version>3.14.1</version>
139137
<configuration>
140138
<compilerArgs>
141139
<arg>-parameters</arg>
@@ -194,7 +192,7 @@
194192
<plugin>
195193
<groupId>org.apache.maven.plugins</groupId>
196194
<artifactId>maven-surefire-plugin</artifactId>
197-
<version>3.5.3</version>
195+
<version>3.5.4</version>
198196
<configuration>
199197
<argLine>-Dfile.encoding=UTF-8</argLine>
200198
</configuration>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,11 @@
117117
import com.moilioncircle.redis.replicator.cmd.parser.SortParser;
118118
import com.moilioncircle.redis.replicator.cmd.parser.SwapDBParser;
119119
import com.moilioncircle.redis.replicator.cmd.parser.UnLinkParser;
120+
import com.moilioncircle.redis.replicator.cmd.parser.XAckDelParser;
120121
import com.moilioncircle.redis.replicator.cmd.parser.XAckParser;
121122
import com.moilioncircle.redis.replicator.cmd.parser.XAddParser;
122123
import com.moilioncircle.redis.replicator.cmd.parser.XClaimParser;
124+
import com.moilioncircle.redis.replicator.cmd.parser.XDelExParser;
123125
import com.moilioncircle.redis.replicator.cmd.parser.XDelParser;
124126
import com.moilioncircle.redis.replicator.cmd.parser.XGroupParser;
125127
import com.moilioncircle.redis.replicator.cmd.parser.XSetIdParser;
@@ -361,6 +363,9 @@ private Replicator dress(Replicator replicator) {
361363
replicator.addCommandParser(CommandName.name("HSETEX"), new CombineCommandParser(new HSetExParser()));
362364
replicator.addCommandParser(CommandName.name("HPEXPIREAT"), new CombineCommandParser(new HPExpireAtParser()));
363365
replicator.addCommandParser(CommandName.name("HPERSIST"), new CombineCommandParser(new HPersistParser()));
366+
// since redis 8.2
367+
replicator.addCommandParser(CommandName.name("XACKDEL"), new CombineCommandParser(new XAckDelParser()));
368+
replicator.addCommandParser(CommandName.name("XDELEX"), new CombineCommandParser(new XDelExParser()));
364369
return replicator;
365370
}
366371
}

0 commit comments

Comments
 (0)