snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-07-28 01:01:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introduce the Search builder struct

Browse Source
This commit is contained in:
Clément Renault
2020-08-13 14:15:05 +02:00
parent bfb46cbfbe
commit 7dc594ba4d
5 changed files with 406 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/search.rs
View File

@ -62,12 +62,13 @@ fn main() -> anyhow::Result<()> {
let before = Instant::now();
let query = result?;
let (_, documents_ids) = index.search(&rtxn, &query)?;
let result = index.search(&rtxn).query(query).execute().unwrap();
let headers = match index.headers(&rtxn)? {
Some(headers) => headers,
None => return Ok(()),
};
let documents = index.documents(documents_ids.iter().cloned())?;
let documents = index.documents(result.documents_ids.iter().cloned())?;
let mut stdout = io::stdout();
stdout.write_all(&headers)?;
@ -76,7 +77,7 @@ fn main() -> anyhow::Result<()> {
stdout.write_all(&content)?;
}
debug!("Took {:.02?} to find {} documents", before.elapsed(), documents_ids.len());
debug!("Took {:.02?} to find {} documents", before.elapsed(), result.documents_ids.len());
}
Ok(())

9
src/bin/serve.rs
View File

@ -13,7 +13,7 @@ use slice_group_by::StrGroupBy;
use structopt::StructOpt;
use warp::{Filter, http::Response};
use milli::Index;
use milli::{Index, SearchResult};
#[cfg(target_os = "linux")]
#[global_allocator]
@ -183,7 +183,10 @@ async fn main() -> anyhow::Result<()> {
let before_search = Instant::now();
let rtxn = env_cloned.read_txn().unwrap();
let (words, documents_ids) = index.search(&rtxn, &query.query).unwrap();
let SearchResult { found_words, documents_ids } = index.search(&rtxn)
.query(query.query)
.execute()
.unwrap();
let mut body = Vec::new();
if let Some(headers) = index.headers(&rtxn).unwrap() {
@ -196,7 +199,7 @@ async fn main() -> anyhow::Result<()> {
let content = if disable_highlighting {
Cow::from(content)
} else {
Cow::from(highlight_string(content, &words))
Cow::from(highlight_string(content, &found_words))
};
body.extend_from_slice(content.as_bytes());