From 114fbe2512bc15660f3e150df3c77e7bcf00dbe4 Mon Sep 17 00:00:00 2001 From: Paul Masurel Date: Thu, 25 Mar 2021 14:16:17 +0900 Subject: [PATCH] Removed redundant check Closes #997 --- src/indexer/segment_writer.rs | 100 +++++++++++++++------------------- 1 file changed, 45 insertions(+), 55 deletions(-) diff --git a/src/indexer/segment_writer.rs b/src/indexer/segment_writer.rs index b60b486a2e..dfe0c04c4b 100644 --- a/src/indexer/segment_writer.rs +++ b/src/indexer/segment_writer.rs @@ -213,69 +213,59 @@ impl SegmentWriter { self.fieldnorms_writer.record(doc_id, field, num_tokens); } - FieldType::U64(ref int_option) => { - if int_option.is_indexed() { - for field_value in field_values { - term_buffer.set_field(field_value.field()); - let u64_val = field_value - .value() - .u64_value() - .ok_or_else(make_schema_error)?; - term_buffer.set_u64(u64_val); - multifield_postings.subscribe(doc_id, &term_buffer); - } + FieldType::U64(_) => { + for field_value in field_values { + term_buffer.set_field(field_value.field()); + let u64_val = field_value + .value() + .u64_value() + .ok_or_else(make_schema_error)?; + term_buffer.set_u64(u64_val); + multifield_postings.subscribe(doc_id, &term_buffer); } } - FieldType::Date(ref int_option) => { - if int_option.is_indexed() { - for field_value in field_values { - term_buffer.set_field(field_value.field()); - let date_val = field_value - .value() - .date_value() - .ok_or_else(make_schema_error)?; - term_buffer.set_i64(date_val.timestamp()); - multifield_postings.subscribe(doc_id, &term_buffer); - } + FieldType::Date(_) => { + for field_value in field_values { + term_buffer.set_field(field_value.field()); + let date_val = field_value + .value() + .date_value() + .ok_or_else(make_schema_error)?; + term_buffer.set_i64(date_val.timestamp()); + multifield_postings.subscribe(doc_id, &term_buffer); } } - FieldType::I64(ref int_option) => { - if int_option.is_indexed() { - for field_value in field_values { - term_buffer.set_field(field_value.field()); - let i64_val = field_value - .value() - .i64_value() - .ok_or_else(make_schema_error)?; - term_buffer.set_i64(i64_val); - multifield_postings.subscribe(doc_id, &term_buffer); - } + FieldType::I64(_) => { + for field_value in field_values { + term_buffer.set_field(field_value.field()); + let i64_val = field_value + .value() + .i64_value() + .ok_or_else(make_schema_error)?; + term_buffer.set_i64(i64_val); + multifield_postings.subscribe(doc_id, &term_buffer); } } - FieldType::F64(ref int_option) => { - if int_option.is_indexed() { - for field_value in field_values { - term_buffer.set_field(field_value.field()); - let f64_val = field_value - .value() - .f64_value() - .ok_or_else(make_schema_error)?; - term_buffer.set_f64(f64_val); - multifield_postings.subscribe(doc_id, &term_buffer); - } + FieldType::F64(_) => { + for field_value in field_values { + term_buffer.set_field(field_value.field()); + let f64_val = field_value + .value() + .f64_value() + .ok_or_else(make_schema_error)?; + term_buffer.set_f64(f64_val); + multifield_postings.subscribe(doc_id, &term_buffer); } } - FieldType::Bytes(ref option) => { - if option.is_indexed() { - for field_value in field_values { - term_buffer.set_field(field_value.field()); - let bytes = field_value - .value() - .bytes_value() - .ok_or_else(make_schema_error)?; - term_buffer.set_bytes(bytes); - self.multifield_postings.subscribe(doc_id, &term_buffer); - } + FieldType::Bytes(_) => { + for field_value in field_values { + term_buffer.set_field(field_value.field()); + let bytes = field_value + .value() + .bytes_value() + .ok_or_else(make_schema_error)?; + term_buffer.set_bytes(bytes); + self.multifield_postings.subscribe(doc_id, &term_buffer); } } }