fix: Handle deletion/move after move on macOS #2336
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
taratatach
force-pushed
the
fix/chokidar-handles-deletion-and-move-after-complete-move
branch
2 times, most recently
from
8e97658 to
dbf3b75
Compare
When a file or directory is moved on the local filesystem on macOS and then deleted (or moved again), then the second deletion event will find an existing document in PouchDB as the deleted document still has the same inode but this document has an outdated path as the first move has not yet been merged. This would lead to the incorrect detection of the deletion of the file or directory at its initial path which would overwrite the first move and lead to unexpected results. We were already handling this situation when the second move was very close to the first one (i.e. the second move would occur before we had the time to compute the checksum of the moved file) but we were not handling it properly when the second move was occurring slightly later (i.e. a few seconds, less than 10 or the first move would be flushed). We will now make sure to remove the second deletion event's `old` Pouch document in this situation as it is outdated and rely on the path of events to match them.
When processing Chokidar events, we can either: - detect a new change - update an existing change (e.g. turn a deletion into a move) - do nothing Each time we detect a new change, we store it in a map using its `path` as key so we can find it later and group it with another event. In this case, we update the change in place and store it again in the map using its new `path` as key. However, when the new and old `path` differ (e.g. when turning a deletion into a move), we would leave an entry with the old `path` in the map. This could lead to unexpected behavior if later events target that path altough the existing change it maps to is about a document that does not exist there anymore. Therefore we'll now look for entries mapping to the updated change and remove them before adding the new one.
taratatach
force-pushed
the
fix/chokidar-handles-deletion-and-move-after-complete-move
branch
from
dbf3b75 to
296c175
Compare
taratatach
changed the title
taratatach
force-pushed
the
fix/chokidar-handles-deletion-and-move-after-complete-move
branch
2 times, most recently
from
8489018 to
296c175
Compare
taratatach
deleted the
fix/chokidar-handles-deletion-and-move-after-complete-move
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please make sure the following boxes are checked: