diff --git a/src/mito2/src/sst/index.rs b/src/mito2/src/sst/index.rs index 6225943018..b73bd0df7e 100644 --- a/src/mito2/src/sst/index.rs +++ b/src/mito2/src/sst/index.rs @@ -263,15 +263,13 @@ impl<'a> IndexerBuilder<'a> { let err = match creator { Ok(creator) => { - if creator.is_empty() { + if creator.is_none() { debug!( "Skip creating full-text index due to no columns require indexing, region_id: {}, file_id: {}", self.metadata.region_id, self.file_id, ); - return None; - } else { - return Some(creator); } + return creator; } Err(err) => err, }; diff --git a/src/mito2/src/sst/index/fulltext_index/creator.rs b/src/mito2/src/sst/index/fulltext_index/creator.rs index 9fe5b57bf1..416e39d9dd 100644 --- a/src/mito2/src/sst/index/fulltext_index/creator.rs +++ b/src/mito2/src/sst/index/fulltext_index/creator.rs @@ -57,7 +57,7 @@ impl FulltextIndexer { metadata: &RegionMetadataRef, compress: bool, mem_limit: usize, - ) -> Result { + ) -> Result> { let mut creators = HashMap::new(); for column in &metadata.column_metadatas { @@ -102,11 +102,11 @@ impl FulltextIndexer { ); } - Ok(Self { + Ok((!creators.is_empty()).then(move || Self { creators, aborted: false, stats: Statistics::new(TYPE_FULLTEXT_INDEX), - }) + })) } /// Updates the index with the given batch. @@ -167,10 +167,6 @@ impl FulltextIndexer { pub fn column_ids(&self) -> impl Iterator + '_ { self.creators.keys().copied() } - - pub(crate) fn is_empty(&self) -> bool { - self.creators.is_empty() - } } impl FulltextIndexer { @@ -468,6 +464,7 @@ mod tests { 1024, ) .await + .unwrap() .unwrap(); let batch = new_batch(rows);