Page MenuHomeSoftware Heritage

Add content_metadata_{add,get}.
ClosedPublic

Authored by vlorentz on Thu, Jun 25, 5:56 PM.

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

vlorentz created this revision.Thu, Jun 25, 5:56 PM

Build is green

Patch application report for D3357 (id=11906)

Could not rebase; Attempt merge onto b991e69707...

Auto-merging swh/storage/tests/test_storage.py
Merge made by the 'recursive' strategy.
 sql/upgrades/156.sql               |  42 ++++++++
 swh/storage/cassandra/cql.py       |  90 +++++++++-------
 swh/storage/cassandra/schema.py    |  46 ++++++--
 swh/storage/cassandra/storage.py   | 149 ++++++++++++++++++++------
 swh/storage/db.py                  | 132 ++++++++++++++---------
 swh/storage/extrinsic_metadata.py  |  57 ++++++++++
 swh/storage/in_memory.py           | 113 +++++++++++++++++---
 swh/storage/interface.py           |  71 ++++++++++++-
 swh/storage/sql/30-swh-schema.sql  |  48 ++++++---
 swh/storage/sql/60-swh-indexes.sql |  18 ++--
 swh/storage/storage.py             | 211 ++++++++++++++++++++++++++++++-------
 swh/storage/tests/storage_data.py  |  61 ++++++++++-
 swh/storage/tests/test_storage.py  | 184 ++++++++++++++++++++++++++++++++
 13 files changed, 1010 insertions(+), 212 deletions(-)
 create mode 100644 sql/upgrades/156.sql
 create mode 100644 swh/storage/extrinsic_metadata.py
Changes applied before test
commit c01e461d44e8af07faaf0e9d05a267a0f9144cd9
Merge: b991e697 98b10700
Author: Jenkins user <jenkins@localhost>
Date:   Thu Jun 25 16:02:14 2020 +0000

    Merge branch 'diff-target' into HEAD

commit 98b10700c3b39cd353db7185ec0357a900eb57ab
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 25 17:55:55 2020 +0200

    Add content_metadata_{add,get}.

commit 9a3d58855cd07a321699bbb72eeb440d219e0daf
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 25 17:53:06 2020 +0200

    Add context columns to object_metadata table and object_metadata_{add,get}.
    
    Not used/tested yet; will be used when I introduce content_metadata_{get,add}.

commit feb1b53057b02cc794f04e95f12c5b57c9b1ae5b
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 25 17:42:31 2020 +0200

    Generalize origin_metadata to allow support for other object types in the future.

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

Build is green

Patch application report for D3357 (id=11908)

Rebasing onto b991e69707...

First, rewinding head to replay your work on top of it...
Applying: Generalize origin_metadata to allow support for other object types in the future.
Applying: Add context columns to object_metadata table and object_metadata_{add,get}.
Applying: Add content_metadata_{add,get}.
Changes applied before test
commit 2ed9d8bab7ebb9494b42a81291a00defb3fddcbc
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 25 17:55:55 2020 +0200

    Add content_metadata_{add,get}.

commit 2e30e71ed29fb911d9b616afdd567e82aaad9ea1
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 25 17:53:06 2020 +0200

    Add context columns to object_metadata table and object_metadata_{add,get}.
    
    Not used/tested yet; will be used when I introduce content_metadata_{get,add}.

commit e903b4998fb6fc4f8f1f99438dd836bf459843c6
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 25 17:42:31 2020 +0200

    Generalize origin_metadata to allow support for other object types in the future.

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

This comment was removed by ardumont.
ardumont added a comment.EditedFri, Jun 26, 4:20 PM

This comment was removed by ardumont.

which was:

Maybe abandon or "plan changes" this one now that you split it in 3?
That'd make one less diff to review in the pipe.

hmmph, sorry, that was meant for D3247...

Build is green

Patch application report for D3357 (id=11950)

Could not rebase; Attempt merge onto 10443b8a17...

Auto-merging swh/storage/tests/test_storage.py
Auto-merging swh/storage/storage.py
Auto-merging swh/storage/interface.py
Auto-merging swh/storage/in_memory.py
Auto-merging swh/storage/db.py
Auto-merging swh/storage/cassandra/storage.py
Auto-merging swh/storage/cassandra/cql.py
Merge made by the 'recursive' strategy.
 sql/upgrades/156.sql               |  59 +++++++++++
 swh/storage/cassandra/cql.py       | 107 +++++++++++--------
 swh/storage/cassandra/schema.py    |  46 +++++++--
 swh/storage/cassandra/storage.py   | 151 +++++++++++++++++++++------
 swh/storage/db.py                  | 132 +++++++++++++++---------
 swh/storage/extrinsic_metadata.py  |  57 +++++++++++
 swh/storage/in_memory.py           | 114 +++++++++++++++++----
 swh/storage/interface.py           |  71 ++++++++++++-
 swh/storage/sql/30-swh-schema.sql  |  48 +++++----
 swh/storage/sql/60-swh-indexes.sql |  18 ++--
 swh/storage/storage.py             | 203 ++++++++++++++++++++++++++++++-------
 swh/storage/tests/storage_data.py  |  61 ++++++++++-
 swh/storage/tests/test_storage.py  | 184 +++++++++++++++++++++++++++++++++
 13 files changed, 1032 insertions(+), 219 deletions(-)
 create mode 100644 sql/upgrades/156.sql
 create mode 100644 swh/storage/extrinsic_metadata.py
