snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-27 04:25:06 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix unwrap if schema does not contain ranked attributes on a custom ranking setting

Browse Source
This commit is contained in:
Quentin de Quelen 2019-12-12 16:37:46 +01:00
parent 04d34cb8aa
commit 1ea29bb92e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meilisearch-http/src/helpers/meilisearch.rs
View File

@ -1,6 +1,6 @@
use crate::routes::setting::{RankingOrdering, SettingBody}; use crate::routes::setting::{RankingOrdering, SettingBody};
use indexmap::IndexMap; use indexmap::IndexMap;
use log::error; use log::{error, warn};
use meilisearch_core::criterion::*; use meilisearch_core::criterion::*;
use meilisearch_core::Highlight; use meilisearch_core::Highlight;
use meilisearch_core::{Index, RankedMap}; use meilisearch_core::{Index, RankedMap};
@ -349,13 +349,19 @@ impl<'a> SearchBuilder<'a> {
for (rule, order) in ranking_rules.iter() { for (rule, order) in ranking_rules.iter() {
let custom_ranking = match order { let custom_ranking = match order {
RankingOrdering::Asc => { RankingOrdering::Asc => {
SortByAttr::lower_is_better(&ranked_map, &schema, &rule).unwrap() SortByAttr::lower_is_better(&ranked_map, &schema, &rule)
} }
RankingOrdering::Dsc => { RankingOrdering::Dsc => {
SortByAttr::higher_is_better(&ranked_map, &schema, &rule).unwrap() SortByAttr::higher_is_better(&ranked_map, &schema, &rule)
} }
}; };
if let Ok(custom_ranking) = custom_ranking {
builder.push(custom_ranking); builder.push(custom_ranking);
} else {
// TODO push this warning to a log tree
warn!("Custom ranking cannot be added; Attribute {} not registered for ranking", rule)
}
} }
builder.push(DocumentId); builder.push(DocumentId);
return Ok(Some(builder.build())); return Ok(Some(builder.build()));