Repository navigation
fix(NativeTreeStore): Don't drop statements when a batch fails - #2385
Closed
kenrestivo wants to merge 1 commit into
Closed
kenrestivo wants to merge 1 commit into
kenrestivo wants to merge 1 commit into
Conversation
flushNow emptied the queue before NativeDatabase.batch ran, so a failed transaction lost its rows for good while the in-memory tree kept the items. The native UI reads only the rows, so folders showed up empty, and the next load hydrated the tree from the incomplete rows. Put the statements back in front of the queue on failure, chain each batch to the previous one so the retry keeps its order, and let flush() write whatever a failed batch left queued. Same fix as ffbf7f9 for NativeCacheStore. Assisted-by: ClaudeCode:claude-opus-5.5
Member
|
Ah, damn. Thank you for taking the time to implement this fix! |
Member
|
I think we need flush() to pass the error on, and load() shouldn't really rebuild the tree over statements that are still queued. The cache store already handles both of these. |
Member
|
I hope you don't mind, I've committed this myself and added a test :) Thank you still for raising this, I forgot to make this change! |
This file contains hidden or 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
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.
On Android, since late September's release, using WebDAV, Floccus only showed "there are no bookmarks here" when there were hundreds.
flushNow emptied the queue before NativeDatabase.batch ran, so a failed transaction lost its rows for good while the in-memory tree kept the items. The native UI reads only the rows, so folders showed up empty, and the next load hydrated the tree from the incomplete rows.
Put the statements back in front of the queue on failure, chain each batch to the previous one so the retry keeps its order, and let flush() write whatever a failed batch left queued. Same fix as ffbf7f9 for NativeCacheStore.
Assisted-by: ClaudeCode:claude-opus-5.5