v0.4.0

Author: chenby

CHANGELOG.md

@@ -1,10 +1,14 @@
+### 0.4.0
+
+Jsonl support. [issue#13](https://github.com/leonchen83/redis-rdb-cli/issues/13).   
+
 ### 0.3.2
 
-Fix invalid json issue[#12](https://github.com/leonchen83/redis-rdb-cli/issues/12).   
+Fix invalid json [issue#12](https://github.com/leonchen83/redis-rdb-cli/issues/12).   
 
 ### 0.3.1
 
-Fix invalid json issue[#11](https://github.com/leonchen83/redis-rdb-cli/issues/11).   
+Fix invalid json [issue#11](https://github.com/leonchen83/redis-rdb-cli/issues/11).   
 
 ### 0.3.0
 

README.md

@@ -80,7 +80,8 @@ options:
  -e,--escape <escape>        escape strings to encoding: raw (default),
                              redis.
  -f,--format <format>        format to export. valid formats are json,
-                             dump, diff, key, keyval, count, mem and resp
+                             jsonl, dump, diff, key, keyval, count, mem
+                             and resp
  -h,--help                   rct usage.
  -k,--key <regex regex...>   keys to export. this can be a regex. if not
                              specified, all keys will be returned.
@@ -391,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#L154) 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#L161) 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#L200) 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#L207) to make sure unique between instances.  
 
 ## Redis 6
 
@@ -413,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#L216) and [target_keystore_path](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L245) 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#L224) and [target_keystore_pass](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L253)  
+[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)  
 
 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

@@ -80,7 +80,8 @@ options:
  -e,--escape <escape>        escape strings to encoding: raw (default),
                              redis.
  -f,--format <format>        format to export. valid formats are json,
-                             dump, diff, key, keyval, count, mem and resp
+                             jsonl, dump, diff, key, keyval, count, mem
+                             and resp
  -h,--help                   rct usage.
  -k,--key <regex regex...>   keys to export. this can be a regex. if not
                              specified, all keys will be returned.
@@ -391,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#L154) 这个参数从 `none` 改成 `influxdb`  
+把 [metric_gateway](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L161) 这个参数从 `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#L200) 并保证在每个实例上参数名唯一  
+如果你把这个工具部署在多个实例上, 需要更改如下参数 [metric_instance](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L207) 并保证在每个实例上参数名唯一  
 
 ## Redis 6
 
@@ -413,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#L216) 和 [target_keystore_path](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L245) 指向 `/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#L224) 和 [target_keystore_pass](https://github.com/leonchen83/redis-rdb-cli/blob/master/src/main/resources/redis-rdb-cli.conf#L253)  
+将 [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)  
 
 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/cmd/RctCommand.java

@@ -42,7 +42,7 @@ public class RctCommand extends AbstractCommand {
 
     private static final Option HELP = Option.builder("h").longOpt("help").required(false).hasArg(false).desc("rct usage.").build();
     private static final Option VERSION = Option.builder("v").longOpt("version").required(false).hasArg(false).desc("rct version.").build();
-    private static final Option FORMAT = Option.builder("f").longOpt("format").required(false).hasArg().argName("format").type(String.class).desc("format to export. valid formats are json, dump, diff, key, keyval, count, mem and resp").build();
+    private static final Option FORMAT = Option.builder("f").longOpt("format").required(false).hasArg().argName("format").type(String.class).desc("format to export. valid formats are json, jsonl, dump, diff, key, keyval, count, mem and resp").build();
     private static final Option SOURCE = Option.builder("s").longOpt("source").required(false).hasArg().argName("source").type(String.class).desc("<source> eg:\n /path/to/dump.rdb redis://host:port?authPassword=foobar redis:///path/to/dump.rdb.").build();
     private static final Option OUTPUT = Option.builder("o").longOpt("out").required(false).hasArg().argName("file").type(File.class).desc("output file.").build();
     private static final Option DB = Option.builder("d").longOpt("db").required(false).hasArg().argName("num num...").valueSeparator(' ').type(Number.class).desc("database number. multiple databases can be provided. if not specified, all databases will be included.").build();

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

@@ -81,6 +81,11 @@ private Configure(Properties properties) {
      */
     private byte delimiter = ',';
 
+    /**
+     * rct export meta
+     */
+    private boolean exportMeta = true;
+    
     /**
      * rmt --migrate
      */
@@ -249,7 +254,15 @@ public byte getDelimiter() {
     public void setDelimiter(byte delimiter) {
         this.delimiter = delimiter;
     }
-    
+
+    public boolean isExportMeta() {
+        return exportMeta;
+    }
+
+    public void setExportMeta(boolean exportMeta) {
+        this.exportMeta = exportMeta;
+    }
+
     public int getTimeout() {
         return timeout;
     }
@@ -548,6 +561,7 @@ public static Configure bind(Properties properties) {
         conf.dumpRdbVersion = getInt(conf, "dump_rdb_version", -1, true);
         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.retries = getInt(conf, "retries", 5, true);
         conf.retryInterval = getInt(conf, "retry_interval", 1000, true);
         conf.timeout = getInt(conf, "timeout", 30000, true);
@@ -753,6 +767,7 @@ public String toString() {
                 "batchSize=" + batchSize +
                 ", quote=" + quote +
                 ", delimiter=" + delimiter +
+                ", exportMeta=" + exportMeta +
                 ", migrateBatchSize=" + migrateBatchSize +
                 ", migrateThreads=" + migrateThreads +
                 ", migrateRetries=" + migrateRetries +