Page MenuHomeSoftware Heritage
Differential D3629

storage*: use an enum to explicit the order in origin_visit_get
ClosedPublic
Actions

Authored by ardumont on Jul 28 2020, 1:14 PM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Maniphest Tasks
T645: Type swh-storage endpoints with swh.model objects
Commits
rDSTO21b77304a044: storage*: use an enum to explicit the order in origin_visit_get
Summary

Improve over D3627

Related to T645

Depend on D3627

Test Plan

tox

Diff Detail

Repository
rDSTO Storage manager
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 14010
Build 21501: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 21500: arc lint + arc unit

Event Timeline

ardumont created this revision.Jul 28 2020, 1:14 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptJul 28 2020, 1:14 PM
ardumont mentioned this in D3627: storage*: origin_visit_get(...) -> PagedResult[OriginVisit].Jul 28 2020, 1:15 PM
swh-public-ci added a comment.Jul 28 2020, 1:26 PM

Build is green

Patch application report for D3629 (id=12775)

Could not rebase; Attempt merge onto 77960ca4b5...

Updating 77960ca4..0b1abbc1
Fast-forward
 swh/storage/api/serializers.py        |  47 ++++++++++++--
 swh/storage/cassandra/storage.py      |  36 ++++++++---
 swh/storage/db.py                     |  38 ++++++++++-
 swh/storage/in_memory.py              |  56 +++++++++-------
 swh/storage/interface.py              |  48 ++++++++++----
 swh/storage/storage.py                |  49 ++++++++++----
 swh/storage/tests/test_retry.py       |  11 ++--
 swh/storage/tests/test_serializers.py |  80 +++++++++++++++++++++++
 swh/storage/tests/test_storage.py     | 118 +++++++++++++++++++---------------
 9 files changed, 361 insertions(+), 122 deletions(-)
 create mode 100644 swh/storage/tests/test_serializers.py
Changes applied before test
commit 0b1abbc1aa9706f2440c9a294424f436ceb396dd
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Jul 28 13:10:05 2020 +0200

    storage*: use an enum to explicit the order in origin_visit_get
    
    Related to T645

commit 03a59bc5f10e6dfd2379add7abaeab0ee4cee48f
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 27 22:17:59 2020 +0200

    storage*: origin_visit_get(...) -> PagedResult[OriginVisit]
    
    Related to T645

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

Harbormaster completed remote builds in B14010: Diff 12775.Jul 28 2020, 1:26 PM
vlorentz added a parent revision: D3627: storage*: origin_visit_get(...) -> PagedResult[OriginVisit].Jul 28 2020, 2:05 PM
vlorentz added a subscriber: vlorentz.Jul 28 2020, 2:08 PM
vlorentz added inline comments.
swh/storage/interface.py
34

docstring

swh/storage/storage.py
902

could you pass the enum instance directly?

ardumont added inline comments.Jul 28 2020, 2:10 PM
swh/storage/interface.py
34

I don't really know what to say ;)

swh/storage/storage.py
902

yes, but that means one more import in the backend(s).
I'm not sure it's worth the effort.

ardumont added inline comments.Jul 28 2020, 2:20 PM
swh/storage/interface.py
34

in the docstring i mean.

vlorentz accepted this revision.Jul 29 2020, 9:18 AM
vlorentz added inline comments.
swh/storage/interface.py
34

"""Specifies the order for paginated endpoints returning sorted results."""

This revision is now accepted and ready to land.Jul 29 2020, 9:18 AM
ardumont marked 2 inline comments as done.Jul 29 2020, 11:53 AM
ardumont added inline comments.
swh/storage/storage.py
902

doing it ;)

ardumont updated this revision to Diff 12804.Jul 29 2020, 12:12 PM

Rebase and adapt according to review:

  • Add docstring to ListOrder
  • Push down ListOrder type to backends (cql, db)
swh-public-ci added a comment.Jul 29 2020, 12:20 PM

Build is green

Patch application report for D3629 (id=12804)

Could not rebase; Attempt merge onto 77960ca4b5...

