implemented the OBJECT command. Fix for redis#137

Author: andymccurdy

redis/client.py

@@ -60,6 +60,12 @@ def parse_debug_object(response):
 
     return response
 
+def parse_object(response, infotype):
+    "Parse the results of an OBJECT command"
+    if infotype in ('idletime', 'refcount'):
+        return int(response)
+    return response
+
 def parse_info(response):
     "Parse the result of Redis's INFO command into a Python dict"
     info = {}
@@ -166,10 +172,11 @@ class StrictRedis(object):
             'BGSAVE': lambda r: r == 'Background saving started',
             'BRPOPLPUSH': lambda r: r and r or None,
             'CONFIG': parse_config,
+            'DEBUG': parse_debug_object,
             'HGETALL': lambda r: r and pairs_to_dict(r) or {},
             'INFO': parse_info,
-            'DEBUG': parse_debug_object,
             'LASTSAVE': timestamp_to_datetime,
+            'OBJECT': parse_object,
             'PING': lambda r: r == 'PONG',
             'RANDOMKEY': lambda r: r and r or None,
         }
@@ -306,6 +313,10 @@ def dbsize(self):
         "Returns the number of keys in the current database"
         return self.execute_command('DBSIZE')
 
+    def debug_object(self, key):
+        "Returns version specific metainformation about a give key"
+        return self.execute_command('DEBUG', 'OBJECT', key)
+
     def delete(self, *names):
         "Delete one or more keys specified by ``names``"
         return self.execute_command('DEL', *names)
@@ -327,17 +338,17 @@ def info(self):
         "Returns a dictionary containing information about the Redis server"
         return self.execute_command('INFO')
 
-    def debug_object(self, key):
-        "Returns version specific metainformation about a give key"
-        return self.execute_command('DEBUG', 'OBJECT', key)
-
     def lastsave(self):
         """
         Return a Python datetime object representing the last time the
         Redis database was saved to disk
         """
         return self.execute_command('LASTSAVE')
 
+    def object(self, infotype, key):
+        "Return the encoding, idletime, or refcount about the key"
+        return self.execute_command('OBJECT', infotype, key, infotype=infotype)
+
     def ping(self):
         "Ping the Redis server"
         return self.execute_command('PING')

tests/server_commands.py

@@ -82,6 +82,15 @@ def test_config_set(self):
         self.assert_(self.client.config_set('dbfilename', rdbname))
         self.assertEquals(self.client.config_get()['dbfilename'], rdbname)
 
+    def test_debug_object(self):
+        self.client['a'] = 'foo'
+        debug_info = self.client.debug_object('a')
+        self.assert_(len(debug_info) > 0)
+        self.assertEquals(debug_info['refcount'], 1)
+        self.assert_(debug_info['serializedlength'] > 0)
+        self.client.rpush('b', 'a1')
+        debug_info = self.client.debug_object('a')
+
     def test_echo(self):
         self.assertEquals(self.client.echo('foo bar'), 'foo bar')
 
@@ -92,18 +101,15 @@ def test_info(self):
         self.assert_(isinstance(info, dict))
         self.assertEquals(info['db9']['keys'], 2)
 
-    def test_debug_object(self):
-        self.client['a'] = 'foo'
-        debug_info = self.client.debug_object('a')
-        self.assert_(len(debug_info) > 0)
-        self.assertEquals(debug_info['refcount'], 1)
-        self.assert_(debug_info['serializedlength'] > 0)
-        self.client.rpush('b', 'a1')
-        debug_info = self.client.debug_object('a')
-
     def test_lastsave(self):
         self.assert_(isinstance(self.client.lastsave(), datetime.datetime))
 
+    def test_object(self):
+        self.client['a'] = 'foo'
+        self.assert_(isinstance(self.client.object('refcount', 'a'), int))
+        self.assert_(isinstance(self.client.object('idletime', 'a'), int))
+        self.assertEquals(self.client.object('encoding', 'a'), 'raw')
+
     def test_ping(self):
         self.assertEquals(self.client.ping(), True)