v0.6.0

redis-6.2

Author: leonchen83

CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.6.0
+
+Redis 6.2 support.  
+
+`rst` command support `COPY,BLMOVE,LMOVE,ZDIFFSTORE,GEOSEARCHSTORE` commands.  
+
 ### 0.5.1
 
 Fix `RedisURI` `setAuthUser` bug.  

README.md

@@ -524,7 +524,7 @@ migrate_flush=yes
 ## Limitation of migration
 
 1. We use cluster's `nodes.conf` to migrate data to cluster. because of we did't handle the `MOVED` `ASK` redirection. so limitation of cluster migration is that the cluster **MUST** in stable state during the migration. this means the cluster **MUST** have no `migrating`, `importing` slot and no switch slave to master. 
-2. If use `rst` migrate data to cluster. the following commands not supported `SWAPDB,MOVE,FLUSHALL,FLUSHDB,PUBLISH,MULTI,EXEC,SCRIPT FLUSH,SCRIPT LOAD,EVAL,EVALSHA`. and the following commands `RPOPLPUSH,SDIFFSTORE,SINTERSTORE,SMOVE,ZINTERSTORE,ZUNIONSTORE,DEL,UNLINK,RENAME,RENAMENX,PFMERGE,PFCOUNT,MSETNX,BRPOPLPUSH,BITOP,MSET` **ONLY SUPPORT WHEN THESE COMMAND KEYS IN THE SAME SLOT**(eg: `del {user}:1 {user}:2`)
+2. If use `rst` migrate data to cluster. the following commands not supported `SWAPDB,MOVE,FLUSHALL,FLUSHDB,PUBLISH,MULTI,EXEC,SCRIPT FLUSH,SCRIPT LOAD,EVAL,EVALSHA`. and the following commands `RPOPLPUSH,SDIFFSTORE,SINTERSTORE,SMOVE,ZINTERSTORE,ZUNIONSTORE,DEL,UNLINK,RENAME,RENAMENX,PFMERGE,PFCOUNT,MSETNX,BRPOPLPUSH,BITOP,MSET,COPY,BLMOVE,LMOVE,ZDIFFSTORE,GEOSEARCHSTORE` **ONLY SUPPORT WHEN THESE COMMAND KEYS IN THE SAME SLOT**(eg: `del {user}:1 {user}:2`)
 
 ## Hack ret
 
@@ -561,13 +561,13 @@ User should follow the steps below to implement a sink service.
         <dependency>
             <groupId>com.moilioncircle</groupId>
             <artifactId>redis-rdb-cli-api</artifactId>
-            <version>1.4.1</version>
+            <version>1.5.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.moilioncircle</groupId>
             <artifactId>redis-replicator</artifactId>
-            <version>3.4.0</version>
+            <version>[3.4.0, )</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

README.zh_CN.md

@@ -524,7 +524,7 @@ migrate_flush=yes
 ## 同步的限制
 
 1. 我们通过集群的 `nodes.conf` 文件来同步数据到集群. 因为我们没有处理 `MOVED` `ASK` 重定向. 因此唯一的限制是集群在同步期间 **必须** 是稳定的状态. 这意味着集群 **必须** 不存在 `migrating`, `importing` 这样的slot. 而且没有主从切换. 
-2. 当使用 `rst` 命令迁移数据到集群的时候. 下面的命令不支持： `SWAPDB,MOVE,FLUSHALL,FLUSHDB,PUBLISH,MULTI,EXEC,SCRIPT FLUSH,SCRIPT LOAD,EVAL,EVALSHA`. 下面的命令**有限支持** `RPOPLPUSH,SDIFFSTORE,SINTERSTORE,SMOVE,ZINTERSTORE,ZUNIONSTORE,DEL,UNLINK,RENAME,RENAMENX,PFMERGE,PFCOUNT,MSETNX,BRPOPLPUSH,BITOP,MSET`.**只有这些命令里包含的 keys 在同一个slot的时候**(eg: `del {user}:1 {user}:2`)才支持.
+2. 当使用 `rst` 命令迁移数据到集群的时候. 下面的命令不支持： `SWAPDB,MOVE,FLUSHALL,FLUSHDB,PUBLISH,MULTI,EXEC,SCRIPT FLUSH,SCRIPT LOAD,EVAL,EVALSHA`. 下面的命令**有限支持** `RPOPLPUSH,SDIFFSTORE,SINTERSTORE,SMOVE,ZINTERSTORE,ZUNIONSTORE,DEL,UNLINK,RENAME,RENAMENX,PFMERGE,PFCOUNT,MSETNX,BRPOPLPUSH,BITOP,MSET,COPY,BLMOVE,LMOVE,ZDIFFSTORE,GEOSEARCHSTORE`.**只有这些命令里包含的 keys 在同一个slot的时候**(eg: `del {user}:1 {user}:2`)才支持.
 
 ## Hack ret
 
