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

Create the index only if the task has the rights to do so

Browse Source
This commit is contained in:
Clément Renault 2022-10-06 15:51:26 +02:00
parent 068a4b2884
commit 123f47dbc4
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
index-scheduler/src/batch.rs
View File

@ -234,8 +234,8 @@ impl IndexScheduler {
Batch::IndexOperation(IndexOperation::Settings {
index_uid,
settings,
allow_index_creation,
tasks,
..
}) => (index_uid, settings, tasks),
_ => unreachable!(),
};
@ -422,6 +422,7 @@ impl IndexScheduler {
Batch::Snapshot(_) => todo!(),
Batch::Dump(_) => todo!(),
Batch::IndexOperation(operation) => {
#[rustfmt::skip]
let index = match operation {
IndexOperation::DocumentDeletion { ref index_uid, .. }
| IndexOperation::DocumentClear { ref index_uid, .. } => {
@ -429,17 +430,20 @@ impl IndexScheduler {
let rtxn = self.env.read_txn()?;
self.index_mapper.index(&rtxn, index_uid)?
}
IndexOperation::DocumentImport { ref index_uid, .. }
| IndexOperation::Settings { ref index_uid, .. }
| IndexOperation::DocumentClearAndSetting { ref index_uid, .. }
| IndexOperation::SettingsAndDocumentImport { ref index_uid, .. } => {
// TODO check if the user was allowed to create an index.
// create the index if it doesn't already exist
let mut wtxn = self.env.write_txn()?;
let index = self.index_mapper.create_index(&mut wtxn, index_uid)?;
wtxn.commit()?;
index
IndexOperation::DocumentImport { ref index_uid, allow_index_creation, .. }
| IndexOperation::Settings { ref index_uid, allow_index_creation, .. }
| IndexOperation::DocumentClearAndSetting { ref index_uid, allow_index_creation, .. }
| IndexOperation::SettingsAndDocumentImport {ref index_uid, allow_index_creation, .. } => {
if allow_index_creation {
// create the index if it doesn't already exist
let mut wtxn = self.env.write_txn()?;
let index = self.index_mapper.create_index(&mut wtxn, index_uid)?;
wtxn.commit()?;
index
} else {
let rtxn = self.env.read_txn()?;
self.index_mapper.index(&rtxn, index_uid)?
}
}
};
@ -553,7 +557,7 @@ impl IndexScheduler {
index_uid: _,
primary_key,
method,
allow_index_creation,
allow_index_creation: _,
documents_counts,
content_files,
mut tasks,
@ -661,7 +665,7 @@ impl IndexScheduler {
IndexOperation::Settings {
index_uid: _,
settings,
allow_index_creation,
allow_index_creation: _,
mut tasks,
} => {
let indexer_config = self.index_mapper.indexer_config();