v0.4.1

Author: chenby

.gitignore

@@ -38,3 +38,6 @@ hs_err_pid*
 # Vscode
 /.vscode
 .factorypath
+
+# log
+/log/

CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.4.1
+
+export unit support. [issue#16](https://github.com/leonchen83/redis-rdb-cli/issues/16).   
+
+
 ### 0.4.0
 
 Jsonl support. [issue#13](https://github.com/leonchen83/redis-rdb-cli/issues/13).   

README.md

@@ -392,11 +392,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#L161) from `none` to `influxdb`.  
+Then change parameter [metric_gateway](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L168) 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#L207) to make sure unique between instances.  
+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.  
 
 ## Redis 6
 
@@ -414,8 +414,8 @@ $openssl pkcs12 -export -CAfile ca.crt -in redis.crt -inkey redis.key -out redis
 ```
 
 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#L223) and [target_keystore_path](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L252) 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#L231) and [target_keystore_pass](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L260)  
+[source_keystore_path](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L231) and [target_keystore_path](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L260) 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#L239) and [target_keystore_pass](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L268)  
 
 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`
 

README.zh_CN.md

@@ -392,11 +392,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#L161) 这个参数从 `none` 改成 `influxdb`  
+把 [metric_gateway](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L169) 这个参数从 `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#L207) 并保证在每个实例上参数名唯一  
+如果你把这个工具部署在多个实例上, 需要更改如下参数 [metric_instance](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L215) 并保证在每个实例上参数名唯一  
 
 ## Redis 6
 
@@ -414,8 +414,8 @@ $openssl pkcs12 -export -CAfile ca.crt -in redis.crt -inkey redis.key -out redis
 ```
 
 2. 如果源 redis 和目标 redis 使用同样的 keystore. 那么配置如下参数  
-将 [source_keystore_path](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L223) 和 [target_keystore_path](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L252) 指向 `/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#L231) 和 [target_keystore_pass](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L260)  
+将 [source_keystore_path](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L231) 和 [target_keystore_path](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L260) 指向 `/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#L239) 和 [target_keystore_pass](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L268)  
 
 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`
 

src/main/java/com/moilioncircle/redis/rdb/cli/conf/Configure.java

@@ -85,6 +85,11 @@ private Configure(Properties properties) {
      * rct export meta
      */
     private boolean exportMeta = true;
+
+    /**
+     * rct export meta
+     */
+    private boolean exportUnit = true;
 
     /**
      * rmt --migrate
@@ -263,6 +268,14 @@ public void setExportMeta(boolean exportMeta) {
         this.exportMeta = exportMeta;
     }
 
+    public boolean isExportUnit() {
+        return exportUnit;
+    }
+
+    public void setExportUnit(boolean exportUnit) {
+        this.exportUnit = exportUnit;
+    }
+
     public int getTimeout() {
         return timeout;
     }
@@ -562,6 +575,7 @@ public static Configure bind(Properties properties) {
         conf.quote = (byte) getString(conf, "quote", "\"", true).charAt(0);
         conf.delimiter = (byte) getString(conf, "delimiter", ",", true).charAt(0);
         conf.exportMeta = getBool(conf, "export_meta", true, true);
+        conf.exportUnit = getBool(conf, "export_unit", true, true);
         conf.retries = getInt(conf, "retries", 5, true);
         conf.retryInterval = getInt(conf, "retry_interval", 1000, true);
         conf.timeout = getInt(conf, "timeout", 30000, true);
@@ -768,6 +782,7 @@ public String toString() {
                 ", quote=" + quote +
                 ", delimiter=" + delimiter +
                 ", exportMeta=" + exportMeta +
+                ", exportUnit=" + exportUnit +
                 ", migrateBatchSize=" + migrateBatchSize +
                 ", migrateThreads=" + migrateThreads +
                 ", migrateRetries=" + migrateRetries +

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

@@ -102,13 +102,13 @@ public void accept(Tuple2Ex tuple) {
         delimiter(out);
         quote(kv.getKey(), out);
         delimiter(out);
-        quote(com.moilioncircle.redis.rdb.cli.util.Strings.pretty(tuple.getV1()).getBytes(), out, false);
+        quote(pretty(tuple.getV1()).getBytes(), out, false);
         delimiter(out);
         OutputStreams.write(DataType.type(kv.getValueRdbType()).getBytes(), out);
         delimiter(out);
         OutputStreams.write(String.valueOf(kv.getLength()).getBytes(), out);
         delimiter(out);
-        quote(com.moilioncircle.redis.rdb.cli.util.Strings.pretty(kv.getMax()).getBytes(), out, false);
+        quote(pretty(kv.getMax()).getBytes(), out, false);
         delimiter(out);
         if (kv.getExpiredType() != NONE) {
             quote(FORMATTER.format(ofEpochMilli(kv.getExpiredValue()).atZone(systemDefault())).getBytes(), out, false);
@@ -118,6 +118,11 @@ public void accept(Tuple2Ex tuple) {
         OutputStreams.write('\n', out);
     }
 
+    private String pretty(long value) {
+        if (!configure.isExportUnit()) return String.valueOf(value);
+        return com.moilioncircle.redis.rdb.cli.util.Strings.pretty(value);
+    }
+    
     @Override
     public void onEvent(Replicator replicator, Event event) {
         if (event instanceof DummyKeyValuePair) {

src/main/resources/.version

@@ -1 +1 @@
-v0.4.0
+v0.4.1

src/main/resources/redis-rdb-cli.conf

@@ -76,6 +76,13 @@ quote=\u0022
 #
 export_meta=true
 
+#
+# This parameter used in `rct` like the following
+# `rct -f mem -s ./dump.rdb -o ./dump.mem`
+# If this value is true. the exported data will with unit like B, kB, MB.
+#
+export_unit=true
+
 #
 # Socket parameter
 # Used in connection timeout and read timeout