From 85aa2861cc123efc6e2327a87fa7e5ac1d160558 Mon Sep 17 00:00:00 2001 From: oranagra Date: Thu, 18 Aug 2016 18:13:17 +0300 Subject: [PATCH 1/3] setup.py metadata updates (cherry picked from commit 98902c5d6b0d4a55742d380401899cac8d9d488e) --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 3efc6ab..74b376d 100644 --- a/setup.py +++ b/setup.py @@ -23,11 +23,11 @@ 'description' : 'Utilities to convert Redis RDB files to JSON or SQL formats', 'long_description' : long_description, 'url': 'https://github.com/sripathikrishnan/redis-rdb-tools', - 'download_url' : 'http://cloud.github.com/downloads/andymccurdy/redis-py/redis-%s.tar.gz' % __version__, - 'author' : 'Sripathi Krishnan', + 'download_url': 'https://github.com/sripathikrishnan/redis-rdb-tools/archive/rdbtools-%s.tar.gz' % __version__, + 'author': 'Sripathi Krishnan, Redis Labs', 'author_email' : 'Sripathi.Krishnan@gmail.com', - 'maintainer' : 'Sripathi Krishnan', - 'maintainer_email' : 'Sripathi.Krishnan@gmail.com', + 'maintainer': 'Sripathi Krishnan, Redis Labs', + 'maintainer_email': 'oss@redislabs.com', 'keywords' : ['Redis', 'RDB', 'Export', 'Dump', 'Memory Profiler'], 'license' : 'MIT', 'packages' : ['rdbtools', 'rdbtools.cli'], From 7648da21a461d1657ce5508917f77d8039d2cac2 Mon Sep 17 00:00:00 2001 From: oranagra Date: Sun, 28 Aug 2016 07:44:11 +0300 Subject: [PATCH 2/3] fix issue #70, bug introduced in recent memory profiler improvements (cherry picked from commit 3ae6ade16a2cd3c3dec25b56c90c67330293284a) --- rdbtools/memprofiler.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rdbtools/memprofiler.py b/rdbtools/memprofiler.py index 2593a5d..f8891dd 100644 --- a/rdbtools/memprofiler.py +++ b/rdbtools/memprofiler.py @@ -78,6 +78,8 @@ def __init__(self, out): "size_in_bytes", "encoding", "num_elements", "len_largest_element")) def next_record(self, record) : + if record.key is None: + return # some records are not keys (e.g. dict) self._out.write("%d,%s,%s,%d,%s,%d,%d\n" % (record.database, record.type, encode_key(record.key), record.bytes, record.encoding, record.size, record.len_largest_element)) From 28ccd5b5dec0ac6e8724af3c61d167771b4d9c77 Mon Sep 17 00:00:00 2001 From: oranagra Date: Mon, 10 Oct 2016 12:10:46 +0300 Subject: [PATCH 3/3] bump version 0.1.8 --- rdbtools/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdbtools/__init__.py b/rdbtools/__init__.py index 943d73d..bf49c26 100644 --- a/rdbtools/__init__.py +++ b/rdbtools/__init__.py @@ -2,7 +2,7 @@ from rdbtools.callbacks import JSONCallback, DiffCallback, ProtocolCallback from rdbtools.memprofiler import MemoryCallback, PrintAllKeys, StatsAggregator -__version__ = '0.1.7' +__version__ = '0.1.8' VERSION = tuple(map(int, __version__.split('.'))) __all__ = [