Compare commits

...

2 Commits

Author SHA1 Message Date
b06a7a4861 Update tests 2023-12-20 14:54:44 +01:00
8cc2bc4e17 CHange prefix treasholds to reduce their impact on the indexing time 2023-12-20 14:54:34 +01:00
5 changed files with 58 additions and 58 deletions

View File

@ -371,7 +371,7 @@ fn test_proximity_prefix_db() {
s.scoring_strategy(crate::score_details::ScoringStrategy::Detailed); s.scoring_strategy(crate::score_details::ScoringStrategy::Detailed);
s.query("best s"); s.query("best s");
let SearchResult { documents_ids, document_scores, .. } = s.execute().unwrap(); let SearchResult { documents_ids, document_scores, .. } = s.execute().unwrap();
insta::assert_snapshot!(format!("{documents_ids:?}"), @"[10, 9, 6, 7, 8, 11, 12, 13, 15]"); insta::assert_snapshot!(format!("{documents_ids:?}"), @"[10, 13, 9, 12, 6, 7, 8, 11, 15]");
insta::assert_snapshot!(format!("{document_scores:#?}")); insta::assert_snapshot!(format!("{document_scores:#?}"));
let texts = collect_field_values(&index, &txn, "text", &documents_ids); let texts = collect_field_values(&index, &txn, "text", &documents_ids);
@ -379,13 +379,13 @@ fn test_proximity_prefix_db() {
insta::assert_debug_snapshot!(texts, @r###" insta::assert_debug_snapshot!(texts, @r###"
[ [
"\"this is the best summer meal\"", "\"this is the best summer meal\"",
"\"summer best\"",
"\"this is the best meal of summer\"", "\"this is the best meal of summer\"",
"\"summer x best\"",
"\"this is the best meal I have ever had in such a beautiful summer day\"", "\"this is the best meal I have ever had in such a beautiful summer day\"",
"\"this is the best cooked meal of the summer\"", "\"this is the best cooked meal of the summer\"",
"\"this is the best meal of the summer\"", "\"this is the best meal of the summer\"",
"\"summer x y best\"", "\"summer x y best\"",
"\"summer x best\"",
"\"summer best\"",
"\"this is the best meal I have ever had in such a beautiful winter day\"", "\"this is the best meal I have ever had in such a beautiful winter day\"",
] ]
"###); "###);
@ -423,20 +423,20 @@ fn test_proximity_prefix_db() {
s.scoring_strategy(crate::score_details::ScoringStrategy::Detailed); s.scoring_strategy(crate::score_details::ScoringStrategy::Detailed);
s.query("best win"); s.query("best win");
let SearchResult { documents_ids, document_scores, .. } = s.execute().unwrap(); let SearchResult { documents_ids, document_scores, .. } = s.execute().unwrap();
insta::assert_snapshot!(format!("{documents_ids:?}"), @"[19, 18, 15, 16, 17, 20, 21, 22]"); insta::assert_snapshot!(format!("{documents_ids:?}"), @"[19, 22, 18, 21, 15, 16, 17, 20]");
insta::assert_snapshot!(format!("{document_scores:#?}")); insta::assert_snapshot!(format!("{document_scores:#?}"));
let texts = collect_field_values(&index, &txn, "text", &documents_ids); let texts = collect_field_values(&index, &txn, "text", &documents_ids);
insta::assert_debug_snapshot!(texts, @r###" insta::assert_debug_snapshot!(texts, @r###"
[ [
"\"this is the best winter meal\"", "\"this is the best winter meal\"",
"\"winter best\"",
"\"this is the best meal of winter\"", "\"this is the best meal of winter\"",
"\"winter x best\"",
"\"this is the best meal I have ever had in such a beautiful winter day\"", "\"this is the best meal I have ever had in such a beautiful winter day\"",
"\"this is the best cooked meal of the winter\"", "\"this is the best cooked meal of the winter\"",
"\"this is the best meal of the winter\"", "\"this is the best meal of the winter\"",
"\"winter x y best\"", "\"winter x y best\"",
"\"winter x best\"",
"\"winter best\"",
] ]
"###); "###);
@ -471,20 +471,20 @@ fn test_proximity_prefix_db() {
s.scoring_strategy(crate::score_details::ScoringStrategy::Detailed); s.scoring_strategy(crate::score_details::ScoringStrategy::Detailed);
s.query("best wi"); s.query("best wi");
let SearchResult { documents_ids, document_scores, .. } = s.execute().unwrap(); let SearchResult { documents_ids, document_scores, .. } = s.execute().unwrap();
insta::assert_snapshot!(format!("{documents_ids:?}"), @"[19, 18, 15, 16, 17, 20, 21, 22]"); insta::assert_snapshot!(format!("{documents_ids:?}"), @"[19, 22, 18, 21, 15, 16, 17, 20]");
insta::assert_snapshot!(format!("{document_scores:#?}")); insta::assert_snapshot!(format!("{document_scores:#?}"));
let texts = collect_field_values(&index, &txn, "text", &documents_ids); let texts = collect_field_values(&index, &txn, "text", &documents_ids);
insta::assert_debug_snapshot!(texts, @r###" insta::assert_debug_snapshot!(texts, @r###"
[ [
"\"this is the best winter meal\"", "\"this is the best winter meal\"",
"\"winter best\"",
"\"this is the best meal of winter\"", "\"this is the best meal of winter\"",
"\"winter x best\"",
"\"this is the best meal I have ever had in such a beautiful winter day\"", "\"this is the best meal I have ever had in such a beautiful winter day\"",
"\"this is the best cooked meal of the winter\"", "\"this is the best cooked meal of the winter\"",
"\"this is the best meal of the winter\"", "\"this is the best meal of the winter\"",
"\"winter x y best\"", "\"winter x y best\"",
"\"winter x best\"",
"\"winter best\"",
] ]
"###); "###);
} }

View File

@ -11,6 +11,22 @@ expression: "format!(\"{document_scores:#?}\")"
}, },
), ),
], ],
[
Proximity(
Rank {
rank: 3,
max_rank: 4,
},
),
],
[
Proximity(
Rank {
rank: 2,
max_rank: 4,
},
),
],
[ [
Proximity( Proximity(
Rank { Rank {
@ -51,20 +67,4 @@ expression: "format!(\"{document_scores:#?}\")"
}, },
), ),
], ],
[
Proximity(
Rank {
rank: 1,
max_rank: 4,
},
),
],
[
Proximity(
Rank {
rank: 1,
max_rank: 4,
},
),
],
] ]

