From 25f1a54ca4e640c5cca3c7758e20fc4977114203 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 4 Nov 2020 14:02:30 +0800
Subject: [PATCH 1/3] 1

---
 tools/migratedb/import_redis.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/migratedb/import_redis.py b/tools/migratedb/import_redis.py
index ab587d6..1e1abda 100644
--- a/tools/migratedb/import_redis.py
+++ b/tools/migratedb/import_redis.py
@@ -24,7 +24,10 @@ def writeToRedis(conn, cmdline):
     elif cmdline[0] == 'sadd':
         conn.sadd(cmdline[1], cmdline[2])
     elif cmdline[0] == 'set':
-        conn.set(cmdline[1], cmdline[2])
+        if cmdline[2] != None:
+            conn.set(cmdline[1], cmdline[2])
+        else:
+            print('[warning]', cmdline)
     elif cmdline[0] == 'expire':
         conn.expire(cmdline[1], cmdline[2])
     else:

From 0d34261a90f36c6e89f24ef0a109a99cb76777a6 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 4 Nov 2020 14:06:38 +0800
Subject: [PATCH 2/3] 1

---
 tools/migratedb/import_redis.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/migratedb/import_redis.py b/tools/migratedb/import_redis.py
index 1e1abda..52888c2 100644
--- a/tools/migratedb/import_redis.py
+++ b/tools/migratedb/import_redis.py
@@ -12,11 +12,12 @@ import pprint
 argv = sys.argv
 host = argv[1]
 port = argv[2]
-script_name = argv[3]
+passwd = argv[3]
+script_name = argv[4]
 
 def writeToRedis(conn, cmdline):
     assert len(cmdline) > 1
-#    print(cmdline)
+    print(cmdline)
     if cmdline[0] == 'hset':
         conn.hset(cmdline[1], cmdline[2], cmdline[3])
     elif cmdline[0] == 'zadd':
@@ -35,6 +36,7 @@ def writeToRedis(conn, cmdline):
 
 conn = redis.Redis(host = host,
                    port = port,
+                   password = passwd,
                    db = 0,
                    decode_responses = True
 )

From c4ef7f47c120a1dbbc1ecf2b4f2adafa6688db98 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 5 Nov 2020 14:46:48 +0800
Subject: [PATCH 3/3] 1

---
 tools/migratedb/import_redis.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/migratedb/import_redis.py b/tools/migratedb/import_redis.py
index 52888c2..45a6eeb 100644
--- a/tools/migratedb/import_redis.py
+++ b/tools/migratedb/import_redis.py
@@ -30,7 +30,8 @@ def writeToRedis(conn, cmdline):
         else:
             print('[warning]', cmdline)
     elif cmdline[0] == 'expire':
-        conn.expire(cmdline[1], cmdline[2])
+        if int(cmdline[2]) >= 0:
+            conn.expire(cmdline[1], cmdline[2])
     else:
         assert False