Page MenuHomeSoftware Heritage

serializers: Prepare rename of 'identifiers_enum' to 'swhids_enum'.
ClosedPublic

Authored by vlorentz on Oct 7 2021, 11:23 AM.

Details

Summary

This will be done in three steps to avoid any disruption:

  1. (this step) add support for decoding the new name, but keep encoding as the old one
  2. start encoding as the new name
  3. remove support for decoding the old name

Depends on D6431.

Diff Detail

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

Unit TestsFailed

TimeTest
21,138 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.tests.test_backfill::test_backfiller
swh_storage_backend_config = {'check_config': {'check_write': True}, 'cls': 'postgresql', 'db': "dbname=storage user=postgres host=127.0.0.1 port=1...riter': {'brokers': ['127.0.0.1:33297'], 'client_id': 'kafka_writer-1', 'cls': 'kafka', 'prefix': 'iipelcwclr-1'}, ...} kafka_prefix = 'iipelcwclr', kafka_consumer_group = 'test-consumer-iipelcwclr' kafka_server = '127.0.0.1:33297'
134 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.tests.test_postgresql.TestStorage::test_content_metadata_add
self = <swh.storage.tests.test_postgresql.TestStorage object at 0x7efdde51e198> swh_storage = <swh.storage.postgresql.storage.Storage object at 0x7f0020573f28> sample_data = <swh.storage.tests.storage_data.StorageData object at 0x7efdde47a240>
141 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.tests.test_postgresql.TestStorage::test_content_metadata_add_duplicate
self = <swh.storage.tests.test_postgresql.TestStorage object at 0x7efdde420da0> swh_storage = <swh.storage.postgresql.storage.Storage object at 0x7efe16626b70> sample_data = <swh.storage.tests.storage_data.StorageData object at 0x7efe4fc5b1d0>
145 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.tests.test_postgresql.TestStorage::test_content_metadata_get
self = <swh.storage.tests.test_postgresql.TestStorage object at 0x7efe0d1220b8> swh_storage = <swh.storage.postgresql.storage.Storage object at 0x7efe0d122b00> sample_data = <swh.storage.tests.storage_data.StorageData object at 0x7efe0d0f3cf8>
142 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.tests.test_postgresql.TestStorage::test_content_metadata_get_after
self = <swh.storage.tests.test_postgresql.TestStorage object at 0x7efdf3103518> swh_storage = <swh.storage.postgresql.storage.Storage object at 0x7efdf3103da0> sample_data = <swh.storage.tests.storage_data.StorageData object at 0x7efdf31031d0>
View Full Test Results (14 Failed · 1,089 Passed · 40 Skipped)

Event Timeline

Build has FAILED

Patch application report for D6433 (id=23362)

Could not rebase; Attempt merge onto 113088ab06...

Updating 113088ab..18a3b62d
Fast-forward
 swh/storage/algos/diff.py                          |  5 ++---
 swh/storage/algos/dir_iterators.py                 |  5 ++---
 swh/storage/api/serializers.py                     | 26 +++++++++++-----------
 swh/storage/backfill.py                            |  2 +-
 swh/storage/cassandra/cql.py                       |  2 +-
 swh/storage/cassandra/storage.py                   |  4 ++--
 swh/storage/interface.py                           |  2 +-
 swh/storage/migrate_extrinsic_metadata.py          | 14 ++++++------
 swh/storage/postgresql/converters.py               | 10 ++++-----
 swh/storage/postgresql/db.py                       |  2 +-
 swh/storage/postgresql/storage.py                  |  2 +-
 .../tests/migrate_extrinsic_metadata/test_cran.py  |  2 +-
 .../migrate_extrinsic_metadata/test_debian.py      |  2 +-
 .../migrate_extrinsic_metadata/test_deposit.py     |  2 +-
 .../tests/migrate_extrinsic_metadata/test_gnu.py   |  2 +-
 .../migrate_extrinsic_metadata/test_nixguix.py     |  2 +-
 .../tests/migrate_extrinsic_metadata/test_npm.py   |  2 +-
 .../tests/migrate_extrinsic_metadata/test_pypi.py  |  2 +-
 swh/storage/tests/storage_data.py                  |  4 ++--
 swh/storage/tests/storage_tests.py                 |  2 +-
 swh/storage/tests/test_postgresql_converters.py    |  2 +-
 21 files changed, 47 insertions(+), 49 deletions(-)
Changes applied before test
commit 18a3b62d4ac290acf3ebf3f06739b72fa7dcdff9
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Oct 7 11:22:43 2021 +0200

    serializers: Prepare rename of 'identifiers_enum' to 'swhids_enum'.
    
    This will be done in three steps to avoid any disruption:
    
    1. (this step) add support for decoding the new name, but keep encoding as the old one
    2. start encoding as the new name
    3. remove support for decoding the old name

commit 04b5fc3d339672b9075957724c4b81c6633545ed
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Oct 7 11:18:45 2021 +0200

    Rename imports of swh.model.identifiers to fix deprecation warnings.

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

Harbormaster returned this revision to the author for changes because remote builds failed.Oct 7 2021, 11:31 AM
Harbormaster failed remote builds in B24278: Diff 23362!

Build has FAILED

Patch application report for D6433 (id=23365)

Could not rebase; Attempt merge onto 113088ab06...

Updating 113088ab..c2d73a81
Fast-forward
 swh/storage/algos/diff.py                          |  5 ++---
 swh/storage/algos/dir_iterators.py                 |  5 ++---
 swh/storage/algos/revisions_walker.py              |  2 +-
 swh/storage/api/serializers.py                     | 26 +++++++++++-----------
 swh/storage/backfill.py                            |  2 +-
 swh/storage/cassandra/cql.py                       |  2 +-
 swh/storage/cassandra/storage.py                   |  4 ++--
 swh/storage/in_memory.py                           |  2 +-
 swh/storage/interface.py                           |  2 +-
 swh/storage/migrate_extrinsic_metadata.py          | 14 ++++++------
 swh/storage/postgresql/converters.py               |  8 +++----
 swh/storage/postgresql/db.py                       |  2 +-
 swh/storage/postgresql/storage.py                  |  2 +-
 .../tests/migrate_extrinsic_metadata/test_cran.py  |  2 +-
 .../migrate_extrinsic_metadata/test_debian.py      |  2 +-
 .../migrate_extrinsic_metadata/test_deposit.py     |  2 +-
 .../tests/migrate_extrinsic_metadata/test_gnu.py   |  2 +-
 .../migrate_extrinsic_metadata/test_nixguix.py     |  2 +-
 .../tests/migrate_extrinsic_metadata/test_npm.py   |  2 +-
 .../tests/migrate_extrinsic_metadata/test_pypi.py  |  2 +-
 swh/storage/tests/storage_data.py                  |  4 ++--
 swh/storage/tests/storage_tests.py                 |  2 +-
 swh/storage/tests/test_postgresql_converters.py    |  2 +-
 23 files changed, 48 insertions(+), 50 deletions(-)
Changes applied before test
commit c2d73a811bb4414b584b064e746f8b98f907bfd8
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Oct 7 11:22:43 2021 +0200

    serializers: Prepare rename of 'identifiers_enum' to 'swhids_enum'.
    
    This will be done in three steps to avoid any disruption:
    
    1. (this step) add support for decoding the new name, but keep encoding as the old one
    2. start encoding as the new name
    3. remove support for decoding the old name

commit f2d9a776fe02765b20d244d011e4bff37b288a79
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Oct 7 11:18:45 2021 +0200

    Rename imports of swh.model.identifiers to fix deprecation warnings.

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

Harbormaster returned this revision to the author for changes because remote builds failed.Oct 7 2021, 11:57 AM
Harbormaster failed remote builds in B24280: Diff 23365!

Build is green

Patch application report for D6433 (id=23370)

Could not rebase; Attempt merge onto 113088ab06...

Updating 113088ab..de7d539d
Fast-forward
 swh/storage/algos/diff.py                          |  5 ++---
 swh/storage/algos/dir_iterators.py                 |  5 ++---
 swh/storage/algos/revisions_walker.py              |  2 +-
 swh/storage/api/serializers.py                     | 26 +++++++++++-----------
 swh/storage/backfill.py                            |  2 +-
 swh/storage/cassandra/cql.py                       |  2 +-
 swh/storage/cassandra/storage.py                   |  4 ++--
 swh/storage/in_memory.py                           |  2 +-
 swh/storage/interface.py                           |  2 +-
 swh/storage/migrate_extrinsic_metadata.py          | 14 ++++++------
 swh/storage/postgresql/converters.py               |  8 +++----
 swh/storage/postgresql/db.py                       |  2 +-
 swh/storage/postgresql/storage.py                  |  2 +-
 .../tests/migrate_extrinsic_metadata/test_cran.py  |  2 +-
 .../migrate_extrinsic_metadata/test_debian.py      |  2 +-
 .../migrate_extrinsic_metadata/test_deposit.py     |  2 +-
 .../tests/migrate_extrinsic_metadata/test_gnu.py   |  2 +-
 .../migrate_extrinsic_metadata/test_nixguix.py     |  2 +-
 .../tests/migrate_extrinsic_metadata/test_npm.py   |  2 +-
 .../tests/migrate_extrinsic_metadata/test_pypi.py  |  2 +-
 swh/storage/tests/storage_data.py                  |  4 ++--
 swh/storage/tests/storage_tests.py                 |  2 +-
 swh/storage/tests/test_postgresql_converters.py    |  2 +-
 23 files changed, 48 insertions(+), 50 deletions(-)
Changes applied before test
commit de7d539d089dd153da9a6fbf85ef8dae11ffdf2e
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Oct 7 11:22:43 2021 +0200

    serializers: Prepare rename of 'identifiers_enum' to 'swhids_enum'.
    
    This will be done in three steps to avoid any disruption:
    
    1. (this step) add support for decoding the new name, but keep encoding as the old one
    2. start encoding as the new name
    3. remove support for decoding the old name

commit ec1d7e8d7401365180b99a460f6746774a789156
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Oct 7 11:18:45 2021 +0200

    Rename imports of swh.model.identifiers to fix deprecation warnings.

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

This revision is now accepted and ready to land.Oct 8 2021, 1:53 PM

Build is green

Patch application report for D6433 (id=23436)

Could not rebase; Attempt merge onto 3441f68985...

Updating 3441f689..e9fd74d7
Fast-forward
 swh/storage/algos/diff.py                          |  5 ++---
 swh/storage/algos/dir_iterators.py                 |  5 ++---
 swh/storage/algos/revisions_walker.py              |  2 +-
 swh/storage/api/serializers.py                     | 26 +++++++++++-----------
 swh/storage/backfill.py                            |  2 +-
 swh/storage/cassandra/cql.py                       |  2 +-
 swh/storage/cassandra/storage.py                   |  4 ++--
 swh/storage/in_memory.py                           |  2 +-
 swh/storage/interface.py                           |  2 +-
 swh/storage/migrate_extrinsic_metadata.py          | 14 ++++++------
 swh/storage/postgresql/converters.py               |  8 +++----
 swh/storage/postgresql/db.py                       |  2 +-
 swh/storage/postgresql/storage.py                  |  2 +-
 .../tests/migrate_extrinsic_metadata/test_cran.py  |  2 +-
 .../migrate_extrinsic_metadata/test_debian.py      |  2 +-
 .../migrate_extrinsic_metadata/test_deposit.py     |  2 +-
 .../tests/migrate_extrinsic_metadata/test_gnu.py   |  2 +-
 .../migrate_extrinsic_metadata/test_nixguix.py     |  2 +-
 .../tests/migrate_extrinsic_metadata/test_npm.py   |  2 +-
 .../tests/migrate_extrinsic_metadata/test_pypi.py  |  2 +-
 swh/storage/tests/storage_data.py                  |  4 ++--
 swh/storage/tests/storage_tests.py                 |  2 +-
 swh/storage/tests/test_postgresql_converters.py    |  2 +-
 23 files changed, 48 insertions(+), 50 deletions(-)
Changes applied before test
commit e9fd74d72d0dacce5684a41a0ab78fbab394df55
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Oct 7 11:22:43 2021 +0200

    serializers: Prepare rename of 'identifiers_enum' to 'swhids_enum'.
    
    This will be done in three steps to avoid any disruption:
    
    1. (this step) add support for decoding the new name, but keep encoding as the old one
    2. start encoding as the new name
    3. remove support for decoding the old name

commit ea86a862c043a8709b1c1fa54d5231a1c8193286
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Oct 7 11:18:45 2021 +0200

    Rename imports of swh.model.identifiers to fix deprecation warnings.

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