View File

@ -11,6 +11,22 @@ expression: "format!(\"{document_scores:#?}\")"
}, },
), ),
], ],
[
Proximity(
Rank {
rank: 3,
max_rank: 4,
},
),
],
[
Proximity(
Rank {
rank: 2,
max_rank: 4,
},
),
],
[ [
Proximity( Proximity(
Rank { Rank {
@ -59,20 +75,4 @@ expression: "format!(\"{document_scores:#?}\")"
}, },
), ),
], ],
[
Proximity(
Rank {
rank: 1,
max_rank: 4,
},
),
],
[
Proximity(
Rank {
rank: 1,
max_rank: 4,
},
),
],
] ]

View File

@ -11,6 +11,22 @@ expression: "format!(\"{document_scores:#?}\")"
}, },
), ),
], ],
[
Proximity(
Rank {
rank: 3,
max_rank: 4,
},
),
],
[
Proximity(
Rank {
rank: 2,
max_rank: 4,
},
),
],
[ [
Proximity( Proximity(
Rank { Rank {
@ -51,20 +67,4 @@ expression: "format!(\"{document_scores:#?}\")"
}, },
), ),
], ],
[
Proximity(
Rank {
rank: 1,
max_rank: 4,
},
),
],
[
Proximity(
Rank {
rank: 1,
max_rank: 4,
},
),
],
] ]

View File

@ -15,7 +15,7 @@ pub struct WordsPrefixesFst<'t, 'i> {
impl<'t, 'i> WordsPrefixesFst<'t, 'i> { impl<'t, 'i> WordsPrefixesFst<'t, 'i> {
pub fn new(wtxn: &'t mut RwTxn<'i>, index: &'i Index) -> WordsPrefixesFst<'t, 'i> { pub fn new(wtxn: &'t mut RwTxn<'i>, index: &'i Index) -> WordsPrefixesFst<'t, 'i> {
WordsPrefixesFst { wtxn, index, threshold: 100, max_prefix_length: 4 } WordsPrefixesFst { wtxn, index, threshold: 500, max_prefix_length: 3 }
} }
/// Set the number of words required to make a prefix be part of the words prefixes /// Set the number of words required to make a prefix be part of the words prefixes