GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 22:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

zero out graves before comparison, instead of at creation

Browse source 
Will allow us to turn the check back on in the future without a client
update
This commit is contained in:
Damien Elmes 2021-06-30 10:08:52 +10:00
parent 3ee18fb854
commit 79ec9b14b1
2 changed files with 6 additions and 5 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,10 +48,7 @@ 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")?,
// clients on schema 17 and below may send duplicate graves: self.table_count("graves")?,
// 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")?,

6
rslib/src/sync/server.rs
View file

@ -149,9 +149,13 @@ 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> {
let mut server = self.col.storage.sanity_check_info()?;
client.counts = Default::default(); client.counts = Default::default();
// 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.
client.graves = 0; client.graves = 0;
let server = self.col.storage.sanity_check_info()?; server.graves = 0;
Ok(SanityCheckResponse { Ok(SanityCheckResponse {
status: if client == server { status: if client == server {
SanityCheckStatus::Ok SanityCheckStatus::Ok