searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-04 20:37:15 +02:00
Code Issues Releases Wiki Activity

remove timeout search query parameter

Browse source 
fix requested changes
This commit is contained in:
Quentin de Quelen 2020-04-24 18:18:40 +02:00 • committed by qdequele
parent bc8ff49de3
commit ea308eb798
No known key found for this signature in database
GPG key ID: B3F0A000EBF11745
4 changed files with 6 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
meilisearch-http/src/helpers/authentication.rs
View file

@ -17,6 +17,7 @@ pub enum Authentication {
Admin,
}
impl<S: 'static, B> Transform<S> for Authentication
where
S: Service<Request = ServiceRequest, Response = ServiceResponse<B>, Error = Error>,

13
meilisearch-http/src/helpers/meilisearch.rs
View file

@ -1,7 +1,7 @@
use std::cmp::Ordering;
use std::collections::{HashMap, HashSet};
use std::hash::{Hash, Hasher};
use std::time::{Duration, Instant};
use std::time::Instant;
use indexmap::IndexMap;
use log::error;
@ -33,7 +33,6 @@ impl IndexSearchExt for Index {
attributes_to_retrieve: None,
attributes_to_highlight: None,
filters: None,
timeout: Duration::from_millis(30),
matches: false,
}
}
@ -48,7 +47,6 @@ pub struct SearchBuilder<'a> {
attributes_to_retrieve: Option<HashSet<String>>,
attributes_to_highlight: Option<HashSet<String>>,
filters: Option<String>,
timeout: Duration,
matches: bool,
}
@ -89,11 +87,6 @@ impl<'a> SearchBuilder<'a> {
self
}
pub fn timeout(&mut self, value: Duration) -> &SearchBuilder {
self.timeout = value;
self
}
pub fn get_matches(&mut self) -> &SearchBuilder {
self.matches = true;
self
@ -130,8 +123,6 @@ impl<'a> SearchBuilder<'a> {
});
}
query_builder.with_fetch_timeout(self.timeout);
if let Some(field) = self.index.main.distinct_attribute(reader)? {
if let Some(field_id) = schema.id(&field) {
query_builder.with_distinct(1, move |id| {
@ -192,7 +183,7 @@ impl<'a> SearchBuilder<'a> {
.document(reader, attributes.as_ref(), doc.id)
.map_err(|e| ResponseError::retrieve_document(doc.id.0, e))?
.ok_or(ResponseError::internal(
"Impossible to retrieve a document id returned by the engine",
"Impossible to retrieve the document; Corrupted data",
))?;
let mut formatted = document.iter()