snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-10-10 13:46:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

--amend

Browse Source
This commit is contained in:
ManyTheFish
2025-10-09 16:59:27 +02:00
parent 63a857a752
commit d604ada64f
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/meilisearch/src/routes/multi_search.rs
View File

@@ -18,13 +18,13 @@ use crate::extractors::authentication::policies::ActionPolicy;
use crate::extractors::authentication::{AuthenticationError, GuardedData}; use crate::extractors::authentication::{AuthenticationError, GuardedData};
use crate::extractors::sequential_extractor::SeqHandler; use crate::extractors::sequential_extractor::SeqHandler;
use crate::routes::indexes::search::search_kind; use crate::routes::indexes::search::search_kind;
use crate::routes::parse_include_metadata_header;
use crate::search::{ use crate::search::{
add_search_rules, perform_federated_search, perform_search, FederatedSearch, add_search_rules, perform_federated_search, perform_search, FederatedSearch,
FederatedSearchResult, RetrieveVectors, SearchParams, SearchQueryWithIndex, FederatedSearchResult, RetrieveVectors, SearchParams, SearchQueryWithIndex,
SearchResultWithIndex, PROXY_SEARCH_HEADER, PROXY_SEARCH_HEADER_VALUE, SearchResultWithIndex, PROXY_SEARCH_HEADER, PROXY_SEARCH_HEADER_VALUE,
}; };
use crate::search_queue::SearchQueue; use crate::search_queue::SearchQueue;
use crate::routes::parse_include_metadata_header;
#[derive(OpenApi)] #[derive(OpenApi)]
#[openapi( #[openapi(
@@ -189,6 +189,7 @@ pub async fn multi_search_with_post(
err err
})?; })?;
let include_metadata = parse_include_metadata_header(&req);
let response = match federation { let response = match federation {
Some(federation) => { Some(federation) => {
debug!( debug!(
@@ -203,7 +204,6 @@ pub async fn multi_search_with_post(
.headers() .headers()
.get(PROXY_SEARCH_HEADER) .get(PROXY_SEARCH_HEADER)
.is_some_and(|value| value.as_bytes() == PROXY_SEARCH_HEADER_VALUE.as_bytes()); .is_some_and(|value| value.as_bytes() == PROXY_SEARCH_HEADER_VALUE.as_bytes());
let include_metadata = parse_include_metadata_header(&req);
let search_result = perform_federated_search( let search_result = perform_federated_search(
&index_scheduler, &index_scheduler,
queries, queries,
@@ -231,8 +231,6 @@ pub async fn multi_search_with_post(
HttpResponse::Ok().json(search_result?) HttpResponse::Ok().json(search_result?)
} }
None => { None => {
let include_metadata = parse_include_metadata_header(&req);
// 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.