Updating 77960ca4..cf0dcf9c
Fast-forward
 mypy.ini                              |   3 +
 requirements-swh.txt                  |   2 +-
 swh/storage/api/serializers.py        |  21 ++++--
 swh/storage/cassandra/cql.py          |   9 ++-
 swh/storage/cassandra/storage.py      |  34 +++++++---
 swh/storage/db.py                     |  38 ++++++++++-
 swh/storage/in_memory.py              |  56 +++++++++-------
 swh/storage/interface.py              |  40 ++++++++----
 swh/storage/storage.py                |  49 ++++++++++----
 swh/storage/tests/test_retry.py       |  11 ++--
 swh/storage/tests/test_serializers.py |  41 ++++++++++++
 swh/storage/tests/test_storage.py     | 116 +++++++++++++++++++---------------
 12 files changed, 295 insertions(+), 125 deletions(-)
 create mode 100644 swh/storage/tests/test_serializers.py
Changes applied before test
commit cf0dcf9c3d1a009cb7fc46b5096b3b1b00049973
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Jul 28 13:10:05 2020 +0200

    storage*: use an enum to explicit the order in origin_visit_get
    
    Related to T645

commit 39ed4e85d0ffbf8fc78ce729a12b85ca5a108a47
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 27 22:17:59 2020 +0200

    storage*: origin_visit_get(...) -> PagedResult[OriginVisit]
    
    Related to T645

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

ardumont added inline comments.Jul 29 2020, 12:20 PM
swh/storage/storage.py
902

It's worth the effort.
Thanks ;)

Harbormaster completed remote builds in B14035: Diff 12804.Jul 29 2020, 12:20 PM
vlorentz accepted this revision.Jul 29 2020, 12:26 PM
vlorentz added inline comments.
swh/storage/storage.py
892–894

I don't think that's needed, but no big deal

ardumont updated this revision to Diff 12808.Jul 29 2020, 1:29 PM

Rebase

ardumont updated this revision to Diff 12810.Jul 29 2020, 1:35 PM

Rebase again

swh-public-ci added a comment.Jul 29 2020, 1:38 PM

Build is green

Patch application report for D3629 (id=12808)

Could not rebase; Attempt merge onto 77960ca4b5...

Updating 77960ca4..5f690645
Fast-forward
 requirements-swh.txt                  |   2 +-
 swh/storage/api/serializers.py        |  21 ++++-
 swh/storage/cassandra/cql.py          |   9 +--
 swh/storage/cassandra/storage.py      |  37 +++++++--
 swh/storage/db.py                     |  38 ++++++++-
 swh/storage/in_memory.py              |  59 ++++++++------
 swh/storage/interface.py              |  40 +++++++---
 swh/storage/storage.py                |  52 ++++++++++---
 swh/storage/tests/test_retry.py       |  11 ++-
 swh/storage/tests/test_serializers.py |  41 ++++++++++
 swh/storage/tests/test_storage.py     | 140 +++++++++++++++++++++-------------
 11 files changed, 326 insertions(+), 124 deletions(-)
 create mode 100644 swh/storage/tests/test_serializers.py
Changes applied before test
commit 5f690645301fdf3c78b2259abad89b49134587b3
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Jul 28 13:10:05 2020 +0200

    storage*: use an enum to explicit the order in origin_visit_get
    
    Related to T645

commit c55ff7444b5f99b4e7163742d3e510c356f92d33
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 27 22:17:59 2020 +0200

    storage*: origin_visit_get(...) -> PagedResult[OriginVisit]
    
    Related to T645

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

Harbormaster completed remote builds in B14039: Diff 12808.Jul 29 2020, 1:38 PM
swh-public-ci added a comment.Jul 29 2020, 1:53 PM

Build is green

Patch application report for D3629 (id=12810)

Could not rebase; Attempt merge onto 77960ca4b5...

