Merge remote-tracking branch 'origin/master' into dev

# Conflicts:
#	pom.xml
#	src/main/assembly/assembly-native.xml
#	src/main/java/com/moilioncircle/redis/rdb/cli/ext/rct/KeyValRdbVisitor.java
#	src/main/resources/.version
#	src/main/resources/META-INF/native-image/com.moilioncircle/redis-rdb-cli/jni-config.json
#	src/main/resources/META-INF/native-image/com.moilioncircle/redis-rdb-cli/reflect-config.json
#	src/main/resources/META-INF/native-image/com.moilioncircle/redis-rdb-cli/resource-config.json

Author: chenby

.github/workflows/docker.yml

@@ -26,13 +26,5 @@ jobs:
           file: ./Dockerfile
           push: false
           tags: ${{ secrets.DOCKER_USER }}/${{ secrets.REPO }}:latest
-      - name: Build docker latest-native
-        id: latest-native
-        uses: docker/build-push-action@v4
-        with:
-          context: ./
-          file: ./DockerfileNative
-          push: false
-          tags: ${{ secrets.DOCKER_USER }}/${{ secrets.REPO }}:latest-native
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/native.yml

@@ -55,21 +55,5 @@ jobs:
         file: ./Dockerfile
         push: true
         tags: ${{ secrets.DOCKER_USER }}/${{ secrets.REPO }}:${{ env.RELEASE_TAG }}
-    - name: Build and Push latest-native
-      id: latest-native
-      uses: docker/build-push-action@v4
-      with:
-        context: ./
-        file: ./DockerfileNative
-        push: true
-        tags: ${{ secrets.DOCKER_USER }}/${{ secrets.REPO }}:latest-native
-    - name: Build and Push ${{ env.RELEASE_TAG }}-native
-      id: tag-native
-      uses: docker/build-push-action@v4
-      with:
-        context: ./
-        file: ./DockerfileNative
-        push: true
-        tags: ${{ secrets.DOCKER_USER }}/${{ secrets.REPO }}:${{ env.RELEASE_TAG }}-native
     - name: Image digest
       run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/release.yml

@@ -1,3 +1,8 @@
+### 0.9.7
+
+Add support for redis 8.0.  
+Remove native image support.  
+
 ### 0.9.6
 
 Fix `rdt` convert db bug.  

CHANGELOG.md

@@ -287,11 +287,11 @@ $ docker-compose down
 ```
 
 `cd /path/to/redis-rdb-cli/conf/redis-rdb-cli.conf`  
-Then change parameter [metric_gateway](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L169) from `none` to `influxdb`.  
+Then change parameter `metric_gateway` from `none` to `influxdb`.  
 
 Open `http://localhost:3000` to check the `rct -f mem`'s result.  
 
-If you deployed this tool in multi instance, you need to change parameter [metric_instance](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L215) to make sure unique between instances.  
+If you deployed this tool in multi instance, you need to change parameter `metric_instance` to make sure unique between instances.  
 
 ## Redis 6
 
@@ -309,8 +309,8 @@ $ openssl pkcs12 -export -CAfile ca.crt -in redis.crt -inkey redis.key -out redi
 ```
 
 2. If source redis and target redis use the same keystore. then config following parameters  
-[source_keystore_path](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L230) and [target_keystore_path](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L259) to point to `/path/to/redis-6.0-rc1/tests/tls/redis.p12`  
-set [source_keystore_pass](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L238) and [target_keystore_pass](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L267)  
+`source_keystore_path` and `target_keystore_path` to point to `/path/to/redis-6.0-rc1/tests/tls/redis.p12`  
+set `source_keystore_pass` and `target_keystore_pass`  
 
 3. after config ssl parameters use `rediss://host:port` in your command to open ssl, for example: `rst -s rediss://127.0.0.1:6379 -m rediss://127.0.0.1:30001 -r -d 0`
 
@@ -456,13 +456,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.8.0</version>
+            <version>1.9.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.moilioncircle</groupId>
             <artifactId>redis-replicator</artifactId>
-            <version>[3.6.4, )</version>
+            <version>[3.9.0, )</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

DockerfileNative

@@ -287,11 +287,11 @@ $ docker-compose down
 ```
 
 `cd /path/to/redis-rdb-cli/conf/redis-rdb-cli.conf`  
-把 [metric_gateway](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L169) 这个参数从 `none` 改成 `influxdb`  
+把 `metric_gateway` 这个参数从 `none` 改成 `influxdb`  
 
 浏览器打开 `http://localhost:3000` 来查看 `rct -f mem` 命令的结果.  
 
-如果你把这个工具部署在多个实例上, 需要更改如下参数 [metric_instance](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L215) 并保证在每个实例上参数名唯一  
+如果你把这个工具部署在多个实例上, 需要更改如下参数 `metric_instance` 并保证在每个实例上参数名唯一  
 
 ## Redis 6
 
@@ -309,8 +309,8 @@ $ openssl pkcs12 -export -CAfile ca.crt -in redis.crt -inkey redis.key -out redi
 ```
 
 2. 如果源 redis 和目标 redis 使用同样的 keystore. 那么配置如下参数  
-将 [source_keystore_path](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L230) 和 [target_keystore_path](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L259) 指向 `/path/to/redis-6.0-rc1/tests/tls/redis.p12`  
-设置 [source_keystore_pass](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L238) 和 [target_keystore_pass](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L267)  
+将 `source_keystore_path` 和 `target_keystore_path` 指向 `/path/to/redis-6.0-rc1/tests/tls/redis.p12`  
+设置 `source_keystore_pass` 和 `target_keystore_pass`  
 
 3. 在配置完 ssl 参数之后, 在你的命令中使用 `rediss://host:port` 这样的URI来开启ssl, 比如: `rst -s rediss://127.0.0.1:6379 -m rediss://127.0.0.1:30001 -r -d 0`
 
@@ -456,13 +456,13 @@ migrate_flush=yes
         <dependency>
             <groupId>com.moilioncircle</groupId>
             <artifactId>redis-rdb-cli-api</artifactId>
-            <version>1.8.0</version>
+            <version>1.9.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.moilioncircle</groupId>
             <artifactId>redis-replicator</artifactId>
-            <version>[3.6.4, )</version>
+            <version>[3.9.0, )</version>
             <scope>provided</scope>
         </dependency>
         <dependency>