1253482 - Make sure that remote deleted records are always acknowledged

Status: RESOLVED FIXED

(Firefox for iOS :: Sync, defect)

Description

[Richard Newman [:rnewman]]

Before fixing Bug 1253458, some local deletions ended up in the buffer:

sqlite> select guid, type, is_deleted, server_modified from bookmarksBuffer;
guid          type        is_deleted  server_modified
------------  ----------  ----------  ---------------
EK3lcNd0sUFN  1           1           1457049548720
KO40n6dkKEOO  1           1           1457049548720
87zjNtVGPtEp  1           1           1457049816420
1WJIi9EjQErp  1           1           1457050163160


Those changes seem to stick around after a sync. This is a great opportunity to make sure that remote deletions that are no-ops are dropped from the buffer.

The consequence of not doing so: our short-circuiting code looks for empty buffer + empty local. In this case the buffer isn't empty, so we'll do a three-way merge every time we sync.

Comment 1

[Richard Newman [:rnewman]]

Attachment: Pull req.

Stack 'em high.

The thinking here is explained in the comment. I'm actually quite pleased by each of these bugs: they're all safe, self-recovering failure modes.

Comment 2

[Richard Newman [:rnewman]]

7259073

Comment 3

[Stephan Leroux [:sleroux]]

v3.x 93d711d