From 5fec9fdd331fa77d49b46946165d84a203657876 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <antoine.romain.dumont@gmail.com>
Date: Tue, 17 Mar 2020 14:11:58 +0100
Subject: [PATCH] journal.replay: Align _fix_content with other fix methods
---
swh/journal/replay.py | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/swh/journal/replay.py b/swh/journal/replay.py
index 15f334c..1910a0e 100644
--- a/swh/journal/replay.py
+++ b/swh/journal/replay.py
@@ -68,21 +68,20 @@ def process_replay_objects(all_objects, *, storage):
notify('WATCHDOG=1')
-def _fix_contents(
- contents: Iterable[Dict[str, Any]]) -> Iterable[Dict[str, Any]]:
+def _fix_content(content: Dict[str, Any]) -> Dict[str, Any]:
"""Filters-out invalid 'perms' key that leaked from swh.model.from_disk
to the journal.
- >>> list(_fix_contents([
- ... {'perms': 0o100644, 'sha1_git': b'foo'},
- ... {'sha1_git': b'bar'},
- ... ]))
- [{'sha1_git': b'foo'}, {'sha1_git': b'bar'}]
+ >>> _fix_content({'perms': 0o100644, 'sha1_git': b'foo'})
+ {'sha1_git': b'foo'}
+
+ >>> _fix_content({'sha1_git': b'bar'})
+ {'sha1_git': b'bar'}
+
"""
- for content in contents:
- content = content.copy()
- content.pop('perms', None)
- yield content
+ content = content.copy()
+ content.pop('perms', None)
+ return content
def _fix_revision_pypi_empty_string(rev):
@@ -338,8 +337,8 @@ def _insert_objects(object_type: str, objects: List[Dict], storage) -> None:
if object_type == 'content':
contents: List[BaseContent] = []
skipped_contents: List[BaseContent] = []
- for content in _fix_contents(objects):
- c = BaseContent.from_dict(content)
+ for content in objects:
+ c = BaseContent.from_dict(_fix_content(content))
if isinstance(c, SkippedContent):
skipped_contents.append(c)
else:
--
GitLab