searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-03 20:07:09 +02:00
Code Issues Releases Wiki Activity

Remove the Index wrapper and use milli::Index directly

Browse source
This commit is contained in:
Kerollmops 2022-10-03 16:53:07 +02:00 • committed by Clément Renault
parent 8bffe41886
commit 478e3f0f6b
No known key found for this signature in database
GPG key ID: 92ADA4E935E71FA4
6 changed files with 196 additions and 899 deletions
Download patch file Download diff file Expand all files Collapse all files

38
index-scheduler/src/index_mapper.rs
View file

@ -1,18 +1,14 @@
use std::collections::hash_map::Entry;
use std::collections::HashMap;
use std::fs;
use std::path::PathBuf;
use std::sync::Arc;
use std::sync::RwLock;
use std::sync::{Arc, RwLock};
use index::Index;
use milli::Index;
use uuid::Uuid;
use milli::heed::types::SerdeBincode;
use milli::heed::types::Str;
use milli::heed::Database;
use milli::heed::Env;
use milli::heed::RoTxn;
use milli::heed::RwTxn;
use milli::heed::types::{SerdeBincode, Str};
use milli::heed::{Database, Env, EnvOpenOptions, RoTxn, RwTxn};
use milli::update::IndexerConfig;
use crate::{Error, Result};
@ -56,12 +52,12 @@ impl IndexMapper {
Err(Error::IndexNotFound(_)) => {
let uuid = Uuid::new_v4();
self.index_mapping.put(wtxn, name, &uuid)?;
Index::open(
self.base_path.join(uuid.to_string()),
name.to_string(),
self.index_size,
self.indexer_config.clone(),
)?
let index_path = self.base_path.join(uuid.to_string());
fs::create_dir_all(&index_path)?;
let mut options = EnvOpenOptions::new();
options.map_size(self.index_size);
milli::Index::new(options, &index_path)?
}
error => return error,
};
@ -91,12 +87,12 @@ impl IndexMapper {
// the entry method.
match index_map.entry(uuid) {
Entry::Vacant(entry) => {
let index = Index::open(
self.base_path.join(uuid.to_string()),
name.to_string(),
self.index_size,
self.indexer_config.clone(),
)?;
let index_path = self.base_path.join(uuid.to_string());
fs::create_dir_all(&index_path)?;
let mut options = EnvOpenOptions::new();
options.map_size(self.index_size);
let index = milli::Index::new(options, &index_path)?;
entry.insert(index.clone());
index
}

3
index-scheduler/src/lib.rs
View file

@ -17,7 +17,6 @@ use std::path::PathBuf;
use std::sync::{Arc, RwLock};
use file_store::{File, FileStore};
use index::Index;
use roaring::RoaringBitmap;
use serde::Deserialize;
use synchronoise::SignalEvent;
@ -27,7 +26,7 @@ use uuid::Uuid;
use milli::heed::types::{OwnedType, SerdeBincode, SerdeJson, Str};
use milli::heed::{self, Database, Env};
use milli::update::IndexerConfig;
use milli::{RoaringBitmapCodec, BEU32};
use milli::{Index, RoaringBitmapCodec, BEU32};
use crate::index_mapper::IndexMapper;
use crate::task::Task;