Page MenuHomeSoftware Heritage

storage*: Drop intermediary conversion step into OriginVisit
ClosedPublic

Authored by ardumont on Jun 30 2020, 3:30 PM.

Details

Summary

This is no longer possible as OriginVisit instances no longer hold the same
information as OriginVisitStatus.

This will allow to drop entirely those fields in the model [1]

Related to T2310

[1] Related to D3337

Test Plan

tox

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

ardumont created this revision.Jun 30 2020, 3:30 PM
ardumont edited the test plan for this revision. (Show Details)Jun 30 2020, 3:32 PM

Build has FAILED

Patch application report for D3380 (id=11995)

Rebasing onto ffe6b9253e...

Current branch diff-target is up to date.
Changes applied before test
commit 350e6911fa6cff5d222f28701ce768c45a22bf75
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Jun 30 15:22:59 2020 +0200

    storage*: Drop intermediary conversion step into OriginVisit
    
    This is no longer possible as OriginVisit no longer hold the same information
    as OriginVisitStatus.
    
    This will allow to drop entirely those fields in the model.
    
    Related to T2310

Link to build: https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/400/
See console output for more information: https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/400/console

vlorentz accepted this revision.Jun 30 2020, 3:40 PM
vlorentz added a subscriber: vlorentz.
vlorentz added inline comments.
swh/storage/algos/origin.py
95

"data" is uncountable

This revision is now accepted and ready to land.Jun 30 2020, 3:40 PM
ardumont edited the test plan for this revision. (Show Details)Jun 30 2020, 3:44 PM
ardumont updated this revision to Diff 11999.Jun 30 2020, 3:49 PM
  • Fix typo (thx)
  • Drop the swh.model bump requirement (it's unneeded for the current diff change, so the build should be fine)
ardumont edited the summary of this revision. (Show Details)Jun 30 2020, 3:50 PM
ardumont added inline comments.
swh/storage/algos/origin.py
95

yes, thx.

ardumont updated this revision to Diff 12000.Jun 30 2020, 3:51 PM
ardumont edited the summary of this revision. (Show Details)

Rebase on latest master

ardumont updated this revision to Diff 12001.Jun 30 2020, 3:53 PM

Really drop the swh.model version bump (i did update to 3.5 by mistake when
reverting manually :/)

Build was aborted

Patch application report for D3380 (id=11999)

Rebasing onto 953bd29ab0...

First, rewinding head to replay your work on top of it...
Applying: storage*: Drop intermediary conversion step into OriginVisit
Changes applied before test
commit b031e7e4f3b674de6d0efe632fc635be6dec7b52
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Jun 30 15:22:59 2020 +0200

    storage*: Drop intermediary conversion step into OriginVisit
    
    This is no longer possible as OriginVisit no longer hold the same information
    as OriginVisitStatus.
    
    This will allow to drop entirely those fields in the model.
    
    Related to T2310

Link to build: https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/401/
See console output for more information: https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/401/console

Build was aborted

Patch application report for D3380 (id=12000)

Rebasing onto 953bd29ab0...

Current branch diff-target is up to date.
Changes applied before test
commit f218057b4413168bbab2166355cf7e178b3a6660
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Jun 30 15:22:59 2020 +0200

    storage*: Drop intermediary conversion step into OriginVisit
    
    This is no longer possible as OriginVisit no longer hold the same information
    as OriginVisitStatus.
    
    This will allow to drop entirely those fields in the model.
    
    Related to T2310

Link to build: https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/402/
See console output for more information: https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/402/console

Build was aborted

yes, i did, too many rebase following each other so no need for that many builds.

Build is green

Patch application report for D3380 (id=12001)

Rebasing onto 953bd29ab0...

Current branch diff-target is up to date.
Changes applied before test
commit 312127af7ce3a21287bae9cd5d3e2d124d577c6b
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Jun 30 15:22:59 2020 +0200

    storage*: Drop intermediary conversion step into OriginVisit
    
    This is no longer possible as OriginVisit no longer hold the same information
    as OriginVisitStatus.
    
    This will allow to drop entirely those fields in the model.
    
    Related to T2310

See https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/403/ for more details.