snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-09-06 12:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clarify fields_unused

Browse Source 
Co-Authored-By: Louis Dureuil <louis.dureuil@xinra.net>
This commit is contained in:
Mubelotix
2025-08-01 11:04:48 +02:00
parent 1bb95d2bef
commit f105a2224a
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/meilisearch/src/routes/indexes/render.rs
View File

@ -490,15 +490,21 @@ async fn render(index: Index, query: RenderQuery) -> Result<RenderResult, Respon
.input .input
.as_ref() .as_ref()
.is_some_and(|i| i.inline.as_ref().is_some_and(|i| i.get("fields").is_some())); .is_some_and(|i| i.inline.as_ref().is_some_and(|i| i.get("fields").is_some()));
let fields_probably_used = template.as_str().is_none_or(|s| s.contains("fields")); let fields_unused = match template.as_str() {
Some(template) => {
// might be a false positive if fields appear as a non-variable
// it is OK to be over-eager here, it will just translate to more work
!template.contains("fields")
}
None => true, // non-text templates cannot use `fields`
};
let has_inline_doc = query let has_inline_doc = query
.input .input
.as_ref() .as_ref()
.is_some_and(|i| i.inline.as_ref().is_some_and(|i| i.get("doc").is_some())); .is_some_and(|i| i.inline.as_ref().is_some_and(|i| i.get("doc").is_some()));
let has_document_id = query.input.as_ref().is_some_and(|i| i.document_id.is_some()); let has_document_id = query.input.as_ref().is_some_and(|i| i.document_id.is_some());
let has_doc = has_inline_doc || has_document_id; let has_doc = has_inline_doc || has_document_id;
let insert_fields = let insert_fields = fields_available && has_doc && !fields_unused && !fields_already_present;
fields_available && has_doc && fields_probably_used && !fields_already_present;
if has_inline_doc && has_document_id { if has_inline_doc && has_document_id {
return Err(BothInlineDocAndDocId.into()); return Err(BothInlineDocAndDocId.into());
} }