Paths

Table of Contentst

Differential D5951

model: make deduplication optional when iterating over the merkle tree
ClosedPublic
Actions

Authored by DanSeraf on Jun 30 2021, 4:21 PM.

Details

Reviewers

zack

Group Reviewers

Reviewers

Maniphest Tasks

T3349: use swh.model.merkle/from_disk instead of swh.scanner.model

Commits

rDMOD153c6e84421b: make deduplication optional when iterating over the merkle tree

Summary

Related to T3349

Diff Detail

Repository

rDMOD Data model

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

DanSeraf created this revision.Jun 30 2021, 4:21 PM

Herald added a reviewer: Reviewers. · View Herald TranscriptJun 30 2021, 4:21 PM

Build is green

Patch application report for D5951 (id=21375)

Rebasing onto cfb3073c27...

First, rewinding head to replay your work on top of it...
Applying: make deduplication optional when iterating over the merkle tree

Changes applied before test

commit 0406067e666ff4c2af158fd08b50bd5d1b0c4f91
Author: Daniele Serafini <me@danieleserafini.eu>
Date:   Tue Jun 29 13:42:54 2021 +0100

    make deduplication optional when iterating over the merkle tree

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

Harbormaster completed remote builds in B22354: Diff 21375.Jun 30 2021, 4:24 PM

DanSeraf requested review of this revision.Jun 30 2021, 4:24 PM

only minor changes requested to the docstring on my part

swh/model/merkle.py
279–283	this docstring should be updated, stating it deduplicate s(or not) depending on dedup's value
289–291	this is a nice solution that avoids creating a separate iteration function that does not deduplicate !

This revision now requires changes to proceed.Jul 1 2021, 8:27 PM

zack added inline comments.Jul 1 2021, 8:31 PM

swh/model/tests/test_merkle.py
175	maybe you can rename this test case to `test_iter_tree_with_deduplication`, for clearer output wrt the newly added one

DanSeraf added a child revision: D5926: swh.scanner: use model.from_disk instead of scanner.model to store a source code project.Jul 2 2021, 9:33 AM

requested changes

Build is green

Patch application report for D5951 (id=21421)

Rebasing onto cfb3073c27...

First, rewinding head to replay your work on top of it...
Applying: make deduplication optional when iterating over the merkle tree

Changes applied before test

commit c4432994755b57d9a87fd3eecdbcb612472be375
Author: Daniele Serafini <me@danieleserafini.eu>
Date:   Tue Jun 29 13:42:54 2021 +0100

    make deduplication optional when iterating over the merkle tree

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

Harbormaster completed remote builds in B22399: Diff 21421.Jul 2 2021, 10:15 AM

zack accepted this revision.Jul 2 2021, 10:16 AM

This revision is now accepted and ready to land.Jul 2 2021, 10:16 AM

rebase

Build is green

Patch application report for D5951 (id=21432)

Rebasing onto cfb3073c27...

Current branch diff-target is up to date.

Changes applied before test

commit 153c6e84421b2186bb17a35abe866a4eac3c1359
Author: Daniele Serafini <me@danieleserafini.eu>
Date:   Tue Jun 29 13:42:54 2021 +0100

    make deduplication optional when iterating over the merkle tree

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

Harbormaster completed remote builds in B22410: Diff 21432.Jul 2 2021, 11:55 AM

Closed by commit rDMOD153c6e84421b: make deduplication optional when iterating over the merkle tree (authored by DanSeraf). · Explain WhyJul 2 2021, 11:55 AM

This revision was automatically updated to reflect the committed changes.

DanSeraf added a commit: rDMOD153c6e84421b: make deduplication optional when iterating over the merkle tree.