3245: Enable create_raw_index(...) to specify time r=irevoire a=amab8901

# Pull Request

## Related issue
Partially fixes #2983 

## What does this PR do?
- Enables [`create_raw_index`](660be071b5/index-scheduler/src/lib.rs (L868)) to specify time

## PR checklist
Please check if your PR fulfills the following requirements:
- [ X ] Does this PR fix an existing issue, or have you listed the changes applied in the PR description (and why they are needed)?
- [ X ] Have you read the contributing guidelines?
- [ X ] Have you made sure that the title is accurate and descriptive of the changes?

Thank you so much for contributing to Meilisearch!


Co-authored-by: amab8901 <amab8901@protonmail.com>
This commit is contained in:
bors[bot] 2023-01-02 14:11:39 +00:00 committed by GitHub
commit 336c77aa45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 12 deletions

View File

@ -788,7 +788,7 @@ impl IndexScheduler {
let index = if must_create_index { let index = if must_create_index {
// create the index if it doesn't already exist // create the index if it doesn't already exist
let wtxn = self.env.write_txn()?; let wtxn = self.env.write_txn()?;
self.index_mapper.create_index(wtxn, index_uid)? self.index_mapper.create_index(wtxn, index_uid, None)?
} else { } else {
let rtxn = self.env.read_txn()?; let rtxn = self.env.read_txn()?;
self.index_mapper.index(&rtxn, index_uid)? self.index_mapper.index(&rtxn, index_uid)?
@ -805,7 +805,7 @@ impl IndexScheduler {
if self.index_mapper.exists(&wtxn, &index_uid)? { if self.index_mapper.exists(&wtxn, &index_uid)? {
return Err(Error::IndexAlreadyExists(index_uid)); return Err(Error::IndexAlreadyExists(index_uid));
} }
self.index_mapper.create_index(wtxn, &index_uid)?; self.index_mapper.create_index(wtxn, &index_uid, None)?;
self.process_batch(Batch::IndexUpdate { index_uid, primary_key, task }) self.process_batch(Batch::IndexUpdate { index_uid, primary_key, task })
} }

View File

@ -9,6 +9,7 @@ use meilisearch_types::heed::types::Str;
use meilisearch_types::heed::{Database, Env, EnvOpenOptions, RoTxn, RwTxn}; use meilisearch_types::heed::{Database, Env, EnvOpenOptions, RoTxn, RwTxn};
use meilisearch_types::milli::update::IndexerConfig; use meilisearch_types::milli::update::IndexerConfig;
use meilisearch_types::milli::Index; use meilisearch_types::milli::Index;
use time::OffsetDateTime;
use uuid::Uuid; use uuid::Uuid;
use self::IndexStatus::{Available, BeingDeleted}; use self::IndexStatus::{Available, BeingDeleted};
@ -66,15 +67,29 @@ impl IndexMapper {
/// Create or open an index in the specified path. /// Create or open an index in the specified path.
/// The path *must* exists or an error will be thrown. /// The path *must* exists or an error will be thrown.
fn create_or_open_index(&self, path: &Path) -> Result<Index> { fn create_or_open_index(
&self,
path: &Path,
date: Option<(OffsetDateTime, OffsetDateTime)>,
) -> Result<Index> {
let mut options = EnvOpenOptions::new(); let mut options = EnvOpenOptions::new();
options.map_size(clamp_to_page_size(self.index_size)); options.map_size(clamp_to_page_size(self.index_size));
options.max_readers(1024); options.max_readers(1024);
Ok(Index::new(options, path)?)
if let Some((created, updated)) = date {
Ok(Index::new_with_creation_dates(options, path, created, updated)?)
} else {
Ok(Index::new(options, path)?)
}
} }
/// Get or create the index. /// Get or create the index.
pub fn create_index(&self, mut wtxn: RwTxn, name: &str) -> Result<Index> { pub fn create_index(
&self,
mut wtxn: RwTxn,
name: &str,
date: Option<(OffsetDateTime, OffsetDateTime)>,
) -> Result<Index> {
match self.index(&wtxn, name) { match self.index(&wtxn, name) {
Ok(index) => { Ok(index) => {
wtxn.commit()?; wtxn.commit()?;
@ -86,7 +101,8 @@ impl IndexMapper {
let index_path = self.base_path.join(uuid.to_string()); let index_path = self.base_path.join(uuid.to_string());
fs::create_dir_all(&index_path)?; fs::create_dir_all(&index_path)?;
let index = self.create_or_open_index(&index_path)?;
let index = self.create_or_open_index(&index_path, date)?;
wtxn.commit()?; wtxn.commit()?;
// TODO: it would be better to lazily create the index. But we need an Index::open function for milli. // TODO: it would be better to lazily create the index. But we need an Index::open function for milli.
@ -179,7 +195,8 @@ impl IndexMapper {
match index_map.entry(uuid) { match index_map.entry(uuid) {
Entry::Vacant(entry) => { Entry::Vacant(entry) => {
let index_path = self.base_path.join(uuid.to_string()); let index_path = self.base_path.join(uuid.to_string());
let index = self.create_or_open_index(&index_path)?;
let index = self.create_or_open_index(&index_path, None)?;
entry.insert(Available(index.clone())); entry.insert(Available(index.clone()));
index index
} }

View File

@ -693,7 +693,7 @@ impl IndexScheduler {
let mut task = Task { let mut task = Task {
uid: self.next_task_id(&wtxn)?, uid: self.next_task_id(&wtxn)?,
enqueued_at: time::OffsetDateTime::now_utc(), enqueued_at: OffsetDateTime::now_utc(),
started_at: None, started_at: None,
finished_at: None, finished_at: None,
error: None, error: None,
@ -865,10 +865,13 @@ impl IndexScheduler {
} }
/// Create a new index without any associated task. /// Create a new index without any associated task.
pub fn create_raw_index(&self, name: &str) -> Result<Index> { pub fn create_raw_index(
&self,
name: &str,
date: Option<(OffsetDateTime, OffsetDateTime)>,
) -> Result<Index> {
let wtxn = self.env.write_txn()?; let wtxn = self.env.write_txn()?;
let index = self.index_mapper.create_index(wtxn, name)?; let index = self.index_mapper.create_index(wtxn, name, date)?;
Ok(index) Ok(index)
} }

View File

@ -289,7 +289,9 @@ fn import_dump(
let mut index_reader = index_reader?; let mut index_reader = index_reader?;
let metadata = index_reader.metadata(); let metadata = index_reader.metadata();
log::info!("Importing index `{}`.", metadata.uid); log::info!("Importing index `{}`.", metadata.uid);
let index = index_scheduler.create_raw_index(&metadata.uid)?;
let date = Some((metadata.created_at, metadata.updated_at));
let index = index_scheduler.create_raw_index(&metadata.uid, date)?;
let mut wtxn = index.write_txn()?; let mut wtxn = index.write_txn()?;