mirror of
https://github.com/meilisearch/MeiliSearch
synced 2024-11-11 07:28:56 +01:00
Merge pull request #530 from meilisearch/fix-ranking-rules-inference
Ranking fields should be stored and indexed by default
This commit is contained in:
commit
cfe21f7b02
@ -45,7 +45,13 @@ pub fn apply_settings_update(
|
|||||||
match settings.ranking_rules {
|
match settings.ranking_rules {
|
||||||
UpdateState::Update(v) => {
|
UpdateState::Update(v) => {
|
||||||
let ranked_field: Vec<&str> = v.iter().filter_map(RankingRule::field).collect();
|
let ranked_field: Vec<&str> = v.iter().filter_map(RankingRule::field).collect();
|
||||||
schema.update_ranked(ranked_field)?;
|
schema.update_ranked(&ranked_field)?;
|
||||||
|
for name in ranked_field {
|
||||||
|
if schema.accept_new_fields() {
|
||||||
|
schema.set_indexed(name.as_ref())?;
|
||||||
|
schema.set_displayed(name.as_ref())?;
|
||||||
|
}
|
||||||
|
}
|
||||||
index.main.put_ranking_rules(writer, &v)?;
|
index.main.put_ranking_rules(writer, &v)?;
|
||||||
must_reindex = true;
|
must_reindex = true;
|
||||||
},
|
},
|
||||||
|
@ -427,5 +427,4 @@ fn write_setting_and_update_partial() {
|
|||||||
let (response, _status_code) = server.get_all_settings();
|
let (response, _status_code) = server.get_all_settings();
|
||||||
|
|
||||||
assert_json_eq!(expected, response, ordered: false);
|
assert_json_eq!(expected, response, ordered: false);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -135,3 +135,54 @@ fn send_malformed_custom_rule() {
|
|||||||
let (_response, status_code) = server.update_ranking_rules_sync(body);
|
let (_response, status_code) = server.update_ranking_rules_sync(body);
|
||||||
assert_eq!(status_code, 400);
|
assert_eq!(status_code, 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Test issue https://github.com/meilisearch/MeiliSearch/issues/521
|
||||||
|
#[test]
|
||||||
|
fn write_custom_ranking_and_index_documents() {
|
||||||
|
let mut server = common::Server::with_uid("movies");
|
||||||
|
let body = json!({
|
||||||
|
"uid": "movies",
|
||||||
|
"primaryKey": "id",
|
||||||
|
});
|
||||||
|
server.create_index(body);
|
||||||
|
|
||||||
|
// 1 - Add ranking rules with one custom ranking on a string
|
||||||
|
|
||||||
|
let body = json!([
|
||||||
|
"asc(title)",
|
||||||
|
"typo"
|
||||||
|
]);
|
||||||
|
|
||||||
|
server.update_ranking_rules(body);
|
||||||
|
|
||||||
|
// 2 - Add documents
|
||||||
|
|
||||||
|
let body = json!([
|
||||||
|
{
|
||||||
|
"id": 1,
|
||||||
|
"title": "Le Petit Prince",
|
||||||
|
"author": "Exupéry"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 2,
|
||||||
|
"title": "Pride and Prejudice",
|
||||||
|
"author": "Jane Austen"
|
||||||
|
}
|
||||||
|
]);
|
||||||
|
|
||||||
|
server.add_or_replace_multiple_documents(body);
|
||||||
|
|
||||||
|
// 3 - Get the first document and compare
|
||||||
|
|
||||||
|
let expected = json!({
|
||||||
|
"id": 1,
|
||||||
|
"title": "Le Petit Prince",
|
||||||
|
"author": "Exupéry"
|
||||||
|
});
|
||||||
|
|
||||||
|
let (response, status_code) = server.get_document(1);
|
||||||
|
assert_eq!(status_code, 200);
|
||||||
|
|
||||||
|
assert_json_eq!(response, expected, ordered: false);
|
||||||
|
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user