Auto-merging swh/storage/tests/test_storage.py
Auto-merging swh/storage/tests/storage_data.py
Auto-merging swh/storage/interface.py
Auto-merging swh/storage/in_memory.py
Merge made by the 'recursive' strategy.
 sql/upgrades/153.sql                | 13 +++++++++++++
 swh/storage/db.py                   |  7 ++++++-
 swh/storage/in_memory.py            | 24 +++++++++++++++++++++++-
 swh/storage/interface.py            |  3 +++
 swh/storage/sql/60-swh-indexes.sql  |  2 +-
 swh/storage/tests/storage_data.py   |  6 +++---
 swh/storage/tests/test_in_memory.py | 16 ++++++++++++++++
 swh/storage/tests/test_storage.py   | 29 +++++++++++++++++++++++++++++
 8 files changed, 94 insertions(+), 6 deletions(-)
 create mode 100644 sql/upgrades/153.sql

Changes applied before test

commit 6b1a65eb2c723fe36abfd6219ad214799795808e
Merge: dcef916 96ce9f1
Author: Jenkins user <jenkins@localhost>
Date:   Mon Jun 8 10:37:11 2020 +0000

    Merge branch 'diff-target' into HEAD

commit 96ce9f199a948590ffcce4b12d827cace989916f
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 4 17:06:26 2020 +0200

    Add SortedList.iter_after.
    
    Strict version of iter_from. I'll need it for pagination.

commit ea2d8fab4a9d6ed2b75db7aea7dfed072669f1d0
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 4 12:33:17 2020 +0200

    Deduplicate origin-metadata when they have the same authority + discovery_date + fetcher.
    
    By replacing the old value with the new one.
    
    This will allow an easy implementation of pagination, using the fetcher
    id as an opaque page_token.
    
    Plus, it did not make sense logically to have different metadata from
    the same authority at the same time (especially with the same fetcher).

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

Harbormaster completed remote builds in B12691: Diff 11486.Jun 8 2020, 12:45 PM

Looks good.

This revision is now accepted and ready to land.Jun 8 2020, 2:01 PM

rebase

Build is green

Patch application report for D3239 (id=11495)

Rebasing onto dcef916e5e...

Current branch diff-target is up to date.

Changes applied before test

commit 26a8d4fe9e3ecd03b867ea29be85275b02b60546
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 4 17:06:26 2020 +0200

    Add SortedList.iter_after.
    
    Strict version of iter_from. I'll need it for pagination.

commit 6ebdc2f76e294c888c9b121a222d4d360df4507c
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 4 12:33:17 2020 +0200

    Deduplicate origin-metadata when they have the same authority + discovery_date + fetcher.
    
    By replacing the old value with the new one.
    
    This will allow an easy implementation of pagination, using the fetcher
    id as an opaque page_token.
    
    Plus, it did not make sense logically to have different metadata from
    the same authority at the same time (especially with the same fetcher).

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

Harbormaster completed remote builds in B12700: Diff 11495.Jun 8 2020, 4:17 PM

Closed by commit rDSTO26a8d4fe9e3e: Add SortedList.iter_after. (authored by vlorentz). · Explain WhyJun 8 2020, 4:59 PM

This revision was automatically updated to reflect the committed changes.

vlorentz added a commit: rDSTO26a8d4fe9e3e: Add SortedList.iter_after..