Skip to content

Always insert db_version in cache #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
somtochiama merged 1 commit into from
Mar 30, 2026
Merged

Always insert db_version in cache #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/rs/core/src/changes_vtab_write.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,8 +714,8 @@ unsafe fn merge_insert(
if res.is_ok() && !insert_site_id.is_empty() {
if let Err(rc) = insert_db_version((*tab).pExtData, insert_site_id, insert_db_vrsn) {
let err = CString::new(format!(
"Unable to insert db version {} for site id {:?}",
insert_db_vrsn, insert_site_id
"Unable to insert db version {} for site id {:?}: {:?}",
insert_db_vrsn, insert_site_id, rc
))?;
*errmsg = err.into_raw();
return Err(rc);
Expand Down
23 changes: 9 additions & 14 deletions core/rs/core/src/db_version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,22 +251,17 @@ pub fn insert_db_version(
reset_cached_stmt((*ext_data).pSetDbVersionStmt)?;
return Err(rc);
}
match (*ext_data).pSetDbVersionStmt.step() {
Ok(ResultCode::ROW) => {
last_db_versions.insert(
insert_site_id.to_vec(),
(*ext_data).pSetDbVersionStmt.column_int64(0),
);
}
Ok(_) => {}
Err(rc) => {
reset_cached_stmt((*ext_data).pSetDbVersionStmt)?;
return Err(rc);
}
}

let res = (*ext_data).pSetDbVersionStmt.step();
reset_cached_stmt((*ext_data).pSetDbVersionStmt)?;
if let Err(rc) = res {
return Err(rc);
}

// this is still the biggest db version we've seen in this transaction.
last_db_versions.insert(insert_site_id.to_vec(), insert_db_vrsn);
Ok(())
}
Ok(())
}

pub unsafe fn get_or_set_site_ordinal(
Expand Down
Loading