Merge pull request #61 from raghu-nandan-bs/ignore-keys-with-ttl

add flag to ignore keys that have ttl

Author: leonchen83

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

@@ -109,12 +109,18 @@ private static class RmtExclusive {
 
 	@Option(names = {"-l", "--legacy"}, description = {"If specify the <replace> and this parameter.", "then use lua script to migrate data to target.", "if target redis version is greater than 3.0.", "no need to add this parameter."})
 	private boolean legacy;
-	
+
+	@Option(names = {"-x", "--ignore-keys-with-ttl"}, description = {"Ignore keys whose TTL is set", "default is false."})
+	private boolean ignoreKeysWithTTL;
+
 	@Override
 	public Integer call() throws Exception {
 		source = normalize(source, FileType.RDB, spec, "Invalid options: '--source=<source>'");
 		Configure configure = Configure.bind();
-		
+		if (ignoreKeysWithTTL) {
+			configure.setIgnoreKeysWithTTL(true);
+		}
+
 		if (exclusive.migrate != null) {
 			RedisURI uri = new RedisURI(exclusive.migrate);
 

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

@@ -290,6 +290,19 @@ public Properties properties() {
      * scan step
      */
     private int scanStep = 512;
+
+    /**
+     * ignore keys with ttl set
+     */
+    private boolean ignoreKeysWithTTL = false;
+
+    public boolean getIgnoreKeysWithTTL() {
+        return this.ignoreKeysWithTTL;
+    }
+
+    public void setIgnoreKeysWithTTL(boolean choice) {
+        this.ignoreKeysWithTTL = choice;
+    }
 
     public int getBatchSize() {
         return batchSize;

src/main/java/com/moilioncircle/redis/rdb/cli/ext/rmt/SingleRdbVisitor.java

@@ -63,6 +63,8 @@ public class SingleRdbVisitor extends AbstractRmtRdbVisitor implements EventList
     private volatile byte[] evalSha;
     private final Configuration conf;
     private ThreadLocal<XEndpoint> endpoint = new ThreadLocal<>();
+
+    private int totalKeysWithTTL = 0;
 
     //noinspection ThisEscapedInObjectConstruction
     public SingleRdbVisitor(Replicator replicator, Configure configure, Filter filter, RedisURI uri, boolean replace, boolean legacy) throws Exception {
@@ -108,14 +110,19 @@ public void retry(DumpKeyValuePair dkv, int times) {
         logger.trace("sync rdb event [{}], times {}", new String(dkv.getKey()), times);
         try {
             DB db = dkv.getDb();
-    
             int index;
             if (db != null && (index = (int) db.getDbNumber()) != endpoint.get().getDB()) {
                 endpoint.get().select(true, index);
             }
 
             byte[] expire = ZERO;
             if (dkv.getExpiredMs() != null) {
+                if (configure.getIgnoreKeysWithTTL()) {
+                    totalKeysWithTTL += 1;
+                    return; // ignore keys with ttl
+                }
+
+
                 long ms = dkv.getExpiredMs() - System.currentTimeMillis();
                 if (ms <= 0) {
                     MONITOR.add(ENDPOINT_FAILURE, "expired", 1);