snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-10-31 16:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix allow_index_creation useless field

Browse Source
This commit is contained in:
Clément Renault
2022-10-20 15:19:28 +02:00
parent 75857bf476
commit 72ec4ce96b
1 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,6 @@ pub(crate) enum IndexOperation {
index_uid: String, index_uid: String,
primary_key: Option<String>, primary_key: Option<String>,
method: IndexDocumentsMethod, method: IndexDocumentsMethod,
allow_index_creation: bool,
documents_counts: Vec<u64>, documents_counts: Vec<u64>,
content_files: Vec<Uuid>, content_files: Vec<Uuid>,
tasks: Vec<Task>, tasks: Vec<Task>,
@@ -106,7 +105,6 @@ pub(crate) enum IndexOperation {
index_uid: String, index_uid: String,
// TODO what's that boolean, does it mean that it removes things or what? // TODO what's that boolean, does it mean that it removes things or what?
settings: Vec<(bool, Settings<Unchecked>)>, settings: Vec<(bool, Settings<Unchecked>)>,
allow_index_creation: bool,
tasks: Vec<Task>, tasks: Vec<Task>,
}, },
DocumentClearAndSetting { DocumentClearAndSetting {
@@ -115,7 +113,6 @@ pub(crate) enum IndexOperation {
// TODO what's that boolean, does it mean that it removes things or what? // TODO what's that boolean, does it mean that it removes things or what?
settings: Vec<(bool, Settings<Unchecked>)>, settings: Vec<(bool, Settings<Unchecked>)>,
allow_index_creation: bool,
settings_tasks: Vec<Task>, settings_tasks: Vec<Task>,
}, },
SettingsAndDocumentImport { SettingsAndDocumentImport {
@@ -123,7 +120,6 @@ pub(crate) enum IndexOperation {
primary_key: Option<String>, primary_key: Option<String>,
method: IndexDocumentsMethod, method: IndexDocumentsMethod,
allow_index_creation: bool,
documents_counts: Vec<u64>, documents_counts: Vec<u64>,
content_files: Vec<Uuid>, content_files: Vec<Uuid>,
document_import_tasks: Vec<Task>, document_import_tasks: Vec<Task>,
@@ -204,11 +200,7 @@ impl IndexScheduler {
}, },
must_create_index, must_create_index,
})), })),
BatchKind::DocumentImport { BatchKind::DocumentImport { method, import_ids, .. } => {
method,
import_ids,
allow_index_creation,
} => {
let tasks = self.get_existing_tasks(rtxn, import_ids)?; let tasks = self.get_existing_tasks(rtxn, import_ids)?;
let primary_key = match &tasks[0].kind { let primary_key = match &tasks[0].kind {
KindWithContent::DocumentImport { primary_key, .. } => primary_key.clone(), KindWithContent::DocumentImport { primary_key, .. } => primary_key.clone(),
@@ -236,7 +228,6 @@ impl IndexScheduler {
index_uid, index_uid,
primary_key, primary_key,
method, method,
allow_index_creation,
documents_counts, documents_counts,
content_files, content_files,
tasks, tasks,
@@ -266,10 +257,7 @@ impl IndexScheduler {
must_create_index, must_create_index,
})) }))
} }
BatchKind::Settings { BatchKind::Settings { settings_ids, .. } => {
settings_ids,
allow_index_creation,
} => {
let tasks = self.get_existing_tasks(rtxn, settings_ids)?; let tasks = self.get_existing_tasks(rtxn, settings_ids)?;
let mut settings = Vec::new(); let mut settings = Vec::new();
@@ -288,7 +276,6 @@ impl IndexScheduler {
op: IndexOperation::Settings { op: IndexOperation::Settings {
index_uid, index_uid,
settings, settings,
allow_index_creation,
tasks, tasks,
}, },
must_create_index, must_create_index,
@@ -343,7 +330,6 @@ impl IndexScheduler {
op: IndexOperation::DocumentClearAndSetting { op: IndexOperation::DocumentClearAndSetting {
index_uid, index_uid,
cleared_tasks, cleared_tasks,
allow_index_creation,
settings, settings,
settings_tasks, settings_tasks,
}, },
@@ -404,7 +390,6 @@ impl IndexScheduler {
index_uid, index_uid,
primary_key, primary_key,
method, method,
allow_index_creation,
documents_counts, documents_counts,
content_files, content_files,
document_import_tasks, document_import_tasks,
@@ -931,7 +916,6 @@ impl IndexScheduler {
index_uid: _, index_uid: _,
primary_key, primary_key,
method, method,
allow_index_creation: _,
documents_counts, documents_counts,
content_files, content_files,
mut tasks, mut tasks,
@@ -1044,7 +1028,6 @@ impl IndexScheduler {
IndexOperation::Settings { IndexOperation::Settings {
index_uid: _, index_uid: _,
settings, settings,
allow_index_creation: _,
mut tasks, mut tasks,
} => { } => {
let indexer_config = self.index_mapper.indexer_config(); let indexer_config = self.index_mapper.indexer_config();
@@ -1071,7 +1054,6 @@ impl IndexScheduler {
index_uid, index_uid,
primary_key, primary_key,
method, method,
allow_index_creation,
documents_counts, documents_counts,
content_files, content_files,
document_import_tasks, document_import_tasks,
@@ -1084,7 +1066,6 @@ impl IndexScheduler {
IndexOperation::Settings { IndexOperation::Settings {
index_uid: index_uid.clone(), index_uid: index_uid.clone(),
settings, settings,
allow_index_creation,
tasks: settings_tasks, tasks: settings_tasks,
}, },
)?; )?;
@@ -1096,7 +1077,6 @@ impl IndexScheduler {
index_uid, index_uid,
primary_key, primary_key,
method, method,
allow_index_creation,
documents_counts, documents_counts,
content_files, content_files,
tasks: document_import_tasks, tasks: document_import_tasks,
@@ -1111,7 +1091,6 @@ impl IndexScheduler {
index_uid, index_uid,
cleared_tasks, cleared_tasks,
settings, settings,
allow_index_creation,
settings_tasks, settings_tasks,
} => { } => {
let mut import_tasks = self.apply_index_operation( let mut import_tasks = self.apply_index_operation(
@@ -1129,7 +1108,6 @@ impl IndexScheduler {
IndexOperation::Settings { IndexOperation::Settings {
index_uid, index_uid,
settings, settings,
allow_index_creation,
tasks: settings_tasks, tasks: settings_tasks,
}, },
)?; )?;