Updating 77960ca4..e1792e19
Fast-forward
 requirements-swh.txt                  |   2 +-
 swh/storage/api/serializers.py        |  21 ++++-
 swh/storage/cassandra/cql.py          |   9 +--
 swh/storage/cassandra/storage.py      |  37 +++++++--
 swh/storage/db.py                     |  38 ++++++++-
 swh/storage/in_memory.py              |  59 ++++++++------
 swh/storage/interface.py              |  40 +++++++---
 swh/storage/storage.py                |  52 ++++++++++---
 swh/storage/tests/test_retry.py       |  11 ++-
 swh/storage/tests/test_serializers.py |  41 ++++++++++
 swh/storage/tests/test_storage.py     | 140 +++++++++++++++++++++-------------
 11 files changed, 326 insertions(+), 124 deletions(-)
 create mode 100644 swh/storage/tests/test_serializers.py
Changes applied before test
commit e1792e194621c913d8178001dd5aa8f0a2c49de4
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 27 22:17:59 2020 +0200

    storage*: use an enum to explicit the order in origin_visit_get
    
    Related to T645

commit fd55b818bf44f417595eb4f81aa659a6756a7510
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 27 22:17:59 2020 +0200

    storage*: origin_visit_get(...) -> PagedResult[OriginVisit]
    
    Related to T645

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

Harbormaster completed remote builds in B14041: Diff 12810.Jul 29 2020, 1:53 PM
ardumont updated this revision to Diff 12813.Jul 29 2020, 2:43 PM

Rebase

swh-public-ci added a comment.Jul 29 2020, 2:58 PM

Build is green

Patch application report for D3629 (id=12813)

Could not rebase; Attempt merge onto f543bd53ee...

Updating f543bd53..21b77304
Fast-forward
 requirements-swh.txt                  |   2 +-
 swh/storage/api/serializers.py        |  21 ++++-
 swh/storage/cassandra/cql.py          |   9 +--
 swh/storage/cassandra/storage.py      |  37 +++++++--
 swh/storage/db.py                     |  38 ++++++++-
 swh/storage/in_memory.py              |  59 ++++++++------
 swh/storage/interface.py              |  40 +++++++---
 swh/storage/storage.py                |  52 ++++++++++---
 swh/storage/tests/test_retry.py       |  11 ++-
 swh/storage/tests/test_serializers.py |  41 ++++++++++
 swh/storage/tests/test_storage.py     | 140 +++++++++++++++++++++-------------
 11 files changed, 326 insertions(+), 124 deletions(-)
 create mode 100644 swh/storage/tests/test_serializers.py
Changes applied before test
commit 21b77304a0444601230e72c2959aa1fd5d96492c
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 27 22:17:59 2020 +0200

    storage*: use an enum to explicit the order in origin_visit_get
    
    Related to T645

commit 643ebc6e7eb9148558d1c692332785f529ffcb0e
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 27 22:17:59 2020 +0200

    storage*: origin_visit_get(...) -> PagedResult[OriginVisit]
    
    Related to T645

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

Harbormaster completed remote builds in B14044: Diff 12813.Jul 29 2020, 2:58 PM
Closed by commit rDSTO21b77304a044: storage*: use an enum to explicit the order in origin_visit_get (authored by ardumont). · Explain WhyJul 29 2020, 3:02 PM
This revision was automatically updated to reflect the committed changes.
ardumont added a commit: rDSTO21b77304a044: storage*: use an enum to explicit the order in origin_visit_get.

Revision Contents
Changeset List

PathSizeCoverage (All)Coverage (Touched)
swh/
storage/
api/
28 lines100%
Loading...
cassandra/
16 lines94%
Loading...
18 lines97%
Loading...
8 lines67%
Loading...
14 lines94%
Loading...
tests/
34 lines100%
Loading...
14 lines99%
Loading...

Diff 12775

View Options

swh/storage/api/serializers.py

Loading...
View Options

swh/storage/cassandra/storage.py

Loading...
View Options

swh/storage/in_memory.py

Loading...
View Options

swh/storage/interface.py

Loading...
View Options

swh/storage/storage.py

Loading...
View Options

swh/storage/tests/test_serializers.py

Loading...
View Options

swh/storage/tests/test_storage.py

Loading...
About · Developer information · Legal