diff --git a/src/engine/io/constraint_manager.rs b/src/engine/io/constraint_manager.rs index d571dba..af4436c 100644 --- a/src/engine/io/constraint_manager.rs +++ b/src/engine/io/constraint_manager.rs @@ -73,7 +73,7 @@ impl ConstraintManager { for c in &table.constraints { match c { crate::engine::objects::Constraint::PrimaryKey(p) => { - //So for a primary key we have to check for no other dups in the table + //TODO So for a primary key we have to check for no other dups in the table //So what I want to do is ask the index manager to to get active rows matching the key } @@ -82,13 +82,13 @@ impl ConstraintManager { Ok(self .vis_row_man - .insert_row(current_tran_id, &table, user_data) + .insert_row(current_tran_id, table, user_data) .await?) } /// Gets a specific tuple from below, at the moment just a passthrough pub async fn get( - &self, + &mut self, tran_id: TransactionId, table: &Arc, row_pointer: ItemPointer, diff --git a/src/engine/io/index_manager.rs b/src/engine/io/index_manager.rs index c04395d..db9876e 100644 --- a/src/engine/io/index_manager.rs +++ b/src/engine/io/index_manager.rs @@ -25,7 +25,6 @@ use super::page_formats::{PageId, PageType}; use super::row_formats::ItemPointer; use crate::engine::io::format_traits::Serializable; use crate::engine::io::index_formats::BTreeBranch; -use crate::engine::io::SelfEncodedSize; use crate::engine::objects::{Index, SqlTuple}; use std::num::TryFromIntError; use std::sync::Arc; @@ -77,8 +76,6 @@ impl IndexManager { return Ok(()); } - debug!("expand offset {0}", page_offset); - //Lock the leafs left and right if they exist let left_neighbor = leaf.left_node; let left_page = match left_neighbor { @@ -157,12 +154,12 @@ impl IndexManager { return Ok(()); } else { //Need to split the branch and move up a level - let (middle_key, new_right) = - b.add_and_split(new_left_offset, split_key, new_right_offset)?; - let (new_right_offset, new_right_guard) = self.file_manager.get_next_offset_non_zero(&page_id).await?; + let (middle_key, new_right) = + b.add_and_split(new_left_offset, split_key, new_right_offset)?; + self.file_manager .update_page(new_right_guard, new_right.serialize_and_pad()) .await?; @@ -192,15 +189,13 @@ impl IndexManager { page_type: PageType::Data, }; - let (mut first_page, first_guard) = + let (mut first_page, _first_guard) = self.file_manager.get_page(&page_id, &PageOffset(0)).await?; let first_node = BTreeFirstPage::parse(&mut first_page)?; let mut current_offset = first_node.root_offset; loop { - debug!("scan {0}", current_offset); - - let (mut current_page, current_guard) = self + let (mut current_page, _current_guard) = self .file_manager .get_page(&page_id, ¤t_offset) .await?; diff --git a/src/engine/io/page_formats/page_header.rs b/src/engine/io/page_formats/page_header.rs index b53faf6..08549e9 100644 --- a/src/engine/io/page_formats/page_header.rs +++ b/src/engine/io/page_formats/page_header.rs @@ -106,6 +106,18 @@ mod tests { use super::*; + #[test] + fn sizes_match() -> Result<(), Box> { + let mut test = PageHeader::new(); + let calc_len = PageHeader::encoded_size(); + + let mut buffer = BytesMut::new(); + test.serialize(&mut buffer); + + assert_eq!(calc_len, buffer.freeze().len()); + Ok(()) + } + #[test] fn test_roundtrip() -> Result<(), Box> { let test = PageHeader::new(); diff --git a/src/engine/io/row_manager.rs b/src/engine/io/row_manager.rs index cb7ef04..1b0a5ca 100644 --- a/src/engine/io/row_manager.rs +++ b/src/engine/io/row_manager.rs @@ -33,7 +33,7 @@ impl RowManager { } pub async fn insert_row( - self, + &self, current_tran_id: TransactionId, table: &Arc
, user_data: SqlTuple, @@ -45,7 +45,7 @@ impl RowManager { //Note this is a logical delete //TODO debating if this should respect the visibility map, probably yes just trying to limit the pain pub async fn delete_row( - self, + &self, current_tran_id: TransactionId, table: &Arc
, row_pointer: ItemPointer, @@ -179,7 +179,7 @@ impl RowManager { // Provides an unfiltered view of the underlying table pub fn get_stream( - self, + &self, table: &Arc
, ) -> impl Stream> { let page_id = PageId { @@ -187,7 +187,7 @@ impl RowManager { page_type: PageType::Data, }; - let file_manager = self.file_manager; + let file_manager = self.file_manager.clone(); let table = table.clone(); try_stream! { @@ -248,7 +248,7 @@ impl RowManager { Err(_) => { //We got here because we asked for an offset that didn't exist yet. let (new_page_offset, new_page_guard) = - self.file_manager.get_next_offset_non_zero(&page_id).await?; + self.file_manager.get_next_offset(&page_id).await?; let mut new_page = PageData::new(new_page_offset); let new_row_pointer = new_page.insert(current_tran_id, table, user_data)?; //TODO Will NOT handle overly large rows @@ -291,6 +291,12 @@ mod tests { use crate::engine::get_row; use crate::engine::get_table; use futures::pin_mut; + use log::LevelFilter; + use simplelog::ColorChoice; + use simplelog::CombinedLogger; + use simplelog::Config; + use simplelog::TermLogger; + use simplelog::TerminalMode; use tempfile::TempDir; use tokio_stream::StreamExt; @@ -349,19 +355,17 @@ mod tests { let table = get_table(); let fm = Arc::new(FileManager2::new(tmp_dir.clone())?); let fsm = FreeSpaceManager::new(fm.clone()); - let rm = RowManager::new(fm, fsm); + let mut rm = RowManager::new(fm, fsm); let tran_id = TransactionId::new(1); let insert_pointer = rm - .clone() .insert_row(tran_id, &table, get_row("test".to_string())) .await?; let tran_id_2 = TransactionId::new(3); let update_pointer = rm - .clone() .update_row( tran_id_2, &table, @@ -372,19 +376,12 @@ mod tests { //Now let's make sure the update took pin_mut!(rm); - let result_rows: Vec = rm - .clone() - .get_stream(&table) - .map(Result::unwrap) - .collect() - .await; + let result_rows: Vec = rm.get_stream(&table).map(Result::unwrap).collect().await; assert_eq!(result_rows.len(), 2); let tran_id_3 = TransactionId::new(3); - rm.clone() - .delete_row(tran_id_3, &table, update_pointer) - .await?; + rm.delete_row(tran_id_3, &table, update_pointer).await?; Ok(()) } diff --git a/src/engine/io/visible_row_manager.rs b/src/engine/io/visible_row_manager.rs index b56d059..d365dec 100644 --- a/src/engine/io/visible_row_manager.rs +++ b/src/engine/io/visible_row_manager.rs @@ -33,7 +33,7 @@ impl VisibleRowManager { } pub async fn insert_row( - self, + &self, current_tran_id: TransactionId, table: &Arc
, user_data: SqlTuple, @@ -45,14 +45,14 @@ impl VisibleRowManager { } pub async fn get( - &self, + &mut self, tran_id: TransactionId, table: &Arc
, row_pointer: ItemPointer, ) -> Result { let row = self.row_manager.get(table, row_pointer).await?; - if VisibleRowManager::is_visible(self.tran_manager.clone(), tran_id, &row).await? { + if VisibleRowManager::is_visible(&mut self.tran_manager, tran_id, &row).await? { Ok(row) } else { Err(VisibleRowManagerError::NotVisibleRow(row)) @@ -61,22 +61,19 @@ impl VisibleRowManager { // Provides a filtered view that respects transaction visability pub fn get_stream( - self, + &self, tran_id: TransactionId, table: &Arc
, ) -> impl Stream> { + let rm = self.row_manager.clone(); + let mut tm = self.tran_manager.clone(); let table = table.clone(); try_stream! { - let tm = self.tran_manager; - - for await row in self.row_manager.get_stream(&table) { + for await row in rm.get_stream(&table) { let unwrap_row = row?; - if VisibleRowManager::is_visible(tm.clone(), tran_id, &unwrap_row).await? { - debug!("Found visible row {:?}", unwrap_row); + if VisibleRowManager::is_visible(&mut tm, tran_id, &unwrap_row).await? { yield unwrap_row; - } else { - debug!("Found not visible row {:?}", unwrap_row); } } } @@ -84,7 +81,7 @@ impl VisibleRowManager { //TODO I want to find a way to NOT depend on tm async fn is_visible( - mut tm: TransactionManager, + tm: &mut TransactionManager, tran_id: TransactionId, row_data: &RowData, ) -> Result {