Remove indexing_jobs option

This commit is contained in:
2shiori17 2022-03-31 09:27:29 +09:00
parent 9f1c88680d
commit a2d7c16f91

View File

@ -34,11 +34,6 @@ pub struct IndexerOpts {
/// It defaults to half of the available threads. /// It defaults to half of the available threads.
#[clap(long, env = "MEILI_MAX_INDEXING_THREADS", default_value_t)] #[clap(long, env = "MEILI_MAX_INDEXING_THREADS", default_value_t)]
pub max_indexing_threads: MaxThreads, pub max_indexing_threads: MaxThreads,
/// Number of parallel jobs for indexing, defaults to # of CPUs.
#[serde(skip)]
#[clap(long, hide = true)]
pub indexing_jobs: Option<usize>,
} }
#[derive(Debug, Clone, Parser, Default, Serialize)] #[derive(Debug, Clone, Parser, Default, Serialize)]
@ -71,7 +66,7 @@ impl TryFrom<&IndexerOpts> for IndexerConfig {
fn try_from(other: &IndexerOpts) -> Result<Self, Self::Error> { fn try_from(other: &IndexerOpts) -> Result<Self, Self::Error> {
let thread_pool = rayon::ThreadPoolBuilder::new() let thread_pool = rayon::ThreadPoolBuilder::new()
.num_threads(other.indexing_jobs.unwrap_or(*other.max_indexing_threads)) .num_threads(*other.max_indexing_threads)
.build()?; .build()?;
Ok(Self { Ok(Self {
@ -92,7 +87,6 @@ impl Default for IndexerOpts {
max_nb_chunks: None, max_nb_chunks: None,
max_indexing_memory: MaxMemory::default(), max_indexing_memory: MaxMemory::default(),
max_indexing_threads: MaxThreads::default(), max_indexing_threads: MaxThreads::default(),
indexing_jobs: None,
} }
} }
} }