Pass error

NamseEnt · Nov 14, 2024 · 0419b9f · 0419b9f
1 parent a55b447
commit 0419b9f
Show file tree

Hide file tree

Showing 5 changed files with 133 additions and 232 deletions.
diff --git a/luda-editor/new-server/bptree/src/bp_map/mod.rs b/luda-editor/new-server/bptree/src/bp_map/mod.rs
@@ -83,7 +83,7 @@ mod test {
 
     #[tokio::test]
     async fn test_insert() {
-        let path = std::env::temp_dir().join("bp_map_test_insert");
+        let path = std::env::temp_dir().join("bp_map::bp_map_test_insert");
         if let Err(err) = std::fs::remove_file(&path) {
             if err.kind() != std::io::ErrorKind::NotFound {
                 panic!("{:?}", err);
@@ -116,7 +116,7 @@ mod test {
 
     #[tokio::test]
     async fn test_insert_and_delete() {
-        let path = std::env::temp_dir().join("bp_map_test_insert_and_delete");
+        let path = std::env::temp_dir().join("bp_map::bp_map_test_insert_and_delete");
         if let Err(err) = std::fs::remove_file(&path) {
             if err.kind() != std::io::ErrorKind::NotFound {
                 panic!("{:?}", err);
@@ -154,7 +154,7 @@ mod test {
 
     #[tokio::test]
     async fn test_insert_contains() {
-        let path = std::env::temp_dir().join("bp_map_test_insert_contains");
+        let path = std::env::temp_dir().join("bp_map::bp_map_test_insert_contains");
         if let Err(err) = std::fs::remove_file(&path) {
             if err.kind() != std::io::ErrorKind::NotFound {
                 panic!("{:?}", err);
@@ -198,7 +198,7 @@ mod test {
 
     #[tokio::test]
     async fn test_insert_delete_contains() {
-        let path = std::env::temp_dir().join("bp_map_test_insert_delete_contains");
+        let path = std::env::temp_dir().join("bp_map::bp_map_test_insert_delete_contains");
         if let Err(err) = std::fs::remove_file(&path) {
             if err.kind() != std::io::ErrorKind::NotFound {
                 panic!("{:?}", err);
@@ -251,7 +251,7 @@ mod test {
 
     #[tokio::test]
     async fn test_insert_delete_get() {
-        let path = std::env::temp_dir().join("bp_map_test_insert_delete_get");
+        let path = std::env::temp_dir().join("bp_map::bp_map_test_insert_delete_get");
         if let Err(err) = std::fs::remove_file(&path) {
             if err.kind() != std::io::ErrorKind::NotFound {
                 panic!("{:?}", err);
@@ -306,7 +306,7 @@ mod test {
 
     #[tokio::test]
     async fn test_insert_delete_contains_without_cache() {
-        let path = std::env::temp_dir().join("test_insert_delete_contains_without_cache");
+        let path = std::env::temp_dir().join("bp_map::test_insert_delete_contains_without_cache");
         if let Err(err) = std::fs::remove_file(&path) {
             if err.kind() != std::io::ErrorKind::NotFound {
                 panic!("{:?}", err);
@@ -359,7 +359,7 @@ mod test {
 
     #[tokio::test]
     async fn test_insert_delete_contains_small_cache() {
-        let path = std::env::temp_dir().join("test_insert_delete_contains_small_cache");
+        let path = std::env::temp_dir().join("bp_map::test_insert_delete_contains_small_cache");
         if let Err(err) = std::fs::remove_file(&path) {
             if err.kind() != std::io::ErrorKind::NotFound {
                 panic!("{:?}", err);
@@ -412,7 +412,7 @@ mod test {
 
     #[tokio::test]
     async fn test_insert_turn_off_contains() {
-        let path = std::env::temp_dir().join("test_insert_turn_off_contains");
+        let path = std::env::temp_dir().join("bp_map::test_insert_turn_off_contains");
         if let Err(err) = std::fs::remove_file(&path) {
             if err.kind() != std::io::ErrorKind::NotFound {
                 panic!("{:?}", err);
@@ -461,7 +461,7 @@ mod test {
 
     #[tokio::test]
     async fn test_next_insert_next_delete_next() {
-        let path = std::env::temp_dir().join("test_next_insert_next_delete_next");
+        let path = std::env::temp_dir().join("bp_map::test_next_insert_next_delete_next");
         if let Err(err) = std::fs::remove_file(&path) {
             if err.kind() != std::io::ErrorKind::NotFound {
                 panic!("{:?}", err);
@@ -514,7 +514,7 @@ mod test {
 
     // #[tokio::test]
     // async fn test_stream() {
-    //     let path = std::env::temp_dir().join("test_stream");
+    //     let path = std::env::temp_dir().join("bp_map::test_stream");
     //     if let Err(err) = std::fs::remove_file(&path) {
     //         if err.kind() != std::io::ErrorKind::NotFound {
     //             panic!("{:?}", err);

diff --git a/luda-editor/new-server/bptree/src/bp_map/operator.rs b/luda-editor/new-server/bptree/src/bp_map/operator.rs
@@ -41,7 +41,7 @@ impl Operator {
         }
 
         let (right_half, center_key) =
-            leaf_node.split_and_insert(key, record_page_range, leaf_node_offset, right_node_offset);
+            leaf_node.split_and_insert(key, record_page_range, right_node_offset);
         self.blocks_updated.insert(
             PageRange::page(right_node_offset),
             PageBlock::Page(Page::LeafNode(right_half)),
@@ -110,6 +110,7 @@ impl Operator {
                 .await?
                 .as_leaf_node_mut();
             leaf_node.delete(key);
+            assert!(!leaf_node.contains(key));
         }
 
         Ok(())
@@ -124,14 +125,17 @@ impl Operator {
         Ok(contains)
     }
     pub async fn get(&mut self, key: Key) -> Result<Option<Bytes>> {
+        println!("key: {:?}", key);
         let leaf_node_offset = self.find_leaf_node_for(key).await?;
         let leaf_node = self
             .page(leaf_node_offset, PageBlockTypeHint::Node)
             .await?
             .as_leaf_node();
         let Some(record_page_range) = leaf_node.get_record_page_range(key) else {
+            println!("not exists: {:?}", key);
             return Ok(None);
         };
+        println!("record_page_range: {:?}", record_page_range);
         let bytes = self.record(record_page_range).await?;
         Ok(Some(bytes))
     }