From abe3404953c5ffb9ea7d77b93f488f9fd933c827 Mon Sep 17 00:00:00 2001 From: Nikita Sivukhin Date: Thu, 21 Aug 2025 15:15:23 +0400 Subject: [PATCH] fix build --- bindings/rust/src/lib.rs | 3 ++- sync/engine/src/database_sync_engine.rs | 2 +- sync/engine/src/database_sync_operations.rs | 2 +- sync/engine/src/database_tape.rs | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bindings/rust/src/lib.rs b/bindings/rust/src/lib.rs index 0cdeab99e..9f0fa2f5a 100644 --- a/bindings/rust/src/lib.rs +++ b/bindings/rust/src/lib.rs @@ -191,8 +191,9 @@ impl Connection { .inner .lock() .map_err(|e| Error::MutexError(e.to_string()))?; - conn.wal_frame_count() + conn.wal_state() .map_err(|e| Error::WalOperationError(format!("wal_insert_begin failed: {e}"))) + .map(|state| state.max_frame) } #[cfg(feature = "conn_raw_api")] diff --git a/sync/engine/src/database_sync_engine.rs b/sync/engine/src/database_sync_engine.rs index 4c16970c7..faf43a776 100644 --- a/sync/engine/src/database_sync_engine.rs +++ b/sync/engine/src/database_sync_engine.rs @@ -349,7 +349,7 @@ impl DatabaseSyncEngine { // todo(sivukhin): push frames in multiple batches let generation = self.meta().synced_generation; let start_frame = self.meta().synced_frame_no.unwrap_or(0) + 1; - let end_frame = wal.conn().wal_frame_count()? + 1; + let end_frame = wal.conn().wal_state()?.max_frame + 1; match wal_push( coro, self.protocol.as_ref(), diff --git a/sync/engine/src/database_sync_operations.rs b/sync/engine/src/database_sync_operations.rs index 8621ffe3a..fa984d646 100644 --- a/sync/engine/src/database_sync_operations.rs +++ b/sync/engine/src/database_sync_operations.rs @@ -746,7 +746,7 @@ pub async fn transfer_physical_changes( let mut source_session = WalSession::new(source_conn.clone()); source_session.begin()?; - let source_frames_count = source_conn.wal_frame_count()?; + let source_frames_count = source_conn.wal_state()?.max_frame; assert!( source_frames_count >= source_wal_match_watermark, "watermark can't be greater than current frames count: {source_frames_count} vs {source_wal_match_watermark}", diff --git a/sync/engine/src/database_tape.rs b/sync/engine/src/database_tape.rs index 310327a03..cf62d0b53 100644 --- a/sync/engine/src/database_tape.rs +++ b/sync/engine/src/database_tape.rs @@ -191,7 +191,7 @@ pub struct DatabaseWalSession { impl DatabaseWalSession { pub async fn new(coro: &Coro, wal_session: WalSession) -> Result { let conn = wal_session.conn(); - let frames_count = conn.wal_frame_count()?; + let frames_count = conn.wal_state()?.max_frame; let mut page_size_stmt = conn.prepare("PRAGMA page_size")?; let Some(row) = run_stmt_expect_one_row(coro, &mut page_size_stmt).await? else { return Err(Error::DatabaseTapeError( @@ -217,7 +217,7 @@ impl DatabaseWalSession { } pub fn frames_count(&self) -> Result { - Ok(self.wal_session.conn().wal_frame_count()?) + Ok(self.wal_session.conn().wal_state()?.max_frame) } pub fn append_page(&mut self, page_no: u32, page: &[u8]) -> Result<()> {