Clean code

This commit is contained in:
Mubelotix
2025-07-08 12:03:32 +02:00
parent b4cafec8b3
commit 29b74424ad
5 changed files with 4 additions and 7 deletions

View File

@ -1003,7 +1003,7 @@ async fn vector_filter_negation() {
#[actix_rt::test] #[actix_rt::test]
async fn vector_filter_or_combination() { async fn vector_filter_or_combination() {
let index = crate::vector::shared_index_for_fragments().await; let index = crate::vector::shared_index_for_fragments().await;
let (value, _code) = index let (value, _code) = index
.search_post(json!({ .search_post(json!({

View File

@ -1776,7 +1776,7 @@ impl Index {
embedder_info.embedder_id, embedder_info.embedder_id,
config.config.quantized(), config.config.quantized(),
); );
let embeddings = reader.item_vectors(rtxn, docid)?; // MARKER let embeddings = reader.item_vectors(rtxn, docid)?;
res.insert( res.insert(
config.name.to_owned(), config.name.to_owned(),
(embeddings, embedder_info.embedding_status.must_regenerate(docid)), (embeddings, embedder_info.embedding_status.must_regenerate(docid)),

View File

@ -234,11 +234,9 @@ impl<'a> Filter<'a> {
pub fn evaluate(&self, rtxn: &heed::RoTxn<'_>, index: &Index) -> Result<RoaringBitmap> { pub fn evaluate(&self, rtxn: &heed::RoTxn<'_>, index: &Index) -> Result<RoaringBitmap> {
// to avoid doing this for each recursive call we're going to do it ONCE ahead of time // to avoid doing this for each recursive call we're going to do it ONCE ahead of time
let fields_ids_map = index.fields_ids_map(rtxn)?; let fields_ids_map = index.fields_ids_map(rtxn)?;
let filterable_attributes_rules = dbg!(index.filterable_attributes_rules(rtxn)?); let filterable_attributes_rules = index.filterable_attributes_rules(rtxn)?;
for fid in self.condition.fids(MAX_FILTER_DEPTH) { for fid in self.condition.fids(MAX_FILTER_DEPTH) {
println!("{fid:?}");
let attribute = fid.value(); let attribute = fid.value();
if matching_features(attribute, &filterable_attributes_rules) if matching_features(attribute, &filterable_attributes_rules)
.is_some_and(|(_, features)| features.is_filterable()) .is_some_and(|(_, features)| features.is_filterable())

View File

@ -9,7 +9,6 @@ pub(super) struct VectorFilter<'a> {
embedder_token: Option<Token<'a>>, embedder_token: Option<Token<'a>>,
fragment_token: Option<Token<'a>>, fragment_token: Option<Token<'a>>,
user_provided: bool, user_provided: bool,
// TODO: not_user_provided: bool,
} }
#[derive(Debug)] #[derive(Debug)]

View File

@ -966,7 +966,7 @@ impl<'a, 'i> Transform<'a, 'i> {
// some user provided, remove only the ids that are not user provided // some user provided, remove only the ids that are not user provided
let to_delete = arroy.items_in_store(wtxn, *fragment_id, |items| { let to_delete = arroy.items_in_store(wtxn, *fragment_id, |items| {
items - infos.embedding_status.user_provided_docids() items - infos.embedding_status.user_provided_docids()
})?; // MARKER })?;
for to_delete in to_delete { for to_delete in to_delete {
arroy.del_item_in_store(wtxn, to_delete, *fragment_id, dimensions)?; arroy.del_item_in_store(wtxn, to_delete, *fragment_id, dimensions)?;