mirror of
https://github.com/meilisearch/meilisearch.git
synced 2025-09-27 07:16:26 +00:00
Switch from version to backend selector
This commit is contained in:
@ -82,7 +82,7 @@ fn evaluate_inner(
|
||||
embedding_configs: &[IndexEmbeddingConfig],
|
||||
filter: &VectorFilter<'_>,
|
||||
) -> crate::Result<RoaringBitmap> {
|
||||
let index_version = index.get_version(rtxn)?.unwrap();
|
||||
let backend = index.get_vector_store(rtxn)?;
|
||||
let embedder_name = embedder.value();
|
||||
let available_embedders =
|
||||
|| embedding_configs.iter().map(|c| c.name.clone()).collect::<Vec<_>>();
|
||||
@ -98,7 +98,7 @@ fn evaluate_inner(
|
||||
.ok_or_else(|| EmbedderDoesNotExist { embedder, available: available_embedders() })?;
|
||||
|
||||
let vector_store = VectorStore::new(
|
||||
index_version,
|
||||
backend,
|
||||
index.vector_store,
|
||||
embedder_info.embedder_id,
|
||||
embedding_config.config.quantized(),
|
||||
|
@ -54,14 +54,11 @@ impl<Q: RankingRuleQueryTrait> VectorSort<Q> {
|
||||
vector_candidates: &RoaringBitmap,
|
||||
) -> Result<()> {
|
||||
let target = &self.target;
|
||||
let backend = ctx.index.get_vector_store(ctx.txn)?;
|
||||
|
||||
let before = Instant::now();
|
||||
let reader = VectorStore::new(
|
||||
ctx.index.get_version(ctx.txn)?.unwrap(),
|
||||
ctx.index.vector_store,
|
||||
self.embedder_index,
|
||||
self.quantized,
|
||||
);
|
||||
let reader =
|
||||
VectorStore::new(backend, ctx.index.vector_store, self.embedder_index, self.quantized);
|
||||
let results = reader.nns_by_vector(ctx.txn, target, self.limit, Some(vector_candidates))?;
|
||||
self.cached_sorted_docids = results.into_iter();
|
||||
*ctx.vector_store_stats.get_or_insert_default() += VectorStoreStats {
|
||||
|
@ -72,12 +72,10 @@ impl<'a> Similar<'a> {
|
||||
crate::UserError::InvalidSimilarEmbedder(self.embedder_name.to_owned())
|
||||
})?;
|
||||
|
||||
let reader = VectorStore::new(
|
||||
self.index.get_version(self.rtxn)?.unwrap(),
|
||||
self.index.vector_store,
|
||||
embedder_index,
|
||||
self.quantized,
|
||||
);
|
||||
let backend = self.index.get_vector_store(self.rtxn)?;
|
||||
|
||||
let reader =
|
||||
VectorStore::new(backend, self.index.vector_store, embedder_index, self.quantized);
|
||||
let results = reader.nns_by_item(
|
||||
self.rtxn,
|
||||
self.id,
|
||||
|
Reference in New Issue
Block a user