Page MenuHomeSoftware Heritage
Files F9348169

D2180.id7435.diff
No OneTemporary
Actions

D2180.id7435.diff
View Options

diff --git a/swh/journal/replay.py b/swh/journal/replay.py
--- a/swh/journal/replay.py
+++ b/swh/journal/replay.py
@@ -205,7 +205,6 @@
def _insert_objects(object_type, objects, storage):
objects = fix_objects(object_type, objects)
-
if object_type == 'content':
# TODO: insert 'content' in batches
for object_ in objects:
@@ -221,8 +220,7 @@
method(objects)
elif object_type == 'origin_visit':
for visit in objects:
- if 'type' in visit['origin']:
- storage.origin_add_one(visit['origin'])
+ storage.origin_add_one(visit['origin'])
if 'metadata' not in visit:
visit['metadata'] = None
storage.origin_visit_upsert(objects)
diff --git a/swh/journal/tests/conftest.py b/swh/journal/tests/conftest.py
--- a/swh/journal/tests/conftest.py
+++ b/swh/journal/tests/conftest.py
@@ -120,11 +120,9 @@
ORIGINS = [
{
'url': 'https://somewhere.org/den/fox',
- 'type': 'git',
},
{
'url': 'https://overtherainbow.org/fox/den',
- 'type': 'svn',
}
]
diff --git a/swh/journal/tests/test_kafka_writer.py b/swh/journal/tests/test_kafka_writer.py
--- a/swh/journal/tests/test_kafka_writer.py
+++ b/swh/journal/tests/test_kafka_writer.py
@@ -124,8 +124,8 @@
for object_ in objects:
object_ = object_.copy()
origin_id = storage.origin_add_one(object_.pop('origin'))
- del object_['type']
- visit = method(origin=origin_id, date=object_.pop('date'))
+ visit = method(origin=origin_id, date=object_.pop('date'),
+ type=object_.pop('type'))
expected_messages += 1
visit_id = visit['visit']
storage.origin_visit_update(origin_id, visit_id, **object_)
diff --git a/swh/journal/tests/test_replay.py b/swh/journal/tests/test_replay.py
--- a/swh/journal/tests/test_replay.py
+++ b/swh/journal/tests/test_replay.py
@@ -86,7 +86,7 @@
origins = list(storage.origin_get(
[orig for orig in OBJECT_TYPE_KEYS['origin'][1]]))
assert OBJECT_TYPE_KEYS['origin'][1] == \
- [{'url': orig['url'], 'type': orig['type']} for orig in origins]
+ [{'url': orig['url']} for orig in origins]
for origin in origins:
origin_id_or_url = \
origin['id'] if ENABLE_ORIGIN_IDS else origin['url']
@@ -98,7 +98,6 @@
}
for visit in OBJECT_TYPE_KEYS['origin_visit'][1]
if visit['origin']['url'] == origin['url']
- and visit['origin']['type'] == origin['type']
]
actual_visits = list(storage.origin_visit_get(
origin_id_or_url))
diff --git a/swh/journal/writer/kafka.py b/swh/journal/writer/kafka.py
--- a/swh/journal/writer/kafka.py
+++ b/swh/journal/writer/kafka.py
@@ -67,7 +67,7 @@
for hash in DEFAULT_ALGORITHMS
}
elif object_type == 'origin':
- return {'url': object_['url'], 'type': object_['type']}
+ return {'url': object_['url']}
elif object_type == 'origin_visit':
return {
'origin': object_['origin'],

File Metadata

Mime Type
text/plain
Expires
Jul 3 2025, 6:15 PM (4 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3214184

Event Timeline

About · Developer information · Legal