searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-12-24 21:50:07 +01:00
Code Issues Releases Wiki Activity

Make deletion tests for both soft-deletion and hard-deletion

Browse Source
This commit is contained in:
Loïc Lecrenier 2022-09-22 14:01:13 +02:00 committed by Loïc Lecrenier
parent ab5e56fd16
commit e3ba1fc883
46 changed files with 533 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
milli/src/snapshot_tests.rs
View File

@ -287,6 +287,12 @@ pub fn snap_facet_id_f64_docids(index: &Index) -> String {
}); });
snap snap
} }
pub fn snap_facet_id_exists_docids(index: &Index) -> String {
let snap = make_db_snap_from_iter!(index, facet_id_exists_docids, |(facet_id, docids)| {
&format!("{facet_id:<3} {}", display_bitmap(&docids))
});
snap
}
pub fn snap_facet_id_string_docids(index: &Index) -> String { pub fn snap_facet_id_string_docids(index: &Index) -> String {
let snap = make_db_snap_from_iter!(index, facet_id_string_docids, |( let snap = make_db_snap_from_iter!(index, facet_id_string_docids, |(
FacetGroupKey { field_id, level, left_bound }, FacetGroupKey { field_id, level, left_bound },
@ -488,6 +494,9 @@ macro_rules! full_snap_of_db {
}}; }};
($index:ident, field_id_docid_facet_strings) => {{ ($index:ident, field_id_docid_facet_strings) => {{
$crate::snapshot_tests::snap_field_id_docid_facet_strings(&$index) $crate::snapshot_tests::snap_field_id_docid_facet_strings(&$index)
}};
($index:ident, facet_id_exists_docids) => {{
$crate::snapshot_tests::snap_facet_id_exists_docids(&$index)
}}; }};
($index:ident, documents_ids) => {{ ($index:ident, documents_ids) => {{
$crate::snapshot_tests::snap_documents_ids(&$index) $crate::snapshot_tests::snap_documents_ids(&$index)

336
milli/src/update/delete_documents.rs
View File

@ -640,6 +640,7 @@ mod tests {
wtxn: &mut RwTxn<'t, '_>, wtxn: &mut RwTxn<'t, '_>,
index: &'t Index, index: &'t Index,
external_ids: &[&str], external_ids: &[&str],
disable_soft_deletion: bool,
) -> Vec<u32> { ) -> Vec<u32> {
let external_document_ids = index.external_documents_ids(&wtxn).unwrap(); let external_document_ids = index.external_documents_ids(&wtxn).unwrap();
let ids_to_delete: Vec<u32> = external_ids let ids_to_delete: Vec<u32> = external_ids
@ -649,14 +650,14 @@ mod tests {
// Delete some documents. // Delete some documents.
let mut builder = DeleteDocuments::new(wtxn, index).unwrap(); let mut builder = DeleteDocuments::new(wtxn, index).unwrap();
builder.disable_soft_deletion(disable_soft_deletion);
external_ids.iter().for_each(|id| drop(builder.delete_external_id(id))); external_ids.iter().for_each(|id| drop(builder.delete_external_id(id)));
builder.execute().unwrap(); builder.execute().unwrap();
ids_to_delete ids_to_delete
} }
#[test] fn delete_documents_with_numbers_as_primary_key_(disable_soft_deletion: bool) {
fn delete_documents_with_numbers_as_primary_key() {
let index = TempIndex::new(); let index = TempIndex::new();
let mut wtxn = index.write_txn().unwrap(); let mut wtxn = index.write_txn().unwrap();
@ -676,13 +677,17 @@ mod tests {
builder.delete_document(0); builder.delete_document(0);
builder.delete_document(1); builder.delete_document(1);
builder.delete_document(2); builder.delete_document(2);
builder.disable_soft_deletion(disable_soft_deletion);
builder.execute().unwrap(); builder.execute().unwrap();
wtxn.commit().unwrap(); wtxn.commit().unwrap();
db_snap!(index, documents_ids, @"[]"); // All these snapshots should be empty since the database was cleared
db_snap!(index, word_docids, @""); db_snap!(index, documents_ids, disable_soft_deletion);
db_snap!(index, soft_deleted_documents_ids, @"[]"); db_snap!(index, word_docids, disable_soft_deletion);
db_snap!(index, word_pair_proximity_docids, disable_soft_deletion);
db_snap!(index, facet_id_exists_docids, disable_soft_deletion);
db_snap!(index, soft_deleted_documents_ids, disable_soft_deletion);
let rtxn = index.read_txn().unwrap(); let rtxn = index.read_txn().unwrap();
@ -690,7 +695,12 @@ mod tests {
} }
#[test] #[test]
fn delete_documents_with_strange_primary_key() { fn delete_documents_with_numbers_as_primary_key() {
delete_documents_with_numbers_as_primary_key_(true);
delete_documents_with_numbers_as_primary_key_(false);
}
fn delete_documents_with_strange_primary_key_(disable_soft_deletion: bool) {
let index = TempIndex::new(); let index = TempIndex::new();
index index
@ -710,34 +720,31 @@ mod tests {
.unwrap(); .unwrap();
wtxn.commit().unwrap(); wtxn.commit().unwrap();
db_snap!(index, documents_ids, @"[0, 1, 2, ]");
db_snap!(index, word_docids, @r###"
benoit [2, ]
kevin [0, ]
kevina [1, ]
"###);
db_snap!(index, soft_deleted_documents_ids, @"[]");
let mut wtxn = index.write_txn().unwrap(); let mut wtxn = index.write_txn().unwrap();
// Delete not all of the documents but some of them. // Delete not all of the documents but some of them.
let mut builder = DeleteDocuments::new(&mut wtxn, &index).unwrap(); let mut builder = DeleteDocuments::new(&mut wtxn, &index).unwrap();
builder.delete_external_id("0"); builder.delete_external_id("0");
builder.delete_external_id("1"); builder.delete_external_id("1");
builder.disable_soft_deletion(disable_soft_deletion);
builder.execute().unwrap(); builder.execute().unwrap();
wtxn.commit().unwrap(); wtxn.commit().unwrap();
db_snap!(index, documents_ids, @"[2, ]"); db_snap!(index, documents_ids, disable_soft_deletion);
db_snap!(index, word_docids, @r###" db_snap!(index, word_docids, disable_soft_deletion);
benoit [2, ] db_snap!(index, word_pair_proximity_docids, disable_soft_deletion);
kevin [0, ] db_snap!(index, soft_deleted_documents_ids, disable_soft_deletion);
kevina [1, ]
"###);
db_snap!(index, soft_deleted_documents_ids, @"[0, 1, ]");
} }
#[test] #[test]
fn filtered_placeholder_search_should_not_return_deleted_documents() { fn delete_documents_with_strange_primary_key() {
delete_documents_with_strange_primary_key_(true);
delete_documents_with_strange_primary_key_(false);
}
fn filtered_placeholder_search_should_not_return_deleted_documents_(
disable_soft_deletion: bool,
) {
let index = TempIndex::new(); let index = TempIndex::new();
let mut wtxn = index.write_txn().unwrap(); let mut wtxn = index.write_txn().unwrap();
@ -745,7 +752,7 @@ mod tests {
index index
.update_settings_using_wtxn(&mut wtxn, |settings| { .update_settings_using_wtxn(&mut wtxn, |settings| {
settings.set_primary_key(S("docid")); settings.set_primary_key(S("docid"));
settings.set_filterable_fields(hashset! { S("label") }); settings.set_filterable_fields(hashset! { S("label"), S("label2") });
}) })
.unwrap(); .unwrap();
@ -780,7 +787,7 @@ mod tests {
) )
.unwrap(); .unwrap();
delete_documents(&mut wtxn, &index, &["1_4"]); delete_documents(&mut wtxn, &index, &["1_4", "1_70", "1_72"], disable_soft_deletion);
// Placeholder search with filter // Placeholder search with filter
let filter = Filter::from_str("label = sign").unwrap().unwrap(); let filter = Filter::from_str("label = sign").unwrap().unwrap();
@ -789,21 +796,27 @@ mod tests {
wtxn.commit().unwrap(); wtxn.commit().unwrap();
db_snap!(index, soft_deleted_documents_ids, @"[0, ]"); db_snap!(index, soft_deleted_documents_ids, disable_soft_deletion);
db_snap!(index, word_docids, @"e89cd44832e960519823e12b1e7e28af"); db_snap!(index, word_docids, disable_soft_deletion);
db_snap!(index, facet_id_f64_docids, @""); db_snap!(index, facet_id_f64_docids, disable_soft_deletion);
db_snap!(index, facet_id_string_docids, @"720ee1ba8c18342f3714c5863bc6c1f5"); db_snap!(index, word_pair_proximity_docids, disable_soft_deletion);
db_snap!(index, facet_id_exists_docids, disable_soft_deletion);
db_snap!(index, facet_id_string_docids, disable_soft_deletion);
} }
#[test] #[test]
fn facet_hard_deletion() { fn filtered_placeholder_search_should_not_return_deleted_documents() {
filtered_placeholder_search_should_not_return_deleted_documents_(true);
filtered_placeholder_search_should_not_return_deleted_documents_(false);
}
fn placeholder_search_should_not_return_deleted_documents_(disable_soft_deletion: bool) {
let index = TempIndex::new(); let index = TempIndex::new();
let mut wtxn = index.write_txn().unwrap(); let mut wtxn = index.write_txn().unwrap();
index index
.update_settings_using_wtxn(&mut wtxn, |settings| { .update_settings_using_wtxn(&mut wtxn, |settings| {
settings.set_primary_key(S("docid")); settings.set_primary_key(S("docid"));
settings.set_filterable_fields(hashset! { S("label") });
}) })
.unwrap(); .unwrap();
@ -838,78 +851,8 @@ mod tests {
) )
.unwrap(); .unwrap();
// Delete not all of the documents but some of them. let deleted_internal_ids =
let mut builder = DeleteDocuments::new(&mut wtxn, &index).unwrap(); delete_documents(&mut wtxn, &index, &["1_4"], disable_soft_deletion);
builder.disable_soft_deletion(true);
builder.delete_external_id("1_4");
builder.execute().unwrap();
wtxn.commit().unwrap();
db_snap!(index, soft_deleted_documents_ids, 1, @"[]");
db_snap!(index, word_docids, 1, @"999733c2461093d4873321902fc8dcd7");
db_snap!(index, facet_id_f64_docids, 1, @"");
db_snap!(index, facet_id_string_docids, 1, @"a12e80655ed5f0f8e869bb9c32af61e9");
let mut wtxn = index.write_txn().unwrap();
// Delete more than one document
let mut builder = DeleteDocuments::new(&mut wtxn, &index).unwrap();
builder.disable_soft_deletion(true);
builder.delete_external_id("1_5");
builder.delete_external_id("1_7");
builder.delete_external_id("1_70");
builder.delete_external_id("1_72");
builder.execute().unwrap();
wtxn.commit().unwrap();
db_snap!(index, soft_deleted_documents_ids, 2, @"[]");
db_snap!(index, word_docids, 2, @"b892636eaff43c917d5aa8b09c107a02");
db_snap!(index, facet_id_f64_docids, 2, @"");
db_snap!(index, facet_id_string_docids, 2, @"b9946a9cb0ed2df40352e98d6836c8d0");
}
#[test]
fn placeholder_search_should_not_return_deleted_documents() {
let index = TempIndex::new();
let mut wtxn = index.write_txn().unwrap();
index
.update_settings_using_wtxn(&mut wtxn, |settings| {
settings.set_primary_key(S("docid"));
})
.unwrap();
index
.add_documents_using_wtxn(
&mut wtxn,
documents!([
{ "docid": "1_4", "label": "sign" },
{ "docid": "1_5", "label": "letter" },
{ "docid": "1_7", "label": "abstract,cartoon,design,pattern" },
{ "docid": "1_36", "label": "drawing,painting,pattern" },
{ "docid": "1_37", "label": "art,drawing,outdoor" },
{ "docid": "1_38", "label": "aquarium,art,drawing" },
{ "docid": "1_39", "label": "abstract" },
{ "docid": "1_40", "label": "cartoon" },
{ "docid": "1_41", "label": "art,drawing" },
{ "docid": "1_42", "label": "art,pattern" },
{ "docid": "1_43", "label": "abstract,art,drawing,pattern" },
{ "docid": "1_44", "label": "drawing" },
{ "docid": "1_45", "label": "art" },
{ "docid": "1_46", "label": "abstract,colorfulness,pattern" },
{ "docid": "1_47", "label": "abstract,pattern" },
{ "docid": "1_52", "label": "abstract,cartoon" },
{ "docid": "1_57", "label": "abstract,drawing,pattern" },
{ "docid": "1_58", "label": "abstract,art,cartoon" },
{ "docid": "1_68", "label": "design" },
{ "docid": "1_69", "label": "geometry" }
]),
)
.unwrap();
let deleted_internal_ids = delete_documents(&mut wtxn, &index, &["1_4"]);
// Placeholder search // Placeholder search
let results = index.search(&wtxn).execute().unwrap(); let results = index.search(&wtxn).execute().unwrap();
@ -923,12 +866,15 @@ mod tests {
} }
wtxn.commit().unwrap(); wtxn.commit().unwrap();
db_snap!(index, soft_deleted_documents_ids, @"[0, ]");
} }
#[test] #[test]
fn search_should_not_return_deleted_documents() { fn placeholder_search_should_not_return_deleted_documents() {
placeholder_search_should_not_return_deleted_documents_(true);
placeholder_search_should_not_return_deleted_documents_(false);
}
fn search_should_not_return_deleted_documents_(disable_soft_deletion: bool) {
let index = TempIndex::new(); let index = TempIndex::new();
let mut wtxn = index.write_txn().unwrap(); let mut wtxn = index.write_txn().unwrap();
@ -942,31 +888,35 @@ mod tests {
.add_documents_using_wtxn( .add_documents_using_wtxn(
&mut wtxn, &mut wtxn,
documents!([ documents!([
{"docid": "1_4", "label": "sign"}, { "docid": "1_4", "label": ["sign"] },
{"docid": "1_5", "label": "letter"}, { "docid": "1_5", "label": ["letter"] },
{"docid": "1_7", "label": "abstract,cartoon,design,pattern"}, { "docid": "1_7", "label": ["abstract","cartoon","design","pattern"] },
{"docid": "1_36","label": "drawing,painting,pattern"}, { "docid": "1_36", "label": ["drawing","painting","pattern"] },
{"docid": "1_37","label": "art,drawing,outdoor"}, { "docid": "1_37", "label": ["art","drawing","outdoor"] },
{"docid": "1_38","label": "aquarium,art,drawing"}, { "docid": "1_38", "label": ["aquarium","art","drawing"] },
{"docid": "1_39","label": "abstract"}, { "docid": "1_39", "label": ["abstract"] },
{"docid": "1_40","label": "cartoon"}, { "docid": "1_40", "label": ["cartoon"] },
{"docid": "1_41","label": "art,drawing"}, { "docid": "1_41", "label": ["art","drawing"] },
{"docid": "1_42","label": "art,pattern"}, { "docid": "1_42", "label": ["art","pattern"] },
{"docid": "1_43","label": "abstract,art,drawing,pattern"}, { "docid": "1_43", "label": ["abstract","art","drawing","pattern"] },
{"docid": "1_44","label": "drawing"}, { "docid": "1_44", "label": ["drawing"] },
{"docid": "1_45","label": "art"}, { "docid": "1_45", "label": ["art"] },
{"docid": "1_46","label": "abstract,colorfulness,pattern"}, { "docid": "1_46", "label": ["abstract","colorfulness","pattern"] },
{"docid": "1_47","label": "abstract,pattern"}, { "docid": "1_47", "label": ["abstract","pattern"] },
{"docid": "1_52","label": "abstract,cartoon"}, { "docid": "1_52", "label": ["abstract","cartoon"] },
{"docid": "1_57","label": "abstract,drawing,pattern"}, { "docid": "1_57", "label": ["abstract","drawing","pattern"] },
{"docid": "1_58","label": "abstract,art,cartoon"}, { "docid": "1_58", "label": ["abstract","art","cartoon"] },
{"docid": "1_68","label": "design"}, { "docid": "1_68", "label": ["design"] },
{"docid": "1_69","label": "geometry"} { "docid": "1_69", "label": ["geometry"] },
{ "docid": "1_70", "label2": ["geometry", 1.2] },
{ "docid": "1_71", "label2": ["design", 2.2] },
{ "docid": "1_72", "label2": ["geometry", 1.2] }
]), ]),
) )
.unwrap(); .unwrap();
let deleted_internal_ids = delete_documents(&mut wtxn, &index, &["1_7", "1_52"]); let deleted_internal_ids =
delete_documents(&mut wtxn, &index, &["1_7", "1_52"], disable_soft_deletion);
// search for abstract // search for abstract
let results = index.search(&wtxn).query("abstract").execute().unwrap(); let results = index.search(&wtxn).query("abstract").execute().unwrap();
@ -981,11 +931,18 @@ mod tests {
wtxn.commit().unwrap(); wtxn.commit().unwrap();
db_snap!(index, soft_deleted_documents_ids, @"[2, 15, ]"); db_snap!(index, soft_deleted_documents_ids, disable_soft_deletion);
} }
#[test] #[test]
fn geo_filtered_placeholder_search_should_not_return_deleted_documents() { fn search_should_not_return_deleted_documents() {
search_should_not_return_deleted_documents_(true);
search_should_not_return_deleted_documents_(false);
}
fn geo_filtered_placeholder_search_should_not_return_deleted_documents_(
disable_soft_deletion: bool,
) {
let index = TempIndex::new(); let index = TempIndex::new();
let mut wtxn = index.write_txn().unwrap(); let mut wtxn = index.write_txn().unwrap();
@ -1021,7 +978,8 @@ mod tests {
])).unwrap(); ])).unwrap();
let external_ids_to_delete = ["5", "6", "7", "12", "17", "19"]; let external_ids_to_delete = ["5", "6", "7", "12", "17", "19"];
let deleted_internal_ids = delete_documents(&mut wtxn, &index, &external_ids_to_delete); let deleted_internal_ids =
delete_documents(&mut wtxn, &index, &external_ids_to_delete, disable_soft_deletion);
// Placeholder search with geo filter // Placeholder search with geo filter
let filter = Filter::from_str("_geoRadius(50.6924, 3.1763, 20000)").unwrap().unwrap(); let filter = Filter::from_str("_geoRadius(50.6924, 3.1763, 20000)").unwrap().unwrap();
@ -1037,13 +995,18 @@ mod tests {
wtxn.commit().unwrap(); wtxn.commit().unwrap();
db_snap!(index, soft_deleted_documents_ids, @"[4, 5, 6, 11, 16, 18, ]"); db_snap!(index, soft_deleted_documents_ids, disable_soft_deletion);
db_snap!(index, facet_id_f64_docids, @"20727a38c0b1e1a20a44526b85cf2cbc"); db_snap!(index, facet_id_f64_docids, disable_soft_deletion);
db_snap!(index, facet_id_string_docids, @""); db_snap!(index, facet_id_string_docids, disable_soft_deletion);
} }
#[test] #[test]
fn get_documents_should_not_return_deleted_documents() { fn geo_filtered_placeholder_search_should_not_return_deleted_documents() {
geo_filtered_placeholder_search_should_not_return_deleted_documents_(true);
geo_filtered_placeholder_search_should_not_return_deleted_documents_(false);
}
fn get_documents_should_not_return_deleted_documents_(disable_soft_deletion: bool) {
let index = TempIndex::new(); let index = TempIndex::new();
let mut wtxn = index.write_txn().unwrap(); let mut wtxn = index.write_txn().unwrap();
@ -1057,32 +1020,36 @@ mod tests {
.add_documents_using_wtxn( .add_documents_using_wtxn(
&mut wtxn, &mut wtxn,
documents!([ documents!([
{ "docid": "1_4", "label": "sign" }, { "docid": "1_4", "label": ["sign"] },
{ "docid": "1_5", "label": "letter" }, { "docid": "1_5", "label": ["letter"] },
{ "docid": "1_7", "label": "abstract,cartoon,design,pattern" }, { "docid": "1_7", "label": ["abstract","cartoon","design","pattern"] },
{ "docid": "1_36", "label": "drawing,painting,pattern" }, { "docid": "1_36", "label": ["drawing","painting","pattern"] },
{ "docid": "1_37", "label": "art,drawing,outdoor" }, { "docid": "1_37", "label": ["art","drawing","outdoor"] },
{ "docid": "1_38", "label": "aquarium,art,drawing" }, { "docid": "1_38", "label": ["aquarium","art","drawing"] },
{ "docid": "1_39", "label": "abstract" }, { "docid": "1_39", "label": ["abstract"] },
{ "docid": "1_40", "label": "cartoon" }, { "docid": "1_40", "label": ["cartoon"] },
{ "docid": "1_41", "label": "art,drawing" }, { "docid": "1_41", "label": ["art","drawing"] },
{ "docid": "1_42", "label": "art,pattern" }, { "docid": "1_42", "label": ["art","pattern"] },
{ "docid": "1_43", "label": "abstract,art,drawing,pattern" }, { "docid": "1_43", "label": ["abstract","art","drawing","pattern"] },
{ "docid": "1_44", "label": "drawing" }, { "docid": "1_44", "label": ["drawing"] },
{ "docid": "1_45", "label": "art" }, { "docid": "1_45", "label": ["art"] },
{ "docid": "1_46", "label": "abstract,colorfulness,pattern" }, { "docid": "1_46", "label": ["abstract","colorfulness","pattern"] },
{ "docid": "1_47", "label": "abstract,pattern" }, { "docid": "1_47", "label": ["abstract","pattern"] },
{ "docid": "1_52", "label": "abstract,cartoon" }, { "docid": "1_52", "label": ["abstract","cartoon"] },
{ "docid": "1_57", "label": "abstract,drawing,pattern" }, { "docid": "1_57", "label": ["abstract","drawing","pattern"] },
{ "docid": "1_58", "label": "abstract,art,cartoon" }, { "docid": "1_58", "label": ["abstract","art","cartoon"] },
{ "docid": "1_68", "label": "design" }, { "docid": "1_68", "label": ["design"] },
{ "docid": "1_69", "label": "geometry" } { "docid": "1_69", "label": ["geometry"] },
{ "docid": "1_70", "label2": ["geometry", 1.2] },
{ "docid": "1_71", "label2": ["design", 2.2] },
{ "docid": "1_72", "label2": ["geometry", 1.2] }
]), ]),
) )
.unwrap(); .unwrap();
let deleted_external_ids = ["1_7", "1_52"]; let deleted_external_ids = ["1_7", "1_52"];
let deleted_internal_ids = delete_documents(&mut wtxn, &index, &deleted_external_ids); let deleted_internal_ids =
delete_documents(&mut wtxn, &index, &deleted_external_ids, disable_soft_deletion);
// list all documents // list all documents
let results = index.all_documents(&wtxn).unwrap(); let results = index.all_documents(&wtxn).unwrap();
@ -1113,11 +1080,16 @@ mod tests {
wtxn.commit().unwrap(); wtxn.commit().unwrap();
db_snap!(index, soft_deleted_documents_ids, @"[2, 15, ]"); db_snap!(index, soft_deleted_documents_ids, disable_soft_deletion);
} }
#[test] #[test]
fn stats_should_not_return_deleted_documents() { fn get_documents_should_not_return_deleted_documents() {
get_documents_should_not_return_deleted_documents_(true);
get_documents_should_not_return_deleted_documents_(false);
}
fn stats_should_not_return_deleted_documents_(disable_soft_deletion: bool) {
let index = TempIndex::new(); let index = TempIndex::new();
let mut wtxn = index.write_txn().unwrap(); let mut wtxn = index.write_txn().unwrap();
@ -1129,29 +1101,29 @@ mod tests {
.unwrap(); .unwrap();
index.add_documents_using_wtxn(&mut wtxn, documents!([ index.add_documents_using_wtxn(&mut wtxn, documents!([
{ "docid": "1_4", "label": "sign"}, { "docid": "1_4", "label": ["sign"]},
{ "docid": "1_5", "label": "letter"}, { "docid": "1_5", "label": ["letter"]},
{ "docid": "1_7", "label": "abstract,cartoon,design,pattern", "title": "Mickey Mouse"}, { "docid": "1_7", "label": ["abstract","cartoon","design","pattern"], "title": "Mickey Mouse"},
{ "docid": "1_36", "label": "drawing,painting,pattern"}, { "docid": "1_36", "label": ["drawing","painting","pattern"]},
{ "docid": "1_37", "label": "art,drawing,outdoor"}, { "docid": "1_37", "label": ["art","drawing","outdoor"]},
{ "docid": "1_38", "label": "aquarium,art,drawing", "title": "Nemo"}, { "docid": "1_38", "label": ["aquarium","art","drawing"], "title": "Nemo"},
{ "docid": "1_39", "label": "abstract"}, { "docid": "1_39", "label": ["abstract"]},
{ "docid": "1_40", "label": "cartoon"}, { "docid": "1_40", "label": ["cartoon"]},
{ "docid": "1_41", "label": "art,drawing"}, { "docid": "1_41", "label": ["art","drawing"]},
{ "docid": "1_42", "label": "art,pattern"}, { "docid": "1_42", "label": ["art","pattern"]},
{ "docid": "1_43", "label": "abstract,art,drawing,pattern", "number": 32i32}, { "docid": "1_43", "label": ["abstract","art","drawing","pattern"], "number": 32i32},
{ "docid": "1_44", "label": "drawing", "number": 44i32}, { "docid": "1_44", "label": ["drawing"], "number": 44i32},
{ "docid": "1_45", "label": "art"}, { "docid": "1_45", "label": ["art"]},
{ "docid": "1_46", "label": "abstract,colorfulness,pattern"}, { "docid": "1_46", "label": ["abstract","colorfulness","pattern"]},
{ "docid": "1_47", "label": "abstract,pattern"}, { "docid": "1_47", "label": ["abstract","pattern"]},
{ "docid": "1_52", "label": "abstract,cartoon"}, { "docid": "1_52", "label": ["abstract","cartoon"]},
{ "docid": "1_57", "label": "abstract,drawing,pattern"}, { "docid": "1_57", "label": ["abstract","drawing","pattern"]},
{ "docid": "1_58", "label": "abstract,art,cartoon"}, { "docid": "1_58", "label": ["abstract","art","cartoon"]},
{ "docid": "1_68", "label": "design"}, { "docid": "1_68", "label": ["design"]},
{ "docid": "1_69", "label": "geometry"} { "docid": "1_69", "label": ["geometry"]}
])).unwrap(); ])).unwrap();
delete_documents(&mut wtxn, &index, &["1_7", "1_52"]); delete_documents(&mut wtxn, &index, &["1_7", "1_52"], disable_soft_deletion);
// count internal documents // count internal documents
let results = index.number_of_documents(&wtxn).unwrap(); let results = index.number_of_documents(&wtxn).unwrap();
@ -1165,6 +1137,12 @@ mod tests {
wtxn.commit().unwrap(); wtxn.commit().unwrap();
db_snap!(index, soft_deleted_documents_ids, @"[2, 15, ]"); db_snap!(index, soft_deleted_documents_ids, disable_soft_deletion);
}
#[test]
fn stats_should_not_return_deleted_documents() {
stats_should_not_return_deleted_documents_(true);
stats_should_not_return_deleted_documents_(false);
} }
} }

4
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_numbers_as_primary_key/false/documents_ids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---
[]

4
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_numbers_as_primary_key/false/facet_id_exists_docids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---

4
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_numbers_as_primary_key/false/soft_deleted_documents_ids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---
[]

4
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_numbers_as_primary_key/false/word_docids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---

4
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_numbers_as_primary_key/false/word_pair_proximity_docids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---

4
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_numbers_as_primary_key/true/documents_ids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---
[]

4
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_numbers_as_primary_key/true/facet_id_exists_docids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---

4
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_numbers_as_primary_key/true/soft_deleted_documents_ids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---
[]

4
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_numbers_as_primary_key/true/word_docids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---

4
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_numbers_as_primary_key/true/word_pair_proximity_docids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---

4
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_strange_primary_key/false/documents_ids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---
[2, ]

4
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_strange_primary_key/false/facet_id_exists_docids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---

4
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_strange_primary_key/false/soft_deleted_documents_ids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---
[0, 1, ]

7
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_strange_primary_key/false/word_docids.snap Normal file
View File

@ -0,0 +1,7 @@
---
source: milli/src/update/delete_documents.rs
---
benoit [2, ]
kevin [0, ]
kevina [1, ]

4
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_strange_primary_key/false/word_pair_proximity_docids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---

4
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_strange_primary_key/true/documents_ids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---
[2, ]

4
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_strange_primary_key/true/facet_id_exists_docids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---

4
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_strange_primary_key/true/soft_deleted_documents_ids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---
[]

5
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_strange_primary_key/true/word_docids.snap Normal file
View File

@ -0,0 +1,5 @@
---
source: milli/src/update/delete_documents.rs
---
benoit [2, ]

4
milli/src/update/snapshots/delete_documents.rs/delete_documents_with_strange_primary_key/true/word_pair_proximity_docids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---

6
milli/src/update/snapshots/delete_documents.rs/filtered_placeholder_search_should_not_return_deleted_documents/false/facet_id_exists_docids.snap Normal file
View File

@ -0,0 +1,6 @@
---
source: milli/src/update/delete_documents.rs
---
1 [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ]
2 [20, 21, 22, ]

6
milli/src/update/snapshots/delete_documents.rs/filtered_placeholder_search_should_not_return_deleted_documents/false/facet_id_f64_docids.snap Normal file
View File

@ -0,0 +1,6 @@
---
source: milli/src/update/delete_documents.rs
---
2 0 1.2 1.2 [20, 22, ]
2 0 2.2 2.2 [21, ]

19
milli/src/update/snapshots/delete_documents.rs/filtered_placeholder_search_should_not_return_deleted_documents/false/facet_id_string_docids.snap Normal file
View File

@ -0,0 +1,19 @@
---
source: milli/src/update/delete_documents.rs
---
1 abstract abstract [2, 6, 10, 13, 14, 15, 16, 17, ]
1 aquarium aquarium [5, ]
1 art art [4, 5, 8, 9, 10, 12, 17, ]
1 cartoon cartoon [2, 7, 15, 17, ]
1 colorfulness colorfulness [13, ]
1 design design [2, 18, ]
1 drawing drawing [3, 4, 5, 8, 10, 11, 16, ]
1 geometry geometry [19, ]
1 letter letter [1, ]
1 outdoor outdoor [4, ]
1 painting painting [3, ]
1 pattern pattern [2, 3, 9, 10, 13, 14, 16, ]
1 sign sign [0, ]
2 design design [21, ]
2 geometry geometry [20, 22, ]

4
milli/src/update/snapshots/delete_documents.rs/filtered_placeholder_search_should_not_return_deleted_documents/false/soft_deleted_documents_ids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---
[0, ]

42
milli/src/update/snapshots/delete_documents.rs/filtered_placeholder_search_should_not_return_deleted_documents/false/word_docids.snap Normal file
View File

@ -0,0 +1,42 @@
---
source: milli/src/update/delete_documents.rs
---
1.2 [20, 22, ]
1_36 [3, ]
1_37 [4, ]
1_38 [5, ]
1_39 [6, ]
1_4 [0, ]
1_40 [7, ]
1_41 [8, ]
1_42 [9, ]
1_43 [10, ]
1_44 [11, ]
1_45 [12, ]
1_46 [13, ]
1_47 [14, ]
1_5 [1, ]
1_52 [15, ]
1_57 [16, ]
1_58 [17, ]
1_68 [18, ]
1_69 [19, ]
1_7 [2, ]
1_70 [20, ]
1_71 [21, ]
1_72 [22, ]
2.2 [21, ]
abstract [2, 6, 10, 13, 14, 15, 16, 17, ]
aquarium [5, ]
art [4, 5, 8, 9, 10, 12, 17, ]
cartoon [2, 7, 15, 17, ]
colorfulness [13, ]
design [2, 18, 21, ]
drawing [3, 4, 5, 8, 10, 11, 16, ]
geometry [19, 20, 22, ]
letter [1, ]
outdoor [4, ]
painting [3, ]
pattern [2, 3, 9, 10, 13, 14, 16, ]
sign [0, ]

4
milli/src/update/snapshots/delete_documents.rs/filtered_placeholder_search_should_not_return_deleted_documents/false/word_pair_proximity_docids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---

6
milli/src/update/snapshots/delete_documents.rs/filtered_placeholder_search_should_not_return_deleted_documents/true/facet_id_exists_docids.snap Normal file
View File

@ -0,0 +1,6 @@
---
source: milli/src/update/delete_documents.rs
---
1 [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ]
2 [20, 21, 22, ]

6
milli/src/update/snapshots/delete_documents.rs/filtered_placeholder_search_should_not_return_deleted_documents/true/facet_id_f64_docids.snap Normal file
View File

@ -0,0 +1,6 @@
---
source: milli/src/update/delete_documents.rs
---
2 0 1.2 1.2 [20, 22, ]
2 0 2.2 2.2 [21, ]

18
milli/src/update/snapshots/delete_documents.rs/filtered_placeholder_search_should_not_return_deleted_documents/true/facet_id_string_docids.snap Normal file
View File

@ -0,0 +1,18 @@
---
source: milli/src/update/delete_documents.rs
---
1 abstract abstract [2, 6, 10, 13, 14, 15, 16, 17, ]
1 aquarium aquarium [5, ]
1 art art [4, 5, 8, 9, 10, 12, 17, ]
1 cartoon cartoon [2, 7, 15, 17, ]
1 colorfulness colorfulness [13, ]
1 design design [2, 18, ]
1 drawing drawing [3, 4, 5, 8, 10, 11, 16, ]
1 geometry geometry [19, ]
1 letter letter [1, ]
1 outdoor outdoor [4, ]
1 painting painting [3, ]
1 pattern pattern [2, 3, 9, 10, 13, 14, 16, ]
2 design design [21, ]
2 geometry geometry [20, 22, ]

4
milli/src/update/snapshots/delete_documents.rs/filtered_placeholder_search_should_not_return_deleted_documents/true/soft_deleted_documents_ids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---
[]

40
milli/src/update/snapshots/delete_documents.rs/filtered_placeholder_search_should_not_return_deleted_documents/true/word_docids.snap Normal file
View File

@ -0,0 +1,40 @@
---
source: milli/src/update/delete_documents.rs
---
1.2 [20, 22, ]
1_36 [3, ]
1_37 [4, ]
1_38 [5, ]
1_39 [6, ]
1_40 [7, ]
1_41 [8, ]
1_42 [9, ]
1_43 [10, ]
1_44 [11, ]
1_45 [12, ]
1_46 [13, ]
1_47 [14, ]
1_5 [1, ]
1_52 [15, ]
1_57 [16, ]
1_58 [17, ]
1_68 [18, ]
1_69 [19, ]
1_7 [2, ]
1_70 [20, ]
1_71 [21, ]
1_72 [22, ]
2.2 [21, ]
abstract [2, 6, 10, 13, 14, 15, 16, 17, ]
aquarium [5, ]
art [4, 5, 8, 9, 10, 12, 17, ]
cartoon [2, 7, 15, 17, ]
colorfulness [13, ]
design [2, 18, 21, ]
drawing [3, 4, 5, 8, 10, 11, 16, ]
geometry [19, 20, 22, ]
letter [1, ]
outdoor [4, ]
painting [3, ]
pattern [2, 3, 9, 10, 13, 14, 16, ]

4
milli/src/update/snapshots/delete_documents.rs/filtered_placeholder_search_should_not_return_deleted_documents/true/word_pair_proximity_docids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---

48
milli/src/update/snapshots/delete_documents.rs/geo_filtered_placeholder_search_should_not_return_deleted_documents/false/facet_id_f64_docids.snap Normal file
View File

@ -0,0 +1,48 @@
---
source: milli/src/update/delete_documents.rs
---
3 0 48.9021 48.9021 [19, ]
3 0 49.4449 49.4449 [18, ]
3 0 49.9314 49.9314 [17, ]
3 0 50.1112 50.1112 [16, ]
3 0 50.1793 50.1793 [15, ]
3 0 50.2844 50.2844 [14, ]
3 0 50.3518 50.3518 [13, ]
3 0 50.4095 50.4095 [11, ]
3 0 50.4502 50.4502 [12, ]
3 0 50.6053 50.6053 [8, ]
3 0 50.6224 50.6224 [3, ]
3 0 50.6299 50.6299 [0, ]
3 0 50.6312 50.6312 [2, ]
3 0 50.6415 50.6415 [1, ]
3 0 50.6552 50.6552 [4, ]
3 0 50.6924 50.6924 [5, ]
3 0 50.7263 50.7263 [6, ]
3 0 50.7453 50.7453 [7, ]
3 0 50.8466 50.8466 [10, ]
3 0 51.0537 51.0537 [9, ]
3 1 48.9021 50.1112 [16, 17, 18, 19, ]
3 1 50.1793 50.4095 [11, 13, 14, 15, ]
3 1 50.4502 50.6299 [0, 3, 8, 12, ]
3 1 50.6312 50.6924 [1, 2, 4, 5, ]
3 1 50.7263 51.0537 [6, 7, 9, 10, ]
4 0 2.271 2.271 [17, ]
4 0 2.3708 2.3708 [19, ]
4 0 2.7637 2.7637 [14, ]
4 0 2.7913 2.7913 [18, ]
4 0 2.8547 2.8547 [16, ]
4 0 3.0569 3.0569 [0, ]
4 0 3.1106 3.1106 [1, 2, ]
4 0 3.1476 3.1476 [3, ]
4 0 3.1541 3.1541 [6, ]
4 0 3.1763 3.1763 [5, ]
4 0 3.1897 3.1897 [4, ]
4 0 3.2189 3.2189 [15, ]
4 0 3.2206 3.2206 [7, ]
4 0 3.3758 3.3758 [8, ]
4 0 3.5326 3.5326 [13, ]
4 0 3.6957 3.6957 [9, ]
4 0 3.9623 3.9623 [12, ]
4 0 4.337 4.337 [10, ]
4 0 4.4347 4.4347 [11, ]

4
milli/src/update/snapshots/delete_documents.rs/geo_filtered_placeholder_search_should_not_return_deleted_documents/false/facet_id_string_docids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---

4
milli/src/update/snapshots/delete_documents.rs/geo_filtered_placeholder_search_should_not_return_deleted_documents/false/soft_deleted_documents_ids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---
[4, 5, 6, 11, 16, 18, ]

36
milli/src/update/snapshots/delete_documents.rs/geo_filtered_placeholder_search_should_not_return_deleted_documents/true/facet_id_f64_docids.snap Normal file
View File

@ -0,0 +1,36 @@
---
source: milli/src/update/delete_documents.rs
---
3 0 48.9021 48.9021 [19, ]
3 0 49.9314 49.9314 [17, ]
3 0 50.1793 50.1793 [15, ]
3 0 50.2844 50.2844 [14, ]
3 0 50.3518 50.3518 [13, ]
3 0 50.4502 50.4502 [12, ]
3 0 50.6053 50.6053 [8, ]
3 0 50.6224 50.6224 [3, ]
3 0 50.6299 50.6299 [0, ]
3 0 50.6312 50.6312 [2, ]
3 0 50.6415 50.6415 [1, ]
3 0 50.7453 50.7453 [7, ]
3 0 50.8466 50.8466 [10, ]
3 0 51.0537 51.0537 [9, ]
3 1 48.9021 50.1112 [17, 19, ]
3 1 50.1793 50.4095 [13, 14, 15, ]
3 1 50.4502 50.6299 [0, 3, 8, 12, ]
3 1 50.6312 50.6924 [1, 2, ]
3 1 50.7263 51.0537 [7, 9, 10, ]
4 0 2.271 2.271 [17, ]
4 0 2.3708 2.3708 [19, ]
4 0 2.7637 2.7637 [14, ]
4 0 3.0569 3.0569 [0, ]
4 0 3.1106 3.1106 [1, 2, ]
4 0 3.1476 3.1476 [3, ]
4 0 3.2189 3.2189 [15, ]
4 0 3.2206 3.2206 [7, ]
4 0 3.3758 3.3758 [8, ]
4 0 3.5326 3.5326 [13, ]
4 0 3.6957 3.6957 [9, ]
4 0 3.9623 3.9623 [12, ]
4 0 4.337 4.337 [10, ]

4
milli/src/update/snapshots/delete_documents.rs/geo_filtered_placeholder_search_should_not_return_deleted_documents/true/facet_id_string_docids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---

4
milli/src/update/snapshots/delete_documents.rs/geo_filtered_placeholder_search_should_not_return_deleted_documents/true/soft_deleted_documents_ids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---
[]

4
milli/src/update/snapshots/delete_documents.rs/get_documents_should_not_return_deleted_documents/false/soft_deleted_documents_ids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---
[2, 15, ]

4
milli/src/update/snapshots/delete_documents.rs/get_documents_should_not_return_deleted_documents/true/soft_deleted_documents_ids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---
[]

4
milli/src/update/snapshots/delete_documents.rs/search_should_not_return_deleted_documents/false/soft_deleted_documents_ids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---
[2, 15, ]

4
milli/src/update/snapshots/delete_documents.rs/search_should_not_return_deleted_documents/true/soft_deleted_documents_ids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---
[]

4
milli/src/update/snapshots/delete_documents.rs/stats_should_not_return_deleted_documents/false/soft_deleted_documents_ids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---
[2, 15, ]

4
milli/src/update/snapshots/delete_documents.rs/stats_should_not_return_deleted_documents/true/soft_deleted_documents_ids.snap Normal file
View File

@ -0,0 +1,4 @@
---
source: milli/src/update/delete_documents.rs
---
[]