snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-23 10:37:41 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge #250 #251

Browse Source 
250: Add the limit field to http-ui r=Kerollmops a=irevoire



251: Fix the limit r=Kerollmops a=irevoire

There was no check on the limit and thus if a user specified a very large number this line could cause a panic.

Co-authored-by: Tamo <tamo@meilisearch.com>
This commit is contained in:
bors[bot] 2021-06-22 13:00:52 +00:00 committed by GitHub
commit 634201244c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
http-ui/src/main.rs
View File

@ -687,6 +687,7 @@ async fn main() -> anyhow::Result<()> {
filters: Option<String>, filters: Option<String>,
facet_filters: Option<Vec<UntaggedEither<Vec<String>, String>>>, facet_filters: Option<Vec<UntaggedEither<Vec<String>, String>>>,
facet_distribution: Option<bool>, facet_distribution: Option<bool>,
limit: Option<usize>,
} }
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
@ -739,6 +740,10 @@ async fn main() -> anyhow::Result<()> {
search.filter(condition); search.filter(condition);
} }
if let Some(limit) = query.limit {
search.limit(limit);
}
let SearchResult { matching_words, candidates, documents_ids } = let SearchResult { matching_words, candidates, documents_ids } =
search.execute().unwrap(); search.execute().unwrap();

2
milli/src/search/mod.rs
View File

@ -162,7 +162,7 @@ impl<'a> Search<'a> {
let mut offset = self.offset; let mut offset = self.offset;
let mut initial_candidates = RoaringBitmap::new(); let mut initial_candidates = RoaringBitmap::new();
let mut excluded_candidates = RoaringBitmap::new(); let mut excluded_candidates = RoaringBitmap::new();
let mut documents_ids = Vec::with_capacity(self.limit); let mut documents_ids = Vec::new();
while let Some(FinalResult { candidates, bucket_candidates, .. }) = while let Some(FinalResult { candidates, bucket_candidates, .. }) =
criteria.next(&excluded_candidates)? criteria.next(&excluded_candidates)?