Page MenuHomeSoftware Heritage

Remove conflict_update/policy_update option.
AbandonedPublic

Authored by vlorentz on Nov 3 2020, 1:05 PM.

Details

Reviewers
ardumont
Group Reviewers
Reviewers
Summary

By removing the False/ignore-dups behavior, which we didn't use.

The main motivation is to make _add endpoints write to Kafka in a
future commit, as Kafka's semantics are closer to True/update-dups
than False/ignore-dups.

Diff Detail

Event Timeline

remove changes that weren't supposed to be committed.

Build is green

Patch application report for D4397 (id=15579)

Rebasing onto 94c8259193...

Current branch diff-target is up to date.
Changes applied before test
commit 93d970dbb7c29390518b7307902547f5e7e68c0b
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Nov 3 12:50:31 2020 +0100

    Remove conflict_update/policy_update option.
    
    By removing the False/ignore-dups behavior, which we didn't use.
    
    The main motivation is to make `_add` endpoints write to Kafka in a
    future commit, as Kafka's semantics are closer to True/update-dups
    than False/ignore-dups.

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

Build is green

Patch application report for D4397 (id=15580)

Rebasing onto 94c8259193...

Current branch diff-target is up to date.
Changes applied before test
commit 6e8a901b95f3852a1b90611b1e1068d79ae6063d
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Nov 3 12:50:31 2020 +0100

    Remove conflict_update/policy_update option.
    
    By removing the False/ignore-dups behavior, which we didn't use.
    
    The main motivation is to make `_add` endpoints write to Kafka in a
    future commit, as Kafka's semantics are closer to True/update-dups
    than False/ignore-dups.

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

fix typo in version number

Build is green

Patch application report for D4397 (id=15583)

Rebasing onto 94c8259193...

Current branch diff-target is up to date.
Changes applied before test
commit 6022e53417f104f7ddd642d3c20ce7f8a98b6e3e
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Nov 3 12:50:31 2020 +0100

    Remove conflict_update/policy_update option.
    
    By removing the False/ignore-dups behavior, which we didn't use.
    
    The main motivation is to make `_add` endpoints write to Kafka in a
    future commit, as Kafka's semantics are closer to True/update-dups
    than False/ignore-dups.

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

ardumont requested changes to this revision.Nov 3 2020, 2:05 PM
ardumont added a subscriber: ardumont.

for the sake of some remarks inline.

Otherwise, lgtm.

sql/upgrades/133.sql
9
drop function swh_content_mimetype_add(conflict_update boolean);
66

Beware, there is an inconsistency between the upgrade part here and the main 50-func.sql declaration below?

Why the inconsistency with the other _add function (no on conflict here).


Also do we want to keep that code again?

Since you are cleaning up code that does not run, i guess those no longer used ctags code could be cleaned up (in another diff) as well.

swh/indexer/sql/50-func.sql
44

drop one overwriting too many

This revision now requires changes to proceed.Nov 3 2020, 2:05 PM

also it's too long a diff...

hold on, I can split it in two

sql/upgrades/133.sql
66

because I messed up my copy-pasting. As for removing it: I don't know.

Replaced by D4401 and D4400 (yes, in that order)