snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-23 02:27:40 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Remove the possibility to fail fetching the env info

Browse Source
This commit is contained in:
Clément Renault 2023-11-28 14:31:23 +01:00
parent d050c9b4ae
commit 34c67ac389
No known key found for this signature in database
GPG Key ID: F250A4C4E3AE5F5F
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
index-scheduler/src/index_mapper/index_map.rs
View File

@ -1,6 +1,3 @@
/// the map size to use when we don't succeed in reading it in indexes.
const DEFAULT_MAP_SIZE: usize = 10 * 1024 * 1024 * 1024; // 10 GiB
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::path::Path; use std::path::Path;
use std::time::Duration; use std::time::Duration;
@ -235,7 +232,7 @@ impl IndexMap {
enable_mdb_writemap: bool, enable_mdb_writemap: bool,
map_size_growth: usize, map_size_growth: usize,
) { ) {
let map_size = index.map_size().unwrap_or(DEFAULT_MAP_SIZE) + map_size_growth; let map_size = index.map_size() + map_size_growth;
let closing_event = index.prepare_for_closing(); let closing_event = index.prepare_for_closing();
let generation = self.next_generation(); let generation = self.next_generation();
self.unavailable.insert( self.unavailable.insert(
@ -387,7 +384,7 @@ mod tests {
fn assert_index_size(index: Index, expected: usize) { fn assert_index_size(index: Index, expected: usize) {
let expected = clamp_to_page_size(expected); let expected = clamp_to_page_size(expected);
let index_map_size = index.map_size().unwrap(); let index_map_size = index.map_size();
assert_eq!(index_map_size, expected); assert_eq!(index_map_size, expected);
} }
} }

4
milli/src/index.rs
View File

@ -308,8 +308,8 @@ impl Index {
/// ///
/// This value is the maximum between the map size passed during the opening of the index /// This value is the maximum between the map size passed during the opening of the index
/// and the on-disk size of the index at the time of opening. /// and the on-disk size of the index at the time of opening.
pub fn map_size(&self) -> Result<usize> { pub fn map_size(&self) -> usize {
Ok(self.env.info().map_size) // TODO remove Result self.env.info().map_size
} }
pub fn copy_to_path<P: AsRef<Path>>(&self, path: P, option: CompactionOption) -> Result<File> { pub fn copy_to_path<P: AsRef<Path>>(&self, path: P, option: CompactionOption) -> Result<File> {