@@ -561,13 +561,13 @@ migrate_flush=yes
         <dependency>
             <groupId>com.moilioncircle</groupId>
             <artifactId>redis-rdb-cli-api</artifactId>
-            <version>1.4.1</version>
+            <version>1.5.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.moilioncircle</groupId>
             <artifactId>redis-replicator</artifactId>
-            <version>3.4.0</version>
+            <version>[3.4.0, )</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

pom.xml

@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.moilioncircle</groupId>
             <artifactId>redis-replicator</artifactId>
-            <version>3.4.4</version>
+            <version>3.5.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>com.moilioncircle</groupId>
             <artifactId>redis-rdb-cli-api</artifactId>
-            <version>1.4.1</version>
+            <version>1.5.0</version>
         </dependency>
 
         <dependency>

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

@@ -37,9 +37,11 @@
 import com.moilioncircle.redis.replicator.Replicators;
 import com.moilioncircle.redis.replicator.cmd.CommandName;
 import com.moilioncircle.redis.replicator.cmd.parser.AppendParser;
+import com.moilioncircle.redis.replicator.cmd.parser.BLMoveParser;
 import com.moilioncircle.redis.replicator.cmd.parser.BRPopLPushParser;
 import com.moilioncircle.redis.replicator.cmd.parser.BitFieldParser;
 import com.moilioncircle.redis.replicator.cmd.parser.BitOpParser;
+import com.moilioncircle.redis.replicator.cmd.parser.CopyParser;
 import com.moilioncircle.redis.replicator.cmd.parser.DecrByParser;
 import com.moilioncircle.redis.replicator.cmd.parser.DecrParser;
 import com.moilioncircle.redis.replicator.cmd.parser.DelParser;
@@ -51,6 +53,7 @@
 import com.moilioncircle.redis.replicator.cmd.parser.FlushAllParser;
 import com.moilioncircle.redis.replicator.cmd.parser.FlushDBParser;
 import com.moilioncircle.redis.replicator.cmd.parser.GeoAddParser;
+import com.moilioncircle.redis.replicator.cmd.parser.GeoSearchStoreParser;
 import com.moilioncircle.redis.replicator.cmd.parser.GetSetParser;
 import com.moilioncircle.redis.replicator.cmd.parser.HDelParser;
 import com.moilioncircle.redis.replicator.cmd.parser.HIncrByParser;
@@ -60,6 +63,7 @@
 import com.moilioncircle.redis.replicator.cmd.parser.IncrByParser;
 import com.moilioncircle.redis.replicator.cmd.parser.IncrParser;
 import com.moilioncircle.redis.replicator.cmd.parser.LInsertParser;
+import com.moilioncircle.redis.replicator.cmd.parser.LMoveParser;
 import com.moilioncircle.redis.replicator.cmd.parser.LPopParser;
 import com.moilioncircle.redis.replicator.cmd.parser.LPushParser;
 import com.moilioncircle.redis.replicator.cmd.parser.LPushXParser;
@@ -111,6 +115,7 @@
 import com.moilioncircle.redis.replicator.cmd.parser.XSetIdParser;
 import com.moilioncircle.redis.replicator.cmd.parser.XTrimParser;
 import com.moilioncircle.redis.replicator.cmd.parser.ZAddParser;
+import com.moilioncircle.redis.replicator.cmd.parser.ZDiffStoreParser;
 import com.moilioncircle.redis.replicator.cmd.parser.ZIncrByParser;
 import com.moilioncircle.redis.replicator.cmd.parser.ZInterStoreParser;
 import com.moilioncircle.redis.replicator.cmd.parser.ZPopMaxParser;
@@ -335,6 +340,12 @@ private Replicator dress(Replicator replicator) {
         replicator.addCommandParser(CommandName.name("XGROUP"), new CombineCommandParser(new XGroupParser()));
         replicator.addCommandParser(CommandName.name("XTRIM"), new CombineCommandParser(new XTrimParser()));
         replicator.addCommandParser(CommandName.name("XSETID"), new CombineCommandParser(new XSetIdParser()));
+        // since redis 6.2
+        replicator.addCommandParser(CommandName.name("COPY"), new CombineCommandParser(new CopyParser()));
+        replicator.addCommandParser(CommandName.name("LMOVE"), new CombineCommandParser(new LMoveParser()));
+        replicator.addCommandParser(CommandName.name("BLMOVE"), new CombineCommandParser(new BLMoveParser()));
+        replicator.addCommandParser(CommandName.name("ZDIFFSTORE"), new CombineCommandParser(new ZDiffStoreParser()));
+        replicator.addCommandParser(CommandName.name("GEOSEARCHSTORE"), new CombineCommandParser(new GeoSearchStoreParser()));
         return replicator;
     }
 

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

