snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-26 12:05:05 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Further reduce an async block

Browse Source
This commit is contained in:
Clément Renault 2023-11-28 14:23:32 +01:00
parent add2ceef67
commit 1575456594
No known key found for this signature in database
GPG Key ID: F250A4C4E3AE5F5F
1 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
meilisearch/src/routes/multi_search.rs
View File

@ -46,48 +46,45 @@ pub async fn multi_search_with_post(
// Explicitly expect a `(ResponseError, usize)` for the error type rather than `ResponseError` only, // Explicitly expect a `(ResponseError, usize)` for the error type rather than `ResponseError` only,
// so that `?` doesn't work if it doesn't use `with_index`, ensuring that it is not forgotten in case of code // so that `?` doesn't work if it doesn't use `with_index`, ensuring that it is not forgotten in case of code
// changes. // changes.
let search_results: Result<_, (ResponseError, usize)> = { let search_results: Result<_, (ResponseError, usize)> = async {
async { let mut search_results = Vec::with_capacity(queries.len());
let mut search_results = Vec::with_capacity(queries.len()); for (query_index, (index_uid, mut query)) in
for (query_index, (index_uid, mut query)) in queries.into_iter().map(SearchQueryWithIndex::into_index_query).enumerate()
queries.into_iter().map(SearchQueryWithIndex::into_index_query).enumerate() {
debug!("multi-search #{query_index}: called with params: {:?}", query);
// Check index from API key
if !index_scheduler.filters().is_index_authorized(&index_uid) {
return Err(AuthenticationError::InvalidToken).with_index(query_index);
}
// Apply search rules from tenant token
if let Some(search_rules) = index_scheduler.filters().get_index_search_rules(&index_uid)
{ {
debug!("multi-search #{query_index}: called with params: {:?}", query); add_search_rules(&mut query, search_rules);
}
// Check index from API key let index = index_scheduler
if !index_scheduler.filters().is_index_authorized(&index_uid) { .index(&index_uid)
return Err(AuthenticationError::InvalidToken).with_index(query_index); .map_err(|err| {
} let mut err = ResponseError::from(err);
// Apply search rules from tenant token // Patch the HTTP status code to 400 as it defaults to 404 for `index_not_found`, but
if let Some(search_rules) = // here the resource not found is not part of the URL.
index_scheduler.filters().get_index_search_rules(&index_uid) err.code = StatusCode::BAD_REQUEST;
{ err
add_search_rules(&mut query, search_rules); })
} .with_index(query_index)?;
let index = index_scheduler let search_result =
.index(&index_uid) tokio::task::spawn_blocking(move || perform_search(&index, query, features))
.map_err(|err| { .await
let mut err = ResponseError::from(err);
// Patch the HTTP status code to 400 as it defaults to 404 for `index_not_found`, but
// here the resource not found is not part of the URL.
err.code = StatusCode::BAD_REQUEST;
err
})
.with_index(query_index)?; .with_index(query_index)?;
let search_result = search_results.push(SearchResultWithIndex {
tokio::task::spawn_blocking(move || perform_search(&index, query, features)) index_uid: index_uid.into_inner(),
.await result: search_result.with_index(query_index)?,
.with_index(query_index)?; });
search_results.push(SearchResultWithIndex {
index_uid: index_uid.into_inner(),
result: search_result.with_index(query_index)?,
});
}
Ok(search_results)
} }
Ok(search_results)
} }
.await; .await;