core/storage: Improve error handling in sqlite3_ondisk.rs

Author: penberg

core/storage/btree.rs

@@ -3128,7 +3128,7 @@ impl BTreeCursor {
                                     max_local,
                                     min_local,
                                     page_type,
-                                );
+                                )?;
                             let buf = old_page_contents.as_ptr();
                             let cell_buf = &mut buf[cell_start..cell_start + cell_len];
                             // TODO(pere): make this reference and not copy

core/storage/sqlite3_ondisk.rs

@@ -468,7 +468,9 @@ impl PageContent {
     }
 
     pub fn page_type(&self) -> PageType {
-        self.read_u8(BTREE_PAGE_TYPE).try_into().unwrap()
+        self.read_u8(BTREE_PAGE_TYPE)
+            .try_into()
+            .expect("Invalid page type")
     }
 
     pub fn maybe_page_type(&self) -> Option<PageType> {
@@ -804,6 +806,7 @@ impl PageContent {
             min_local,
             page_type,
         )
+        .expect("Failed to get cell raw region")
     }
 
     /// Get region(start end length) of a cell's payload
@@ -815,13 +818,13 @@ impl PageContent {
         max_local: usize,
         min_local: usize,
         page_type: PageType,
-    ) -> (usize, usize) {
+    ) -> Result<(usize, usize)> {
         let buf = self.as_ptr();
         assert!(idx < cell_count, "cell_get: idx out of bounds");
         let start = self.cell_get_raw_start_offset(idx);
         let len = match page_type {
             PageType::IndexInterior => {
-                let (len_payload, n_payload) = read_varint(&buf[start + 4..]).unwrap();
+                let (len_payload, n_payload) = read_varint(&buf[start + 4..])?;
                 let (overflows, to_read) =
                     payload_overflows(len_payload as usize, max_local, min_local, usable_size);
                 if overflows {
@@ -831,11 +834,11 @@ impl PageContent {
                 }
             }
             PageType::TableInterior => {
-                let (_, n_rowid) = read_varint(&buf[start + 4..]).unwrap();
+                let (_, n_rowid) = read_varint(&buf[start + 4..])?;
                 4 + n_rowid
             }
             PageType::IndexLeaf => {
-                let (len_payload, n_payload) = read_varint(&buf[start..]).unwrap();
+                let (len_payload, n_payload) = read_varint(&buf[start..])?;
                 let (overflows, to_read) =
                     payload_overflows(len_payload as usize, max_local, min_local, usable_size);
                 if overflows {
@@ -849,8 +852,8 @@ impl PageContent {
                 }
             }
             PageType::TableLeaf => {
-                let (len_payload, n_payload) = read_varint(&buf[start..]).unwrap();
-                let (_, n_rowid) = read_varint(&buf[start + n_payload..]).unwrap();
+                let (len_payload, n_payload) = read_varint(&buf[start..])?;
+                let (_, n_rowid) = read_varint(&buf[start + n_payload..])?;
                 let (overflows, to_read) =
                     payload_overflows(len_payload as usize, max_local, min_local, usable_size);
                 if overflows {
@@ -864,7 +867,7 @@ impl PageContent {
                 }
             }
         };
-        (start, len)
+        Ok((start, len))
     }
 
     pub fn is_leaf(&self) -> bool {
@@ -1269,7 +1272,10 @@ impl<T: Default + Copy, const N: usize> SmallVec<T, N> {
             if self.extra_data.is_none() {
                 self.extra_data = Some(Vec::new());
             }
-            self.extra_data.as_mut().unwrap().push(value);
+            self.extra_data
+                .as_mut()
+                .expect("extra_data was just initialized")
+                .push(value);
             self.len += 1;
         }
     }
@@ -1278,7 +1284,10 @@ impl<T: Default + Copy, const N: usize> SmallVec<T, N> {
         assert!(self.extra_data.is_some());
         assert!(index >= self.data.len());
         let extra_data_index = index - self.data.len();
-        let extra_data = self.extra_data.as_ref().unwrap();
+        let extra_data = self
+            .extra_data
+            .as_ref()
+            .expect("extra_data existence was just asserted");
         assert!(extra_data_index < extra_data.len());
         extra_data[extra_data_index]
     }
@@ -1806,14 +1815,14 @@ impl StreamingWalReader {
         let (page_sz, c1, c2, use_native, ok) = {
             let mut h = self.header.lock();
             let s = buf.as_slice();
-            h.magic = u32::from_be_bytes(s[0..4].try_into().unwrap());
-            h.file_format = u32::from_be_bytes(s[4..8].try_into().unwrap());
-            h.page_size = u32::from_be_bytes(s[8..12].try_into().unwrap());
-            h.checkpoint_seq = u32::from_be_bytes(s[12..16].try_into().unwrap());
-            h.salt_1 = u32::from_be_bytes(s[16..20].try_into().unwrap());
-            h.salt_2 = u32::from_be_bytes(s[20..24].try_into().unwrap());
-            h.checksum_1 = u32::from_be_bytes(s[24..28].try_into().unwrap());
-            h.checksum_2 = u32::from_be_bytes(s[28..32].try_into().unwrap());
+            h.magic = u32::from_be_bytes([s[0], s[1], s[2], s[3]]);
+            h.file_format = u32::from_be_bytes([s[4], s[5], s[6], s[7]]);
+            h.page_size = u32::from_be_bytes([s[8], s[9], s[10], s[11]]);
+            h.checkpoint_seq = u32::from_be_bytes([s[12], s[13], s[14], s[15]]);
+            h.salt_1 = u32::from_be_bytes([s[16], s[17], s[18], s[19]]);
+            h.salt_2 = u32::from_be_bytes([s[20], s[21], s[22], s[23]]);
+            h.checksum_1 = u32::from_be_bytes([s[24], s[25], s[26], s[27]]);
+            h.checksum_2 = u32::from_be_bytes([s[28], s[29], s[30], s[31]]);
             tracing::debug!("WAL header: {:?}", *h);
 
             let use_native = cfg!(target_endian = "big") == ((h.magic & 1) != 0);