Details
Diff Detail
- Repository
- rDSTO Storage manager
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
Event Timeline
Build is green
See https://jenkins.softwareheritage.org/job/DSTO/job/tox/750/ for more details.
Build is green
See https://jenkins.softwareheritage.org/job/DSTO/job/tox/751/ for more details.
Thanks.
That looks promising.
Just have a couple of docstring fix and interrogation.
| swh/storage/in_memory.py | ||
|---|---|---|
| 874 | origin (str): | |
| 1493 | why don't use rename origin_id here? | |
| swh/storage/storage.py | ||
| 1102 | origin (str): the origin's url | |
| 1288 | do you still need to do that now? I mean, do we still need to pass the full origin to the journal (including our origin id)? | |
| 1493 | wow, it's been a while since i looked to the origin-get implementation... It's kind of a mess to read... That has nothing to do with the diff though... In any case, last return statement, is res['url'] is None possible at all here now? I guess yes because we don't know what the url inputted can be? | |
Just have a couple of docstring fix and interrogation.
Ah and you guessed it, i miss some migration scripts with the *sql functions impacted ;)
| swh/storage/storage.py | ||
|---|---|---|
| 1288 | That doesn't include the id, but it includes the type, which is currently needed by origin_add | |
| 1493 |
Let's not make this diff even bigger.
Yes, if the origin is not already in storage, because missing rows are returned by pg as (null, null) because it's a left join instead of inner join. | |
Build has FAILED
Link to build: https://jenkins.softwareheritage.org/job/DSTO/job/tox/752/
See console output for more information: https://jenkins.softwareheritage.org/job/DSTO/job/tox/752/console
Build is green
See https://jenkins.softwareheritage.org/job/DSTO/job/tox/753/ for more details.
| swh/storage/storage.py | ||
|---|---|---|
| 1288 | right! | |
Build has FAILED
Link to build: https://jenkins.softwareheritage.org/job/DSTO/job/tox/759/
See console output for more information: https://jenkins.softwareheritage.org/job/DSTO/job/tox/759/console
I've rebased this on top of the origin['type'] removal to see whether it could land.
However, this now needs D2174 on swh.model, as the to_dict recursion introduced in OriginVisit breaks when you attr.evlove(OriginVisit, origin=origin_url) (instead of attr.evolve(OriginVisit, origin=Origin(origin_url). This happens in a couple places and is inconsistent with the declared type for OriginVisit.origin.
I guess we should just end up replacing origin with origin_url in OriginVisit objects, as there's not much point carrying a single-key-dict around...
Build is green
See https://jenkins.softwareheritage.org/job/DSTO/job/tox/760/ for more details.
Yes, good idea. Should I land this diff as-is, and then we'll handle this renaming next week?
Build is green
See https://jenkins.softwareheritage.org/job/DSTO/job/tox/768/ for more details.