snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-22 18:17:39 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fix settings test

Browse Source
This commit is contained in:
Louis Dureuil 2024-11-19 11:13:04 +01:00 committed by Clément Renault
parent 9e0eb5ebb0
commit df5884b0c1
No known key found for this signature in database
GPG Key ID: F250A4C4E3AE5F5F
1 changed files with 69 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
crates/milli/src/update/settings.rs
View File

@ -1905,8 +1905,7 @@ mod tests {
#[test] #[test]
fn mixup_searchable_with_displayed_fields() { fn mixup_searchable_with_displayed_fields() {
let mut index = TempIndex::new(); let index = TempIndex::new();
index.index_documents_config.autogenerate_docids = true;
let mut wtxn = index.write_txn().unwrap(); let mut wtxn = index.write_txn().unwrap();
// First we send 3 documents with ids from 1 to 3. // First we send 3 documents with ids from 1 to 3.
@ -1914,9 +1913,9 @@ mod tests {
.add_documents_using_wtxn( .add_documents_using_wtxn(
&mut wtxn, &mut wtxn,
documents!([ documents!([
{ "name": "kevin", "age": 23}, { "id": 0, "name": "kevin", "age": 23},
{ "name": "kevina", "age": 21 }, { "id": 1, "name": "kevina", "age": 21 },
{ "name": "benoit", "age": 34 } { "id": 2, "name": "benoit", "age": 34 }
]), ]),
) )
.unwrap(); .unwrap();
@ -1952,15 +1951,14 @@ mod tests {
#[test] #[test]
fn default_displayed_fields() { fn default_displayed_fields() {
let mut index = TempIndex::new(); let index = TempIndex::new();
index.index_documents_config.autogenerate_docids = true;
// First we send 3 documents with ids from 1 to 3. // First we send 3 documents with ids from 1 to 3.
index index
.add_documents(documents!([ .add_documents(documents!([
{ "name": "kevin", "age": 23}, { "id": 0, "name": "kevin", "age": 23},
{ "name": "kevina", "age": 21 }, { "id": 1, "name": "kevina", "age": 21 },
{ "name": "benoit", "age": 34 } { "id": 2, "name": "benoit", "age": 34 }
])) ]))
.unwrap(); .unwrap();
@ -1972,17 +1970,16 @@ mod tests {
#[test] #[test]
fn set_and_reset_displayed_field() { fn set_and_reset_displayed_field() {
let mut index = TempIndex::new(); let index = TempIndex::new();
index.index_documents_config.autogenerate_docids = true;
let mut wtxn = index.write_txn().unwrap(); let mut wtxn = index.write_txn().unwrap();
index index
.add_documents_using_wtxn( .add_documents_using_wtxn(
&mut wtxn, &mut wtxn,
documents!([ documents!([
{ "name": "kevin", "age": 23}, { "id": 0, "name": "kevin", "age": 23},
{ "name": "kevina", "age": 21 }, { "id": 1, "name": "kevina", "age": 21 },
{ "name": "benoit", "age": 34 } { "id": 2, "name": "benoit", "age": 34 }
]), ]),
) )
.unwrap(); .unwrap();
@ -2014,8 +2011,7 @@ mod tests {
#[test] #[test]
fn set_filterable_fields() { fn set_filterable_fields() {
let mut index = TempIndex::new(); let index = TempIndex::new();
index.index_documents_config.autogenerate_docids = true;
// Set the filterable fields to be the age. // Set the filterable fields to be the age.
index index
@ -2027,9 +2023,9 @@ mod tests {
// Then index some documents. // Then index some documents.
index index
.add_documents(documents!([ .add_documents(documents!([
{ "name": "kevin", "age": 23}, { "id": 0, "name": "kevin", "age": 23},
{ "name": "kevina", "age": 21 }, { "id": 1, "name": "kevina", "age": 21 },
{ "name": "benoit", "age": 34 } { "id": 2, "name": "benoit", "age": 34 }
])) ]))
.unwrap(); .unwrap();
@ -2049,8 +2045,8 @@ mod tests {
let count = index let count = index
.facet_id_f64_docids .facet_id_f64_docids
.remap_key_type::<Bytes>() .remap_key_type::<Bytes>()
// The faceted field id is 1u16 // The faceted field id is 2u16
.prefix_iter(&rtxn, &[0, 1, 0]) .prefix_iter(&rtxn, &[0, 2, 0])
.unwrap() .unwrap()
.count(); .count();
assert_eq!(count, 3); assert_eq!(count, 3);
@ -2059,9 +2055,9 @@ mod tests {
// Index a little more documents with new and current facets values. // Index a little more documents with new and current facets values.
index index
.add_documents(documents!([ .add_documents(documents!([
{ "name": "kevin2", "age": 23}, { "id": 3, "name": "kevin2", "age": 23},
{ "name": "kevina2", "age": 21 }, { "id": 4, "name": "kevina2", "age": 21 },
{ "name": "benoit", "age": 35 } { "id": 5, "name": "benoit", "age": 35 }
])) ]))
.unwrap(); .unwrap();
@ -2070,7 +2066,7 @@ mod tests {
let count = index let count = index
.facet_id_f64_docids .facet_id_f64_docids
.remap_key_type::<Bytes>() .remap_key_type::<Bytes>()
.prefix_iter(&rtxn, &[0, 1, 0]) .prefix_iter(&rtxn, &[0, 2, 0])
.unwrap() .unwrap()
.count(); .count();
assert_eq!(count, 4); assert_eq!(count, 4);
@ -2088,21 +2084,21 @@ mod tests {
assert_eq!(fields_ids, hashset! { S("age"), S("name") }); assert_eq!(fields_ids, hashset! { S("age"), S("name") });
let rtxn = index.read_txn().unwrap(); let rtxn = index.read_txn().unwrap();
// Only count the field_id 0 and level 0 facet values. // Only count the field_id 2 and level 0 facet values.
let count = index let count = index
.facet_id_f64_docids .facet_id_f64_docids
.remap_key_type::<Bytes>() .remap_key_type::<Bytes>()
.prefix_iter(&rtxn, &[0, 1, 0]) .prefix_iter(&rtxn, &[0, 2, 0])
.unwrap() .unwrap()
.count(); .count();
assert_eq!(count, 4); assert_eq!(count, 4);
let rtxn = index.read_txn().unwrap(); let rtxn = index.read_txn().unwrap();
// Only count the field_id 0 and level 0 facet values. // Only count the field_id 1 and level 0 facet values.
let count = index let count = index
.facet_id_string_docids .facet_id_string_docids
.remap_key_type::<Bytes>() .remap_key_type::<Bytes>()
.prefix_iter(&rtxn, &[0, 0]) .prefix_iter(&rtxn, &[0, 1])
.unwrap() .unwrap()
.count(); .count();
assert_eq!(count, 5); assert_eq!(count, 5);
@ -2120,21 +2116,21 @@ mod tests {
assert_eq!(fields_ids, hashset! { S("name") }); assert_eq!(fields_ids, hashset! { S("name") });
let rtxn = index.read_txn().unwrap(); let rtxn = index.read_txn().unwrap();
// Only count the field_id 0 and level 0 facet values. // Only count the field_id 2 and level 0 facet values.
let count = index let count = index
.facet_id_f64_docids .facet_id_f64_docids
.remap_key_type::<Bytes>() .remap_key_type::<Bytes>()
.prefix_iter(&rtxn, &[0, 1, 0]) .prefix_iter(&rtxn, &[0, 2, 0])
.unwrap() .unwrap()
.count(); .count();
assert_eq!(count, 0); assert_eq!(count, 0);
let rtxn = index.read_txn().unwrap(); let rtxn = index.read_txn().unwrap();
// Only count the field_id 0 and level 0 facet values. // Only count the field_id 1 and level 0 facet values.
let count = index let count = index
.facet_id_string_docids .facet_id_string_docids
.remap_key_type::<Bytes>() .remap_key_type::<Bytes>()
.prefix_iter(&rtxn, &[0, 0]) .prefix_iter(&rtxn, &[0, 1])
.unwrap() .unwrap()
.count(); .count();
assert_eq!(count, 5); assert_eq!(count, 5);
@ -2142,8 +2138,7 @@ mod tests {
#[test] #[test]
fn set_asc_desc_field() { fn set_asc_desc_field() {
let mut index = TempIndex::new(); let index = TempIndex::new();
index.index_documents_config.autogenerate_docids = true;
// Set the filterable fields to be the age. // Set the filterable fields to be the age.
index index
@ -2156,9 +2151,9 @@ mod tests {
// Then index some documents. // Then index some documents.
index index
.add_documents(documents!([ .add_documents(documents!([
{ "name": "kevin", "age": 23}, { "id": 0, "name": "kevin", "age": 23},
{ "name": "kevina", "age": 21 }, { "id": 1, "name": "kevina", "age": 21 },
{ "name": "benoit", "age": 34 } { "id": 2, "name": "benoit", "age": 34 }
])) ]))
.unwrap(); .unwrap();
@ -2180,8 +2175,7 @@ mod tests {
#[test] #[test]
fn set_distinct_field() { fn set_distinct_field() {
let mut index = TempIndex::new(); let index = TempIndex::new();
index.index_documents_config.autogenerate_docids = true;
// Set the filterable fields to be the age. // Set the filterable fields to be the age.
index index
@ -2195,13 +2189,13 @@ mod tests {
// Then index some documents. // Then index some documents.
index index
.add_documents(documents!([ .add_documents(documents!([
{ "name": "kevin", "age": 23 }, { "id": 0, "name": "kevin", "age": 23 },
{ "name": "kevina", "age": 21 }, { "id": 1, "name": "kevina", "age": 21 },
{ "name": "benoit", "age": 34 }, { "id": 2, "name": "benoit", "age": 34 },
{ "name": "bernard", "age": 34 }, { "id": 3, "name": "bernard", "age": 34 },
{ "name": "bertrand", "age": 34 }, { "id": 4, "name": "bertrand", "age": 34 },
{ "name": "bernie", "age": 34 }, { "id": 5, "name": "bernie", "age": 34 },
{ "name": "ben", "age": 34 } { "id": 6, "name": "ben", "age": 34 }
])) ]))
.unwrap(); .unwrap();
@ -2215,8 +2209,7 @@ mod tests {
#[test] #[test]
fn set_nested_distinct_field() { fn set_nested_distinct_field() {
let mut index = TempIndex::new(); let index = TempIndex::new();
index.index_documents_config.autogenerate_docids = true;
// Set the filterable fields to be the age. // Set the filterable fields to be the age.
index index
@ -2230,13 +2223,13 @@ mod tests {
// Then index some documents. // Then index some documents.
index index
.add_documents(documents!([ .add_documents(documents!([
{ "person": { "name": "kevin", "age": 23 }}, { "id": 0, "person": { "name": "kevin", "age": 23 }},
{ "person": { "name": "kevina", "age": 21 }}, { "id": 1, "person": { "name": "kevina", "age": 21 }},
{ "person": { "name": "benoit", "age": 34 }}, { "id": 2, "person": { "name": "benoit", "age": 34 }},
{ "person": { "name": "bernard", "age": 34 }}, { "id": 3, "person": { "name": "bernard", "age": 34 }},
{ "person": { "name": "bertrand", "age": 34 }}, { "id": 4, "person": { "name": "bertrand", "age": 34 }},
{ "person": { "name": "bernie", "age": 34 }}, { "id": 5, "person": { "name": "bernie", "age": 34 }},
{ "person": { "name": "ben", "age": 34 }} { "id": 6, "person": { "name": "ben", "age": 34 }}
])) ]))
.unwrap(); .unwrap();
@ -2250,15 +2243,14 @@ mod tests {
#[test] #[test]
fn default_stop_words() { fn default_stop_words() {
let mut index = TempIndex::new(); let index = TempIndex::new();
index.index_documents_config.autogenerate_docids = true;
// First we send 3 documents with ids from 1 to 3. // First we send 3 documents with ids from 1 to 3.
index index
.add_documents(documents!([ .add_documents(documents!([
{ "name": "kevin", "age": 23}, { "id": 0, "name": "kevin", "age": 23},
{ "name": "kevina", "age": 21 }, { "id": 1, "name": "kevina", "age": 21 },
{ "name": "benoit", "age": 34 } { "id": 2, "name": "benoit", "age": 34 }
])) ]))
.unwrap(); .unwrap();
@ -2270,8 +2262,7 @@ mod tests {
#[test] #[test]
fn set_and_reset_stop_words() { fn set_and_reset_stop_words() {
let mut index = TempIndex::new(); let index = TempIndex::new();
index.index_documents_config.autogenerate_docids = true;
let mut wtxn = index.write_txn().unwrap(); let mut wtxn = index.write_txn().unwrap();
// First we send 3 documents with ids from 1 to 3. // First we send 3 documents with ids from 1 to 3.
@ -2279,9 +2270,9 @@ mod tests {
.add_documents_using_wtxn( .add_documents_using_wtxn(
&mut wtxn, &mut wtxn,
documents!([ documents!([
{ "name": "kevin", "age": 23, "maxim": "I love dogs" }, { "id": 0, "name": "kevin", "age": 23, "maxim": "I love dogs" },
{ "name": "kevina", "age": 21, "maxim": "Doggos are the best" }, { "id": 1, "name": "kevina", "age": 21, "maxim": "Doggos are the best" },
{ "name": "benoit", "age": 34, "maxim": "The crepes are really good" }, { "id": 2, "name": "benoit", "age": 34, "maxim": "The crepes are really good" },
]), ]),
) )
.unwrap(); .unwrap();
@ -2347,8 +2338,7 @@ mod tests {
#[test] #[test]
fn set_and_reset_synonyms() { fn set_and_reset_synonyms() {
let mut index = TempIndex::new(); let index = TempIndex::new();
index.index_documents_config.autogenerate_docids = true;
let mut wtxn = index.write_txn().unwrap(); let mut wtxn = index.write_txn().unwrap();
// Send 3 documents with ids from 1 to 3. // Send 3 documents with ids from 1 to 3.
@ -2356,9 +2346,9 @@ mod tests {
.add_documents_using_wtxn( .add_documents_using_wtxn(
&mut wtxn, &mut wtxn,
documents!([ documents!([
{ "name": "kevin", "age": 23, "maxim": "I love dogs"}, { "id": 0, "name": "kevin", "age": 23, "maxim": "I love dogs"},
{ "name": "kevina", "age": 21, "maxim": "Doggos are the best"}, { "id": 1, "name": "kevina", "age": 21, "maxim": "Doggos are the best"},
{ "name": "benoit", "age": 34, "maxim": "The crepes are really good"}, { "id": 2, "name": "benoit", "age": 34, "maxim": "The crepes are really good"},
]), ]),
) )
.unwrap(); .unwrap();
@ -2411,8 +2401,7 @@ mod tests {
#[test] #[test]
fn thai_synonyms() { fn thai_synonyms() {
let mut index = TempIndex::new(); let index = TempIndex::new();
index.index_documents_config.autogenerate_docids = true;
let mut wtxn = index.write_txn().unwrap(); let mut wtxn = index.write_txn().unwrap();
// Send 3 documents with ids from 1 to 3. // Send 3 documents with ids from 1 to 3.
@ -2420,8 +2409,8 @@ mod tests {
.add_documents_using_wtxn( .add_documents_using_wtxn(
&mut wtxn, &mut wtxn,
documents!([ documents!([
{ "name": "ยี่ปุ่น" }, { "id": 0, "name": "ยี่ปุ่น" },
{ "name": "ญี่ปุ่น" }, { "id": 1, "name": "ญี่ปุ่น" },
]), ]),
) )
.unwrap(); .unwrap();
@ -2500,8 +2489,7 @@ mod tests {
#[test] #[test]
fn setting_primary_key() { fn setting_primary_key() {
let mut index = TempIndex::new(); let index = TempIndex::new();
index.index_documents_config.autogenerate_docids = true;
let mut wtxn = index.write_txn().unwrap(); let mut wtxn = index.write_txn().unwrap();
// Set the primary key settings // Set the primary key settings
@ -2510,6 +2498,8 @@ mod tests {
settings.set_primary_key(S("mykey")); settings.set_primary_key(S("mykey"));
}) })
.unwrap(); .unwrap();
wtxn.commit().unwrap();
let mut wtxn = index.write_txn().unwrap();
assert_eq!(index.primary_key(&wtxn).unwrap(), Some("mykey")); assert_eq!(index.primary_key(&wtxn).unwrap(), Some("mykey"));
// Then index some documents with the "mykey" primary key. // Then index some documents with the "mykey" primary key.
@ -2565,8 +2555,7 @@ mod tests {
#[test] #[test]
fn setting_impact_relevancy() { fn setting_impact_relevancy() {
let mut index = TempIndex::new(); let index = TempIndex::new();
index.index_documents_config.autogenerate_docids = true;
// Set the genres setting // Set the genres setting
index index