Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions src/search.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,19 +142,23 @@ impl SearchProcessor {
let query = Query::new_nearest(vector);

if let Some(prefetch_limit) = self.args.prefetch {
let prefetch_query = PrefetchQueryBuilder::default();

prefetch_query.query(query.clone());

let mut params = SearchParamsBuilder::default()
let mut prefetch_params = SearchParamsBuilder::default()
.quantization(QuantizationSearchParamsBuilder::default().rescore(false));

if let Some(hnsw_ef) = self.args.hnsw_ef_construct {
params = params.hnsw_ef(hnsw_ef as u64);
if let Some(hnsw_ef) = self.args.search_hnsw_ef {
prefetch_params = prefetch_params.hnsw_ef(hnsw_ef as u64);
}

request_builder = request_builder.params(params);
request_builder = request_builder.limit(prefetch_limit as u64);
let prefetch = PrefetchQueryBuilder::default()
.query(query.clone())
.params(prefetch_params)
.limit(prefetch_limit as u64)
.build();

request_builder = request_builder.prefetch(vec![prefetch]);
request_builder = request_builder.params(search_params);
} else {
request_builder = request_builder.params(search_params);
}

request_builder = request_builder.query(query);
Expand All @@ -163,8 +167,6 @@ impl SearchProcessor {
request_builder = request_builder.read_consistency(read_consistency);
}

request_builder = request_builder.params(search_params);

request_builder
}

Expand Down Expand Up @@ -226,7 +228,7 @@ impl SearchProcessor {
.quantization(quantization_params_builder)
.indexed_only(self.args.indexed_only.unwrap_or_default());

if let Some(hnsw_ef) = self.args.hnsw_ef_construct {
if let Some(hnsw_ef) = self.args.search_hnsw_ef {
search_params = search_params.hnsw_ef(hnsw_ef as u64);
}

Expand Down