Merge 'Kill unwrap() calls in extensions' from Pekka Enberg

As preparation for #3992 that actually enforces no unwraps, remove them
from extensions.

Reviewed-by: Preston Thorpe <[email protected]>

Closes #4000

Author: penberg

extensions/core/src/vfs_modules.rs

@@ -28,7 +28,7 @@ pub trait VfsExtension: Default + Send + Sync {
     }
     fn generate_random_number(&self) -> i64 {
         let mut buf = [0u8; 8];
-        getrandom::fill(&mut buf).unwrap();
+        getrandom::fill(&mut buf).expect("failed to generate random bytes");
         i64::from_ne_bytes(buf)
     }
     fn get_current_time(&self) -> String {

extensions/core/src/vtabs.rs

@@ -299,7 +299,8 @@ impl IndexInfo {
         let idx_str_len = self.idx_str.as_ref().map(|s| s.len()).unwrap_or(0);
         let c_idx_str = self
             .idx_str
-            .map(|s| std::ffi::CString::new(s).unwrap().into_raw())
+            .and_then(|s| std::ffi::CString::new(s).ok())
+            .map(|s| s.into_raw())
             .unwrap_or(std::ptr::null_mut());
         ExtIndexInfo {
             code: ResultCode::OK,
@@ -711,7 +712,11 @@ impl Stmt {
         let slice = unsafe { std::slice::from_raw_parts(col_names, count_value as usize) };
         for x in slice {
             let name = unsafe { CStr::from_ptr(*x) };
-            names.push(name.to_str().unwrap().to_string());
+            names.push(
+                name.to_str()
+                    .expect("column name should be valid UTF-8")
+                    .to_string(),
+            );
         }
         unsafe { free_column_names(col_names, count_value) };
         names

extensions/crypto/src/crypto.rs

@@ -70,7 +70,12 @@ pub fn md5(data: &Value) -> Result<Vec<u8>, Error> {
 pub fn encode(data: &Value, format: &Value) -> Result<Value, Error> {
     match (data.value_type(), format.value_type()) {
         (ValueType::Error, _) | (ValueType::Null, _) => Err(Error::InvalidType),
-        (_, ValueType::Text) => match format.to_text().unwrap().to_lowercase().as_str() {
+        (_, ValueType::Text) => match format
+            .to_text()
+            .ok_or(Error::InvalidType)?
+            .to_lowercase()
+            .as_str()
+        {
             "base32" => Ok(Value::from_text(BASE32.encode(data.as_bytes().as_ref()))),
             "base64" => Ok(Value::from_text(BASE64.encode(data.as_bytes().as_ref()))),
             "hex" => Ok(Value::from_text(HEXLOWER.encode(data.as_bytes().as_ref()))),

extensions/csv/src/lib.rs

@@ -223,7 +223,7 @@ impl VTabModule for CsvVTabModule {
             schema = Some(sql);
         }
 
-        Ok((schema.unwrap(), table))
+        Ok((schema.ok_or(ResultCode::Error)?, table))
     }
 }
 

extensions/fuzzy/src/caver.rs

@@ -47,7 +47,10 @@ fn replace(src: &str, old: &str, new: &str) -> String {
             result.push_str(new);
             idx += old.len();
         } else {
-            let ch = src[idx..].chars().next().unwrap();
+            let ch = src[idx..]
+                .chars()
+                .next()
+                .expect("string slice should have at least one character");
             result.push(ch);
             idx += ch.len_utf8();
         }

extensions/fuzzy/src/phonetic.rs

@@ -90,7 +90,7 @@ pub fn phonetic_hash(z_in: &[u8]) -> Option<Vec<u8>> {
             c = b'?';
         }
 
-        if z_out.is_empty() || c != *z_out.last().unwrap() {
+        if z_out.last() != Some(&c) {
             z_out.push(c);
         }
 

extensions/percentile/src/lib.rs

@@ -25,7 +25,7 @@ impl AggFunc for Median {
         }
 
         let mut sorted = state;
-        sorted.sort_by(|a, b| a.partial_cmp(b).unwrap());
+        sorted.sort_by(|a, b| a.total_cmp(b));
 
         let len = sorted.len();
         if len % 2 == 1 {
@@ -82,8 +82,8 @@ impl AggFunc for Percentile {
             return Ok(Value::from_float(values[0]));
         }
 
-        let p = p_value.unwrap();
-        values.sort_by(|a, b| a.partial_cmp(b).unwrap());
+        let p = p_value.ok_or("percentile value must be provided")?;
+        values.sort_by(|a, b| a.total_cmp(b));
         let n = values.len() as f64;
         let index = p * (n - 1.0) / 100.0;
         let lower = index.floor() as usize;
@@ -144,8 +144,8 @@ impl AggFunc for PercentileCont {
             return Ok(Value::from_float(values[0]));
         }
 
-        let p = p_value.unwrap();
-        values.sort_by(|a, b| a.partial_cmp(b).unwrap());
+        let p = p_value.ok_or("percentile value must be provided")?;
+        values.sort_by(|a, b| a.total_cmp(b));
         let n = values.len() as f64;
         let index = p * (n - 1.0);
         let lower = index.floor() as usize;
@@ -184,8 +184,8 @@ impl AggFunc for PercentileDisc {
             return Err(err);
         }
 
-        let p = p_value.unwrap();
-        values.sort_by(|a, b| a.partial_cmp(b).unwrap());
+        let p = p_value.ok_or("percentile value must be provided")?;
+        values.sort_by(|a, b| a.total_cmp(b));
         let n = values.len() as f64;
         let index = (p * (n - 1.0)).floor() as usize;
         Ok(Value::from_float(values[index]))

extensions/tests/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::unwrap_used)]
+
 use std::cell::RefCell;
 use std::collections::{BTreeMap, VecDeque};
 use std::fs::{File, OpenOptions};