snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-26 12:05:05 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fix benches

Browse Source
This commit is contained in:
Louis Dureuil 2023-11-06 11:56:46 +01:00
parent cbaa54cafd
commit 620fee35f9
No known key found for this signature in database
1 changed files with 34 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
benchmarks/benches/indexing.rs
View File

@ -264,17 +264,7 @@ fn deleting_songs_in_batches_default(c: &mut Criterion) {
(index, document_ids_to_delete) (index, document_ids_to_delete)
}, },
move |(index, document_ids_to_delete)| { move |(index, document_ids_to_delete)| {
let mut wtxn = index.write_txn().unwrap(); delete_documents_from_ids(index, document_ids_to_delete)
for ids in document_ids_to_delete {
let mut builder = DeleteDocuments::new(&mut wtxn, &index).unwrap();
builder.delete_documents(&ids);
builder.execute().unwrap();
}
wtxn.commit().unwrap();
index.prepare_for_closing().wait();
}, },
) )
}); });
@ -611,17 +601,7 @@ fn deleting_wiki_in_batches_default(c: &mut Criterion) {
(index, document_ids_to_delete) (index, document_ids_to_delete)
}, },
move |(index, document_ids_to_delete)| { move |(index, document_ids_to_delete)| {
let mut wtxn = index.write_txn().unwrap(); delete_documents_from_ids(index, document_ids_to_delete)
for ids in document_ids_to_delete {
let mut builder = DeleteDocuments::new(&mut wtxn, &index).unwrap();
builder.delete_documents(&ids);
builder.execute().unwrap();
}
wtxn.commit().unwrap();
index.prepare_for_closing().wait();
}, },
) )
}); });
@ -873,20 +853,39 @@ fn deleting_movies_in_batches_default(c: &mut Criterion) {
(index, document_ids_to_delete) (index, document_ids_to_delete)
}, },
move |(index, document_ids_to_delete)| { move |(index, document_ids_to_delete)| {
delete_documents_from_ids(index, document_ids_to_delete)
},
)
});
}
fn delete_documents_from_ids(index: Index, document_ids_to_delete: Vec<RoaringBitmap>) {
let mut wtxn = index.write_txn().unwrap(); let mut wtxn = index.write_txn().unwrap();
let indexer_config = IndexerConfig::default();
for ids in document_ids_to_delete { for ids in document_ids_to_delete {
let mut builder = DeleteDocuments::new(&mut wtxn, &index).unwrap(); let external_documents_ids = index.external_documents_ids();
builder.delete_documents(&ids); // FIXME: for filters matching a lot of documents, this will allocate a huge vec of external docids (strings).
// Since what we have is an iterator, it would be better to delete in chunks
let external_to_internal: std::result::Result<Vec<_>, RoaringBitmap> =
external_documents_ids
.find_external_id_of(&wtxn, ids)
.unwrap()
.only_external_ids()
.collect();
let ids = external_to_internal.unwrap();
let config = IndexDocumentsConfig::default();
let mut builder =
IndexDocuments::new(&mut wtxn, &index, &indexer_config, config, |_| (), || false)
.unwrap();
(builder, _) = builder.remove_documents(ids).unwrap();
builder.execute().unwrap(); builder.execute().unwrap();
} }
wtxn.commit().unwrap(); wtxn.commit().unwrap();
index.prepare_for_closing().wait(); index.prepare_for_closing().wait();
},
)
});
} }
fn indexing_movies_in_three_batches(c: &mut Criterion) { fn indexing_movies_in_three_batches(c: &mut Criterion) {
@ -1110,17 +1109,7 @@ fn deleting_nested_movies_in_batches_default(c: &mut Criterion) {
(index, document_ids_to_delete) (index, document_ids_to_delete)
}, },
move |(index, document_ids_to_delete)| { move |(index, document_ids_to_delete)| {
let mut wtxn = index.write_txn().unwrap(); delete_documents_from_ids(index, document_ids_to_delete)
for ids in document_ids_to_delete {
let mut builder = DeleteDocuments::new(&mut wtxn, &index).unwrap();
builder.delete_documents(&ids);
builder.execute().unwrap();
}
wtxn.commit().unwrap();
index.prepare_for_closing().wait();
}, },
) )
}); });
@ -1336,17 +1325,7 @@ fn deleting_geo_in_batches_default(c: &mut Criterion) {
(index, document_ids_to_delete) (index, document_ids_to_delete)
}, },
move |(index, document_ids_to_delete)| { move |(index, document_ids_to_delete)| {
let mut wtxn = index.write_txn().unwrap(); delete_documents_from_ids(index, document_ids_to_delete)
for ids in document_ids_to_delete {
let mut builder = DeleteDocuments::new(&mut wtxn, &index).unwrap();
builder.delete_documents(&ids);
builder.execute().unwrap();
}
wtxn.commit().unwrap();
index.prepare_for_closing().wait();
}, },
) )
}); });