Changes applied before test
commit 96067443e95226407d863b8afe113818d0ed1a68
Merge: 10443b8a 5cea3c01
Author: Jenkins user <jenkins@localhost>
Date:   Mon Jun 29 10:01:30 2020 +0000

    Merge branch 'diff-target' into HEAD

commit 5cea3c0188a717bcc7f22cc79027e445315fd7e8
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 25 17:55:55 2020 +0200

    Add content_metadata_{add,get}.

commit a7156c7592472221582c8ccc60630a56fd8767e0
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 25 17:53:06 2020 +0200

    Add context columns to object_metadata table and object_metadata_{add,get}.
    
    Not used/tested yet; will be used when I introduce content_metadata_{get,add}.

commit 35f7ef913b42e5ac15eb19be2ff9ec99fa07f548
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 25 17:42:31 2020 +0200

    Generalize origin_metadata to allow support for other object types in the future.

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

Build is green

Patch application report for D3357 (id=11965)

Could not rebase; Attempt merge onto 10443b8a17...

Updating 10443b8a..6d97cf06
Fast-forward
 sql/upgrades/156.sql               |  63 ++++++++++++
 swh/storage/cassandra/cql.py       | 107 +++++++++++--------
 swh/storage/cassandra/schema.py    |  46 +++++++--
 swh/storage/cassandra/storage.py   | 151 +++++++++++++++++++++------
 swh/storage/db.py                  | 132 +++++++++++++++---------
 swh/storage/extrinsic_metadata.py  |  57 +++++++++++
 swh/storage/in_memory.py           | 114 +++++++++++++++++----
 swh/storage/interface.py           |  71 ++++++++++++-
 swh/storage/sql/30-swh-schema.sql  |  49 +++++----
 swh/storage/sql/60-swh-indexes.sql |  18 ++--
 swh/storage/storage.py             | 203 ++++++++++++++++++++++++++++++-------
 swh/storage/tests/storage_data.py  |  61 ++++++++++-
 swh/storage/tests/test_storage.py  | 184 +++++++++++++++++++++++++++++++++
 13 files changed, 1037 insertions(+), 219 deletions(-)
 create mode 100644 sql/upgrades/156.sql
 create mode 100644 swh/storage/extrinsic_metadata.py
Changes applied before test
commit 6d97cf06a7692872c5f409037ac893f0a3ce9073
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 25 17:55:55 2020 +0200

    Add content_metadata_{add,get}.

commit b8c986507d0d2de2290d69908140cc713c828211
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 25 17:53:06 2020 +0200

    Add context columns to object_metadata table and object_metadata_{add,get}.
    
    Not used/tested yet; will be used when I introduce content_metadata_{get,add}.

commit 595d5462e14f010b6acae3e87ff6aa7ce75ae8ce
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 25 17:42:31 2020 +0200

    Generalize origin_metadata to allow support for other object types in the future.

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

ardumont accepted this revision.Tue, Jun 30, 11:43 AM

Looks good and consistent with the other diffs it's built on.

This revision is now accepted and ready to land.Tue, Jun 30, 11:43 AM

Build is green

Patch application report for D3357 (id=11982)

Could not rebase; Attempt merge onto 1f0e25615e...

Updating 1f0e2561..ffe6b925
Fast-forward
 sql/upgrades/157.sql               |  63 ++++++++++++
 swh/storage/cassandra/cql.py       | 107 +++++++++++--------
 swh/storage/cassandra/schema.py    |  46 +++++++--
 swh/storage/cassandra/storage.py   | 151 +++++++++++++++++++++------
 swh/storage/db.py                  | 132 +++++++++++++++---------
 swh/storage/extrinsic_metadata.py  |  55 ++++++++++
 swh/storage/in_memory.py           | 114 +++++++++++++++++----
 swh/storage/interface.py           |  71 ++++++++++++-
 swh/storage/sql/30-swh-schema.sql  |  49 +++++----
 swh/storage/sql/60-swh-indexes.sql |  18 ++--
 swh/storage/storage.py             | 204 ++++++++++++++++++++++++++++++-------
 swh/storage/tests/storage_data.py  |  61 ++++++++++-
 swh/storage/tests/test_storage.py  | 184 +++++++++++++++++++++++++++++++++
 13 files changed, 1036 insertions(+), 219 deletions(-)
 create mode 100644 sql/upgrades/157.sql
 create mode 100644 swh/storage/extrinsic_metadata.py
Changes applied before test
commit ffe6b9253ecc170a68d3754c7326da3e4ab9e948
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 25 17:55:55 2020 +0200

    Add content_metadata_{add,get}.

commit 869679a85c55c07811c6cb156fac0eba226a6be8
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 25 17:53:06 2020 +0200

    Add context columns to object_metadata table and object_metadata_{add,get}.
    
    Not used/tested yet; will be used when I introduce content_metadata_{get,add}.

commit 27e942621cef91cea6a98ffcc7beed5935714fe8
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 25 17:42:31 2020 +0200

    Generalize origin_metadata to allow support for other object types in the future.

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

This revision was automatically updated to reflect the committed changes.