@@ -41,11 +41,15 @@
 import com.moilioncircle.redis.replicator.Configuration;
 import com.moilioncircle.redis.replicator.Replicator;
 import com.moilioncircle.redis.replicator.cmd.Command;
+import com.moilioncircle.redis.replicator.cmd.impl.BLMoveCommand;
 import com.moilioncircle.redis.replicator.cmd.impl.BRPopLPushCommand;
 import com.moilioncircle.redis.replicator.cmd.impl.BitOpCommand;
+import com.moilioncircle.redis.replicator.cmd.impl.CopyCommand;
 import com.moilioncircle.redis.replicator.cmd.impl.DefaultCommand;
 import com.moilioncircle.redis.replicator.cmd.impl.DelCommand;
 import com.moilioncircle.redis.replicator.cmd.impl.GenericKeyCommand;
+import com.moilioncircle.redis.replicator.cmd.impl.GeoSearchStoreCommand;
+import com.moilioncircle.redis.replicator.cmd.impl.LMoveCommand;
 import com.moilioncircle.redis.replicator.cmd.impl.MSetCommand;
 import com.moilioncircle.redis.replicator.cmd.impl.MSetNxCommand;
 import com.moilioncircle.redis.replicator.cmd.impl.PFCountCommand;
@@ -59,6 +63,7 @@
 import com.moilioncircle.redis.replicator.cmd.impl.SMoveCommand;
 import com.moilioncircle.redis.replicator.cmd.impl.SelectCommand;
 import com.moilioncircle.redis.replicator.cmd.impl.UnLinkCommand;
+import com.moilioncircle.redis.replicator.cmd.impl.ZDiffStoreCommand;
 import com.moilioncircle.redis.replicator.cmd.impl.ZInterStoreCommand;
 import com.moilioncircle.redis.replicator.cmd.impl.ZUnionStoreCommand;
 import com.moilioncircle.redis.replicator.event.Event;
@@ -359,6 +364,51 @@ public void retry(CombineCommand command, int times) {
                 monitor.add("failure_slot", 1);
                 logger.error("failure[slot] [{}]", command);
             }
+        } else if (parsedCommand instanceof CopyCommand) {
+            CopyCommand cmd = (CopyCommand) parsedCommand;
+            short slot = slot1(cmd.getDestination(), cmd.getSource());
+            if (slot != -1) {
+                retry(command, slot, times);
+            } else {
+                monitor.add("failure_slot", 1);
+                logger.error("failure[slot] [{}]", command);
+            }
+        } else if (parsedCommand instanceof BLMoveCommand) {
+            BLMoveCommand cmd = (BLMoveCommand) parsedCommand;
+            short slot = slot1(cmd.getDestination(), cmd.getSource());
+            if (slot != -1) {
+                retry(command, slot, times);
+            } else {
+                monitor.add("failure_slot", 1);
+                logger.error("failure[slot] [{}]", command);
+            }
+        } else if (parsedCommand instanceof LMoveCommand) {
+            LMoveCommand cmd = (LMoveCommand) parsedCommand;
+            short slot = slot1(cmd.getDestination(), cmd.getSource());
+            if (slot != -1) {
+                retry(command, slot, times);
+            } else {
+                monitor.add("failure_slot", 1);
+                logger.error("failure[slot] [{}]", command);
+            }
+        } else if (parsedCommand instanceof ZDiffStoreCommand) {
+            ZDiffStoreCommand cmd = (ZDiffStoreCommand) parsedCommand;
+            short slot = slot1(cmd.getDestination(), cmd.getKeys());
+            if (slot != -1) {
+                retry(command, slot, times);
+            } else {
+                monitor.add("failure_slot", 1);
+                logger.error("failure[slot] [{}]", command);
+            }
+        } else if (parsedCommand instanceof GeoSearchStoreCommand) {
+            GeoSearchStoreCommand cmd = (GeoSearchStoreCommand) parsedCommand;
+            short slot = slot1(cmd.getDestination(), cmd.getSource());
+            if (slot != -1) {
+                retry(command, slot, times);
+            } else {
+                monitor.add("failure_slot", 1);
+                logger.error("failure[slot] [{}]", command);
+            }
         } else if (parsedCommand instanceof GenericKeyCommand) {
             GenericKeyCommand cmd = (GenericKeyCommand) parsedCommand;
             retry(command, slot(cmd.getKey()), times);

src/main/resources/.version

@@ -1 +1 @@
-v0.5.1
+v0.6.0