1540894 - Follow-ups for fixing invalid remote items

Status: RESOLVED FIXED

(Firefox :: Sync, defect, P1)

Description

[Lina Butler [:lina]]

I missed a few things in bug 1482608:

• mirror.structure needs a compound primary key, so that it can store diverged structure.
• Multiple parent handling and reuploading/replacing needs tests.

This depends on https://github.com/mozilla/dogear/pull/34. Once that's merged, we can cut a Dogear release, bump the version, and re-vendor.

Comment 1

[Lina Butler [:lina]]

Attachment: Bug 1540894 - Vendor Dogear v0.2.3. r?tcsc

Comment 2

[Lina Butler [:lina]]

Attachment: Bug 1540894 - Store diverging structure in the bookmarks mirror. r?tcsc

This commit:

• Uses chunking to insert child GUIDs in storeRemoteFolder.
• Changes the mirror schema to store diverging structure, so that it
  can be passed to Dogear.
• Sorts remote items by GUID, so that diverging ones can be reparented
  in a deterministic order.
• Measures and logs the time taken to run the Rust merger.
• Adds tests for multiple parents and replacing invalid remote items.
• Fixes two tests in test_bookmark_structure_changes to ensure the
  remote structure is consistent.

Depends on D26274

Comment 3

[Lina Butler [:lina]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=c834f667b3bb6a6ffb88fcb50d7312a060381473

Comment 4

[Lina Butler [:lina]]

Rebased: https://treeherder.mozilla.org/#/jobs?repo=try&revision=346d4c18b3697af532d3188b31b83dfa02c52093

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/eea220d8fd4c
Vendor Dogear v0.2.3. r=tcsc
https://hg.mozilla.org/integration/autoland/rev/39c9c1e5dd57
Store diverging structure in the bookmarks mirror. r=tcsc

Comment 6

[Andreea Pavel [:apavel]]

https://hg.mozilla.org/mozilla-central/rev/eea220d8fd4c
https://hg.mozilla.org/mozilla-central/rev/39c9c1e5dd57

Comment 7

[Andreea Pavel [:apavel]]

https://hg.mozilla.org/mozilla-central/rev/eea220d8fd4c
https://hg.mozilla.org/mozilla-central/rev/39c9c1e5dd57