diff --git a/requirements-swh.txt b/requirements-swh.txt --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,3 +1,3 @@ swh.core swh.model >= 0.0.18 -swh.storage >= 0.0.97 +swh.storage >= 0.0.133 diff --git a/swh/loader/core/loader.py b/swh/loader/core/loader.py --- a/swh/loader/core/loader.py +++ b/swh/loader/core/loader.py @@ -283,7 +283,7 @@ 'swh_id': log_id }) - tools = list(self.storage.tool_add([tool])) + tools = self.storage.tool_add([tool]) tool_id = tools[0]['id'] self.log.debug( @@ -397,8 +397,8 @@ 'swh_num': num_contents, 'swh_id': log_id, }) - self.storage.content_add(content_list) - self.counters['contents'] += num_contents + result = self.storage.content_add(content_list) + self.counters['contents'] += result['content:add'] self.log.debug("Done sending %d contents" % num_contents, extra={ 'swh_type': 'storage_send_end', @@ -422,13 +422,13 @@ 'swh_num': num_directories, 'swh_id': log_id, }) - self.storage.directory_add(directory_list) - self.counters['directories'] += num_directories + result = self.storage.directory_add(directory_list) + self.counters['directories'] += result['directory:add'] self.log.debug("Done sending %d directories" % num_directories, extra={ 'swh_type': 'storage_send_end', 'swh_content_type': 'directory', - 'swh_num': num_directories, + 'swh_num_new': num_directories, 'swh_id': log_id, }) @@ -447,8 +447,8 @@ 'swh_num': num_revisions, 'swh_id': log_id, }) - self.storage.revision_add(revision_list) - self.counters['revisions'] += num_revisions + result = self.storage.revision_add(revision_list) + self.counters['revisions'] += result['revision:add'] self.log.debug("Done sending %d revisions" % num_revisions, extra={ 'swh_type': 'storage_send_end', @@ -472,8 +472,8 @@ 'swh_num': num_releases, 'swh_id': log_id, }) - self.storage.release_add(release_list) - self.counters['releases'] += num_releases + result = self.storage.release_add(release_list) + self.counters['releases'] += result['release:add'] self.log.debug("Done sending %d releases" % num_releases, extra={ 'swh_type': 'storage_send_end', @@ -484,7 +484,8 @@ @retry(retry_on_exception=retry_loading, stop_max_attempt_number=3) def send_snapshot(self, snapshot): - self.storage.snapshot_add(self.origin_id, self.visit, snapshot) + self.storage.snapshot_add([snapshot]) + self.storage.origin_visit_update(self.origin_id, self.visit, snapshot) @retry(retry_on_exception=retry_loading, stop_max_attempt_number=3) def filter_missing_contents(self, contents):