langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ignore graves in sanity check

Browse Source
This commit is contained in:
Damien Elmes 2021-06-30 09:31:02 +10:00
parent 0f7a230fd8
commit 3ee18fb854
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rslib/src/storage/sync_check.rs
View File

@ -48,7 +48,10 @@ impl SqliteStorage {
cards: self.table_count("cards")?, cards: self.table_count("cards")?,
notes: self.table_count("notes")?, notes: self.table_count("notes")?,
revlog: self.table_count("revlog")?, revlog: self.table_count("revlog")?,
graves: self.table_count("graves")?, // clients on schema 17 and below may send duplicate
// deletion markers, so we can't compare graves until
// the minimum syncing version is schema 18.
graves: 0,
notetypes: self.table_count("notetypes")?, notetypes: self.table_count("notetypes")?,
decks: self.table_count("decks")?, decks: self.table_count("decks")?,
deck_config: self.table_count("deck_config")?, deck_config: self.table_count("deck_config")?,

1
rslib/src/sync/server.rs
View File

@ -150,6 +150,7 @@ impl SyncServer for LocalServer {
async fn sanity_check(&mut self, mut client: SanityCheckCounts) -> Result<SanityCheckResponse> { async fn sanity_check(&mut self, mut client: SanityCheckCounts) -> Result<SanityCheckResponse> {
client.counts = Default::default(); client.counts = Default::default();
client.graves = 0;
let server = self.col.storage.sanity_check_info()?; let server = self.col.storage.sanity_check_info()?;
Ok(SanityCheckResponse { Ok(SanityCheckResponse {
status: if client == server { status: if client == server {