Merge pull request #151 from wayslog/master

fixed bugs that skip_module doesn't read module id first
sripathikrishnan · Jan 31, 2019 · 9dd1902 · 9dd1902
2 parents fca1c2e + 6cff541
commit 9dd1902
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/rdbtools/parser.py b/rdbtools/parser.py
@@ -820,6 +820,7 @@ def read_zipmap_next_length(self, f) :
             return None
 
     def skip_module(self, f):
+        self.read_length_with_encoding(f) # read module id first
         opcode = self.read_length(f)
         while opcode != REDIS_RDB_MODULE_OPCODE_EOF:
             if opcode == REDIS_RDB_MODULE_OPCODE_SINT or opcode == REDIS_RDB_MODULE_OPCODE_UINT:

diff --git a/tests/parser_tests.py b/tests/parser_tests.py
@@ -208,6 +208,10 @@ def test_rdb_version_8_with_module(self):
         r = load_rdb('redis_40_with_module.rdb')
         self.assertEquals(r.databases[0][b'foo']['module_name'], 'ReJSON-RL')
 
+    def test_rdb_version_8_with_module_and_skip(self):
+        r = load_rdb('redis_40_with_module.rdb', {"keys": "bar"}) # skip foo module
+        self.assert_(b'foo' not in r.databases[0])
+
     def test_rdb_version_9_with_stream(self):
         r = load_rdb('redis_50_with_streams.rdb')
         self.assertEquals(r.lengths[0][b"mystream"], 4)