f Make returned errors more verbose

Author: tnull

src/io/sqlite_store.rs

@@ -78,9 +78,15 @@ impl KVStore for SqliteStore {
 				},
 				|row| row.get(0),
 			)
-			.map_err(|_| {
-				let msg = format!("Failed to read from key: {}/{}", namespace, key);
-				std::io::Error::new(std::io::ErrorKind::NotFound, msg)
+			.map_err(|e| match e {
+				rusqlite::Error::QueryReturnedNoRows => {
+					let msg = format!("Failed namespace/key not found: {}/{}", namespace, key);
+					std::io::Error::new(std::io::ErrorKind::NotFound, msg)
+				}
+				e => {
+					let msg = format!("Failed to read from key {}/{}: {}", namespace, key, e);
+					std::io::Error::new(std::io::ErrorKind::Other, msg)
+				}
 			})?;
 		Ok(Cursor::new(res))
 	}
@@ -102,8 +108,8 @@ impl KVStore for SqliteStore {
 					":value": buf,
 				},
 			)
-			.map_err(|_| {
-				let msg = format!("Failed to write to key: {}/{}", namespace, key);
+			.map_err(|e| {
+				let msg = format!("Failed to write to key {}/{}: {}", namespace, key, e);
 				std::io::Error::new(std::io::ErrorKind::Other, msg)
 			})?;
 		Ok(())
@@ -122,8 +128,8 @@ impl KVStore for SqliteStore {
 					":key": key,
 				},
 			)
-			.map_err(|_| {
-				let msg = format!("Failed to delete key: {}/{}", namespace, key);
+			.map_err(|e| {
+				let msg = format!("Failed to delete key {}/{}: {}", namespace, key, e);
 				std::io::Error::new(std::io::ErrorKind::Other, msg)
 			})?;
 
@@ -136,21 +142,24 @@ impl KVStore for SqliteStore {
 		let locked_conn = self.connection.lock().unwrap();
 
 		let sql = format!("SELECT key FROM {} WHERE namespace=:namespace", KV_TABLE_NAME);
-		let mut stmt = locked_conn.prepare(&sql).map_err(|_| {
-			std::io::Error::new(std::io::ErrorKind::Other, "Failed to prepare statement")
+		let mut stmt = locked_conn.prepare(&sql).map_err(|e| {
+			let msg = format!("Failed to prepare statement: {}", e);
+			std::io::Error::new(std::io::ErrorKind::Other, msg)
 		})?;
 
 		let mut keys = Vec::new();
 
 		let rows_iter = stmt
 			.query_map(named_params! {":namespace": namespace, }, |row| row.get(0))
-			.map_err(|_| {
-				std::io::Error::new(std::io::ErrorKind::Other, "Failed to retrieve queried rows")
+			.map_err(|e| {
+				let msg = format!("Failed to retrieve queried rows: {}", e);
+				std::io::Error::new(std::io::ErrorKind::Other, msg)
 			})?;
 
 		for k in rows_iter {
-			keys.push(k.map_err(|_| {
-				std::io::Error::new(std::io::ErrorKind::Other, "Failed to retrieve queried rows")
+			keys.push(k.map_err(|e| {
+				let msg = format!("Failed to retrieve queried rows: {}", e);
+				std::io::Error::new(std::io::ErrorKind::Other, msg)
 			})?);
 		}