Merge pull request #2 from fluencelabs/optimize_query

This commit is contained in:
folex 2019-08-18 19:27:20 +03:00 committed by GitHub
commit cf23178ec7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 34 deletions

View File

@ -4,21 +4,12 @@ use crate::sqlite;
pub fn query(query: &str) -> AppResult<String> { pub fn query(query: &str) -> AppResult<String> {
let response = sqlite::call(query.as_bytes()); let response = sqlite::call(query.as_bytes());
// Decode query result to a utf8 string // Add more details to error message
let result_str = std::str::from_utf8(&response); String::from_utf8(response).map_err(|e| {
log::error!("unable to decode result from bytes: {:#x?}", bytes);
// Log if there's an error err_msg(&format!(
if result_str.is_err() { "unable to decode result from bytes {:#x?}: {}",
log::error!("unable to decode result from bytes: {:#x?}", response); query, e
} ))
})
// Wrap error with a better message, and return Result
result_str
.map_err(|e| {
err_msg(&format!(
"unable to decode result from bytes {:#x?}: {}",
response, e
))
})
.map(|s| s.to_string())
} }

View File

@ -4,21 +4,12 @@ use crate::sqlite;
pub fn query(query: &str) -> AppResult<String> { pub fn query(query: &str) -> AppResult<String> {
let response = sqlite::call(query.as_bytes()); let response = sqlite::call(query.as_bytes());
// Decode query result to a utf8 string // Add more details to error message
let result_str = std::str::from_utf8(&response); String::from_utf8(response).map_err(|e| {
log::error!("unable to decode result from bytes: {:#x?}", bytes);
// Log if there's an error err_msg(&format!(
if result_str.is_err() { "unable to decode result from bytes {:#x?}: {}",
log::error!("unable to decode result from bytes: {:#x?}", response); query, e
} ))
})
// Wrap error with a better message, and return Result
result_str
.map_err(|e| {
err_msg(&format!(
"unable to decode result from bytes {:#x?}: {}",
response, e
))
})
.map(|s| s.to_string())
} }