facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-05 14:28:17 +03:00
Code Issues Projects Releases Wiki Activity

mononoke: fix DeletedManifest to child step in walker

Browse Source 
Summary:
It was mistakenly mapping deleted manifest id to a unode id.

I'm surprised the walk.rs code that constructs the DeletedManifestToDeletedManifestChild edge built with this bug. The DeletedManifestId and ManifestUnodeId types presumably coerce to each other.

Reviewed By: markbt

Differential Revision: D25120994

fbshipit-source-id: 1b53037808779c345c163ef32324961938078fc7
This commit is contained in:
Alex Hornby 2020-11-20 10:27:59 -08:00 committed by Facebook GitHub Bot
parent 444289c5d0
commit 5a6ccc9188
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eden/mononoke/tests/integration/test-walker-count-objects.t
View File

@ -140,7 +140,7 @@ count-objects, deep walk across blame
count-objects, shallow walk across deleted files manifest
$ mononoke_walker --readonly-storage scrub -q --bookmark master_bookmark -I shallow -i bonsai -i derived_deleted_manifest -X ChangesetToFileContent 2>&1 | strip_glog
Walking roots * (glob)
Walking edge types [BookmarkToChangeset, ChangesetToDeletedManifestMapping, DeletedManifestMappingToRootDeletedManifest]
Walking edge types [BookmarkToChangeset, ChangesetToDeletedManifestMapping, DeletedManifestMappingToRootDeletedManifest, DeletedManifestToDeletedManifestChild]
Walking node types [Bookmark, Changeset, DeletedManifest, DeletedManifestMapping]
Final count: (4, 4)
Bytes/s,* (glob)
@ -149,7 +149,7 @@ count-objects, shallow walk across deleted files manifest
count-objects, deep walk across deleted files manifest
$ mononoke_walker --readonly-storage scrub -q --bookmark master_bookmark -I deep -i bonsai -i derived_deleted_manifest 2>&1 | strip_glog
Walking roots * (glob)
Walking edge types [BookmarkToChangeset, ChangesetToBonsaiParent, ChangesetToDeletedManifestMapping, DeletedManifestMappingToRootDeletedManifest, DeletedManifestToLinkedChangeset]
Walking edge types [BookmarkToChangeset, ChangesetToBonsaiParent, ChangesetToDeletedManifestMapping, DeletedManifestMappingToRootDeletedManifest, DeletedManifestToDeletedManifestChild, DeletedManifestToLinkedChangeset]
Walking node types [Bookmark, Changeset, DeletedManifest, DeletedManifestMapping]
Final count: (8, 8)
Bytes/s,* (glob)

2
eden/mononoke/walker/src/graph.rs
View File

@ -315,7 +315,7 @@ create_graph!(
(
DeletedManifest,
PathKey<DeletedManifestId>,
[DeletedManifestChild(UnodeManifest), LinkedChangeset(Changeset)]
[DeletedManifestChild(DeletedManifest), LinkedChangeset(Changeset)]
),
(DeletedManifestMapping, ChangesetId, [RootDeletedManifest(DeletedManifest)]),
(