reformat all the files

This commit is contained in:
tamo 2021-04-14 13:13:33 +02:00 committed by Tamo
parent 7086009f93
commit 5d5d115608
No known key found for this signature in database
GPG Key ID: 20CD8020AFA88D69
3 changed files with 42 additions and 33 deletions

View File

@ -69,10 +69,15 @@ fn bench_songs(c: &mut criterion::Criterion) {
.map(|s| { .map(|s| {
s.trim() s.trim()
.split(' ') .split(' ')
.map(|s| format!(r#""{}""#, s)).collect::<Vec<String>>().join(" ") .map(|s| format!(r#""{}""#, s))
.collect::<Vec<String>>()
.join(" ")
}) })
.collect(); .collect();
let basic_with_quote: &[&str] = &basic_with_quote.iter().map(|s| s.as_str()).collect::<Vec<&str>>(); let basic_with_quote: &[&str] = &basic_with_quote
.iter()
.map(|s| s.as_str())
.collect::<Vec<&str>>();
let confs = &[ let confs = &[
/* first we bench each criterion alone */ /* first we bench each criterion alone */
@ -133,7 +138,6 @@ fn bench_songs(c: &mut criterion::Criterion) {
criterion: Some(&["desc(released-timestamp)"]), criterion: Some(&["desc(released-timestamp)"]),
..BASE_CONF ..BASE_CONF
}, },
/* then we bench the asc and desc criterion on top of the default criterion */ /* then we bench the asc and desc criterion on top of the default criterion */
utils::Conf { utils::Conf {
group_name: "asc + default", group_name: "asc + default",
@ -145,14 +149,11 @@ fn bench_songs(c: &mut criterion::Criterion) {
criterion: Some(&desc_default[..]), criterion: Some(&desc_default[..]),
..BASE_CONF ..BASE_CONF
}, },
/* the we bench some global / normal search with all the default criterion in the default /* the we bench some global / normal search with all the default criterion in the default
* order */ * order */
utils::Conf { utils::Conf {
group_name: "basic placeholder", group_name: "basic placeholder",
queries: &[ queries: &[""],
"",
],
..BASE_CONF ..BASE_CONF
}, },
utils::Conf { utils::Conf {
@ -173,10 +174,7 @@ fn bench_songs(c: &mut criterion::Criterion) {
group_name: "prefix search", group_name: "prefix search",
queries: &[ queries: &[
"s", // 500k+ results "s", // 500k+ results
"a", "a", "b", "i", "x", // only 7k results
"b",
"i",
"x", // only 7k results
], ],
..BASE_CONF ..BASE_CONF
}, },

View File

@ -1,8 +1,14 @@
use std::{fs::{File, create_dir_all, remove_dir_all}, time::Duration}; use std::{
fs::{create_dir_all, remove_dir_all, File},
time::Duration,
};
use heed::EnvOpenOptions;
use criterion::BenchmarkId; use criterion::BenchmarkId;
use milli::{FacetCondition, Index, update::{IndexDocumentsMethod, Settings, UpdateBuilder, UpdateFormat}}; use heed::EnvOpenOptions;
use milli::{
update::{IndexDocumentsMethod, Settings, UpdateBuilder, UpdateFormat},
FacetCondition, Index,
};
pub struct Conf<'a> { pub struct Conf<'a> {
/// where we are going to create our database.mmdb directory /// where we are going to create our database.mmdb directory
@ -11,7 +17,7 @@ pub struct Conf<'a> {
/// the dataset to be used, it must be an uncompressed csv /// the dataset to be used, it must be an uncompressed csv
pub dataset: &'a str, pub dataset: &'a str,
pub group_name: &'a str, pub group_name: &'a str,
pub queries: &'a[&'a str], pub queries: &'a [&'a str],
/// here you can change which criterion are used and in which order. /// here you can change which criterion are used and in which order.
/// - if you specify something all the base configuration will be thrown out /// - if you specify something all the base configuration will be thrown out
/// - if you don't specify anything (None) the default configuration will be kept /// - if you don't specify anything (None) the default configuration will be kept
@ -36,7 +42,6 @@ impl Conf<'_> {
facet_condition: None, facet_condition: None,
optional_words: true, optional_words: true,
}; };
} }
pub fn base_setup(conf: &Conf) -> Index { pub fn base_setup(conf: &Conf) -> Index {
@ -77,7 +82,8 @@ pub fn base_setup(conf: &Conf) -> Index {
builder.index_documents_method(IndexDocumentsMethod::ReplaceDocuments); builder.index_documents_method(IndexDocumentsMethod::ReplaceDocuments);
// we called from cargo the current directory is supposed to be milli/milli // we called from cargo the current directory is supposed to be milli/milli
let dataset_path = format!("benches/{}", conf.dataset); let dataset_path = format!("benches/{}", conf.dataset);
let reader = File::open(&dataset_path).expect(&format!("could not find the dataset in: {}", &dataset_path)); let reader = File::open(&dataset_path)
.expect(&format!("could not find the dataset in: {}", &dataset_path));
builder.execute(reader, |_, _| ()).unwrap(); builder.execute(reader, |_, _| ()).unwrap();
wtxn.commit().unwrap(); wtxn.commit().unwrap();

View File

@ -38,10 +38,15 @@ fn bench_songs(c: &mut criterion::Criterion) {
.map(|s| { .map(|s| {
s.trim() s.trim()
.split(' ') .split(' ')
.map(|s| format!(r#""{}""#, s)).collect::<Vec<String>>().join(" ") .map(|s| format!(r#""{}""#, s))
.collect::<Vec<String>>()
.join(" ")
}) })
.collect(); .collect();
let basic_with_quote: &[&str] = &basic_with_quote.iter().map(|s| s.as_str()).collect::<Vec<&str>>(); let basic_with_quote: &[&str] = &basic_with_quote
.iter()
.map(|s| s.as_str())
.collect::<Vec<&str>>();
let confs = &[ let confs = &[
/* first we bench each criterion alone */ /* first we bench each criterion alone */