fix database options

This commit is contained in:
mpostma 2020-04-29 21:26:58 +02:00
parent 382e300326
commit 2e3a765dac
6 changed files with 37 additions and 26 deletions

View file

@ -137,16 +137,7 @@ fn update_awaiter(
pub struct DatabaseOptions {
pub main_map_size: usize,
pub update_map_size: usize
}
impl Default for DatabaseOptions {
fn default() -> DatabaseOptions {
DatabaseOptions {
main_map_size: 100 * 1024 * 1024 * 1024, // 100GB
update_map_size: 100 * 1024 * 1024 * 1024 // 100GB
}
}
pub update_map_size: usize,
}
impl Database {
@ -378,11 +369,16 @@ mod tests {
use serde::de::IgnoredAny;
use std::sync::mpsc;
const DB_OPTS: DatabaseOptions = DatabaseOptions {
main_map_size: 100 * 1024 * 1024 * 1024,
update_map_size: 100 * 1024 * 1024 * 1024,
};
#[test]
fn valid_updates() {
let dir = tempfile::tempdir().unwrap();
let database = Database::open_or_create(dir.path(), DatabaseOptions::default()).unwrap();
let database = Database::open_or_create(dir.path(), DB_OPTS).unwrap();
let db = &database;
let (sender, receiver) = mpsc::sync_channel(100);
@ -447,7 +443,7 @@ mod tests {
fn invalid_updates() {
let dir = tempfile::tempdir().unwrap();
let database = Database::open_or_create(dir.path(), DatabaseOptions::default()).unwrap();
let database = Database::open_or_create(dir.path(), DB_OPTS).unwrap();
let db = &database;
let (sender, receiver) = mpsc::sync_channel(100);
@ -509,7 +505,7 @@ mod tests {
fn ignored_words_too_long() {
let dir = tempfile::tempdir().unwrap();
let database = Database::open_or_create(dir.path(), DatabaseOptions::default()).unwrap();
let database = Database::open_or_create(dir.path(), DB_OPTS).unwrap();
let db = &database;
let (sender, receiver) = mpsc::sync_channel(100);
@ -564,7 +560,7 @@ mod tests {
fn add_schema_attributes_at_end() {
let dir = tempfile::tempdir().unwrap();
let database = Database::open_or_create(dir.path(), DatabaseOptions::default()).unwrap();
let database = Database::open_or_create(dir.path(), DB_OPTS).unwrap();
let db = &database;
let (sender, receiver) = mpsc::sync_channel(100);
@ -708,7 +704,7 @@ mod tests {
fn deserialize_documents() {
let dir = tempfile::tempdir().unwrap();
let database = Database::open_or_create(dir.path(), DatabaseOptions::default()).unwrap();
let database = Database::open_or_create(dir.path(), DB_OPTS).unwrap();
let db = &database;
let (sender, receiver) = mpsc::sync_channel(100);
@ -788,7 +784,7 @@ mod tests {
fn partial_document_update() {
let dir = tempfile::tempdir().unwrap();
let database = Database::open_or_create(dir.path(), DatabaseOptions::default()).unwrap();
let database = Database::open_or_create(dir.path(), DB_OPTS).unwrap();
let db = &database;
let (sender, receiver) = mpsc::sync_channel(100);
@ -922,7 +918,7 @@ mod tests {
fn delete_index() {
let dir = tempfile::tempdir().unwrap();
let database = Arc::new(Database::open_or_create(dir.path(), DatabaseOptions::default()).unwrap());
let database = Arc::new(Database::open_or_create(dir.path(), DB_OPTS).unwrap());
let db = &database;
let (sender, receiver) = mpsc::sync_channel(100);
@ -994,7 +990,7 @@ mod tests {
fn check_number_ordering() {
let dir = tempfile::tempdir().unwrap();
let database = Database::open_or_create(dir.path(), DatabaseOptions::default()).unwrap();
let database = Database::open_or_create(dir.path(), DB_OPTS).unwrap();
let db = &database;
let (sender, receiver) = mpsc::sync_channel(100);

View file

@ -147,6 +147,11 @@ mod tests {
use crate::store::Index;
use meilisearch_schema::Schema;
const DB_OPTS: DatabaseOptions = DatabaseOptions {
main_map_size: 100 * 1024 * 1024 * 1024,
update_map_size: 100 * 1024 * 1024 * 1024,
};
fn set_from_stream<'f, I, S>(stream: I) -> Set
where
I: for<'a> fst::IntoStreamer<'a, Into = S, Item = &'a [u8]>,
@ -249,7 +254,7 @@ mod tests {
impl<'a> FromIterator<(&'a str, &'a [DocIndex])> for TempDatabase {
fn from_iter<I: IntoIterator<Item = (&'a str, &'a [DocIndex])>>(iter: I) -> Self {
let tempdir = TempDir::new().unwrap();
let database = Database::open_or_create(&tempdir, DatabaseOptions::default()).unwrap();
let database = Database::open_or_create(&tempdir, DB_OPTS).unwrap();
let index = database.create_index("default").unwrap();
let db = &database;