exact search endpoint
This commit is contained in:
@@ -20,6 +20,12 @@ const INDEX_ROOT: &str = "./tantivy_indexes";
|
||||
const DEFAULT_RESULT_LIMIT: usize = 5;
|
||||
const SEARCH_RESULT_LIMIT: usize = 100;
|
||||
|
||||
#[derive(Clone, Copy)]
|
||||
enum SearchMode {
|
||||
Fuzzy,
|
||||
Exact,
|
||||
}
|
||||
|
||||
pub struct SearcherService {
|
||||
pub pool: PgPool,
|
||||
}
|
||||
@@ -165,7 +171,11 @@ async fn resolve_search_targets(
|
||||
}
|
||||
|
||||
// Query building
|
||||
fn build_query(index: &Index, normalized_query: &str) -> Result<Option<BooleanQuery>, Status> {
|
||||
fn build_query(
|
||||
index: &Index,
|
||||
normalized_query: &str,
|
||||
mode: SearchMode,
|
||||
) -> Result<Option<BooleanQuery>, Status> {
|
||||
let schema = index.schema();
|
||||
let prefix_edge_field = schema
|
||||
.get_field("prefix_edge")
|
||||
@@ -182,6 +192,24 @@ fn build_query(index: &Index, normalized_query: &str) -> Result<Option<BooleanQu
|
||||
return Ok(None);
|
||||
}
|
||||
|
||||
if matches!(mode, SearchMode::Exact) {
|
||||
let exact_parser = QueryParser::for_index(index, vec![prefix_full_field]);
|
||||
let exact_query_str = if words.len() == 1 {
|
||||
normalized_query.to_string()
|
||||
} else {
|
||||
format!("\"{}\"", normalized_query)
|
||||
};
|
||||
|
||||
let exact_query = exact_parser
|
||||
.parse_query(&exact_query_str)
|
||||
.map_err(|e| Status::internal(format!("Failed to build exact query: {}", e)))?;
|
||||
|
||||
return Ok(Some(BooleanQuery::new(vec![(
|
||||
Occur::Must,
|
||||
Box::new(exact_query),
|
||||
)])));
|
||||
}
|
||||
|
||||
let mut query_layers: Vec<(Occur, Box<dyn Query>)> = Vec::new();
|
||||
|
||||
// Layer 1: prefix
|
||||
@@ -276,6 +304,7 @@ async fn search_target(
|
||||
pool: &PgPool,
|
||||
target: &SearchTarget,
|
||||
query_str: &str,
|
||||
mode: SearchMode,
|
||||
) -> Result<Vec<Hit>, Status> {
|
||||
if !target.index_path.exists() {
|
||||
return Ok(vec![]);
|
||||
@@ -286,7 +315,7 @@ async fn search_target(
|
||||
register_slovak_tokenizers(&index)
|
||||
.map_err(|e| Status::internal(format!("Failed to register Slovak tokenizers: {}", e)))?;
|
||||
|
||||
let Some(master_query) = build_query(&index, &normalize_slovak_text(query_str))? else {
|
||||
let Some(master_query) = build_query(&index, &normalize_slovak_text(query_str), mode)? else {
|
||||
return Ok(vec![]);
|
||||
};
|
||||
|
||||
@@ -360,6 +389,23 @@ impl Searcher for SearcherService {
|
||||
async fn search_table(
|
||||
&self,
|
||||
request: Request<SearchRequest>,
|
||||
) -> Result<Response<SearchResponse>, Status> {
|
||||
self.run_search(request, SearchMode::Fuzzy).await
|
||||
}
|
||||
|
||||
async fn exact_search_table(
|
||||
&self,
|
||||
request: Request<SearchRequest>,
|
||||
) -> Result<Response<SearchResponse>, Status> {
|
||||
self.run_search(request, SearchMode::Exact).await
|
||||
}
|
||||
}
|
||||
|
||||
impl SearcherService {
|
||||
async fn run_search(
|
||||
&self,
|
||||
request: Request<SearchRequest>,
|
||||
mode: SearchMode,
|
||||
) -> Result<Response<SearchResponse>, Status> {
|
||||
let req = request.into_inner();
|
||||
let profile_name = req.profile_name.trim();
|
||||
@@ -404,7 +450,7 @@ impl Searcher for SearcherService {
|
||||
// Merge per-table hits
|
||||
let mut hits = Vec::new();
|
||||
for target in &targets {
|
||||
hits.extend(search_target(&self.pool, target, query).await?);
|
||||
hits.extend(search_target(&self.pool, target, query, mode).await?);
|
||||
}
|
||||
|
||||
hits.sort_by(|left, right| right.score.total_cmp(&left.score));
|
||||
@@ -413,7 +459,11 @@ impl Searcher for SearcherService {
|
||||
}
|
||||
|
||||
info!(
|
||||
"Processed search for profile '{}' (table scope: {}). Returning {} hits.",
|
||||
"Processed {} search for profile '{}' (table scope: {}). Returning {} hits.",
|
||||
match mode {
|
||||
SearchMode::Fuzzy => "fuzzy",
|
||||
SearchMode::Exact => "exact",
|
||||
},
|
||||
profile_name,
|
||||
requested_table.unwrap_or("*"),
|
||||
hits.len()
|
||||
|
||||
Reference in New Issue
Block a user