snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-26 12:05:05 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge #924

Browse Source 
924: change max db size opt name r=Kerollmops a=MarinPostma

fix #867

Co-authored-by: mpostma <postma.marin@protonmail.com>
This commit is contained in:
bors[bot] 2020-08-24 12:18:17 +00:00 committed by GitHub
commit dd540d2540
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meilisearch-http/src/data.rs
View File

@ -60,8 +60,8 @@ impl Data {
let server_pid = std::process::id(); let server_pid = std::process::id();
let db_opt = DatabaseOptions { let db_opt = DatabaseOptions {
main_map_size: opt.main_map_size, main_map_size: opt.max_mdb_size,
update_map_size: opt.update_map_size, update_map_size: opt.max_udb_size,
}; };
let http_payload_size_limit = opt.http_payload_size_limit; let http_payload_size_limit = opt.http_payload_size_limit;

8
meilisearch-http/src/option.rs
View File

@ -49,12 +49,12 @@ pub struct Opt {
pub no_analytics: bool, pub no_analytics: bool,
/// The maximum size, in bytes, of the main lmdb database directory /// The maximum size, in bytes, of the main lmdb database directory
#[structopt(long, env = "MEILI_MAIN_MAP_SIZE", default_value = "107374182400")] // 100GB #[structopt(long, env = "MEILI_MAX_MDB_SIZE", default_value = "107374182400")] // 100GB
pub main_map_size: usize, pub max_mdb_size: usize,
/// The maximum size, in bytes, of the update lmdb database directory /// The maximum size, in bytes, of the update lmdb database directory
#[structopt(long, env = "MEILI_UPDATE_MAP_SIZE", default_value = "107374182400")] // 100GB #[structopt(long, env = "MEILI_MAX_UDB_SIZE", default_value = "107374182400")] // 100GB
pub update_map_size: usize, pub max_udb_size: usize,
/// The maximum size, in bytes, of accepted JSON payloads /// The maximum size, in bytes, of accepted JSON payloads
#[structopt(long, env = "MEILI_HTTP_PAYLOAD_SIZE_LIMIT", default_value = "10485760")] // 10MB #[structopt(long, env = "MEILI_HTTP_PAYLOAD_SIZE_LIMIT", default_value = "10485760")] // 10MB

4
meilisearch-http/tests/common.rs
View File

@ -44,8 +44,8 @@ impl Server {
master_key: None, master_key: None,
env: "development".to_owned(), env: "development".to_owned(),
no_analytics: true, no_analytics: true,
main_map_size: default_db_options.main_map_size, max_mdb_size: default_db_options.main_map_size,
update_map_size: default_db_options.update_map_size, max_udb_size: default_db_options.update_map_size,
http_payload_size_limit: 10000000, http_payload_size_limit: 10000000,
..Opt::default() ..Opt::default()
}; };

1
meilisearch-http/tests/index.rs
View File

@ -1,6 +1,5 @@
use assert_json_diff::assert_json_eq; use assert_json_diff::assert_json_eq;
use serde_json::json; use serde_json::json;
use serde_json::Value;
mod common; mod common;

1
meilisearch-http/tests/index_update.rs
View File

@ -1,4 +1,3 @@
use assert_json_diff::assert_json_eq;
use serde_json::json; use serde_json::json;
use serde_json::Value; use serde_json::Value;
use assert_json_diff::assert_json_include; use assert_json_diff::assert_json_include;