aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-01-19 16:14:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'Fix database header contents on initialization' from Pere Diaz Bou

Browse Source 
After moving page1 write to be async I moved the contents update to
wrong place. This should fix it.
Fixes #1842
Fixes #1837

Closes #1860
This commit is contained in:
Pekka Enberg
2025-06-27 12:47:31 +03:00
parent 81609845ba 8e0f8041ed
commit c414db2196
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/storage/pager.rs
View File

@@ -1004,9 +1004,13 @@ impl Pager {
AllocatePage1State::Start => {
tracing::trace!("allocate_page1(Start)");
self.is_empty.store(DB_STATE_INITIALIZING, Ordering::SeqCst);
let default_header = DatabaseHeader::default();
let mut default_header = DatabaseHeader::default();
default_header.database_size += 1;
let page = allocate_page(1, &self.buffer_pool, 0);
let contents = page.get_contents();
contents.write_database_header(&default_header);
let page1 = Arc::new(BTreePageInner {
page: RefCell::new(page),
});
@@ -1039,11 +1043,7 @@ impl Pager {
return Ok(CursorResult::IO);
}
tracing::trace!("allocate_page1(Writing done)");
let mut default_header = DatabaseHeader::default();
default_header.database_size += 1;
let page1_ref = page.get();
let contents = page1_ref.get().contents.as_mut().unwrap();
contents.write_database_header(&default_header);
let page_key = PageCacheKey::new(page1_ref.get().id);
let mut cache = self.page_cache.write();
cache.insert(page_key, page1_ref.clone()).map_err(|e| {