From 90e296f2d0f661d596d8f44857cb80e191bbf0e9 Mon Sep 17 00:00:00 2001 From: Pascal Seitz Date: Thu, 21 Jul 2022 13:43:21 +0200 Subject: [PATCH] fix var name --- src/fastfield/bytes/mod.rs | 2 +- src/fastfield/reader.rs | 16 ++++++++-------- src/fastfield/serializer/mod.rs | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/fastfield/bytes/mod.rs b/src/fastfield/bytes/mod.rs index 12858e3c7..37bda14f9 100644 --- a/src/fastfield/bytes/mod.rs +++ b/src/fastfield/bytes/mod.rs @@ -11,7 +11,7 @@ mod tests { use crate::{DocAddress, DocSet, Index, Searcher, Term}; #[test] - fn test_bytes2() -> crate::Result<()> { + fn test_bytes() -> crate::Result<()> { let mut schema_builder = Schema::builder(); let bytes_field = schema_builder.add_bytes_field("bytesfield", FAST); let schema = schema_builder.build(); diff --git a/src/fastfield/reader.rs b/src/fastfield/reader.rs index 246a326d6..c4bb1db87 100644 --- a/src/fastfield/reader.rs +++ b/src/fastfield/reader.rs @@ -63,27 +63,27 @@ pub trait FastFieldReader: Clone { } struct FFHeader { - field_id: u8, + codec_id: u8, gcd: u64, min_value: u64, } fn read_header(bytes: &mut OwnedBytes) -> FFHeader { - let magic_number_or_field_id = bytes.read_u8(); - if magic_number_or_field_id == FF_HEADER_MAGIC_NUMBER { + let magic_number_or_codec_id = bytes.read_u8(); + if magic_number_or_codec_id == FF_HEADER_MAGIC_NUMBER { let _header_version = bytes.read_u8(); - let field_id = bytes.read_u8(); + let codec_id = bytes.read_u8(); let gcd = bytes.read_u64(); let min_value = bytes.read_u64(); FFHeader { - field_id, + codec_id, gcd, min_value, } } else { // old version FFHeader { - field_id: magic_number_or_field_id, + codec_id: magic_number_or_codec_id, gcd: 1, min_value: 0, } @@ -149,7 +149,7 @@ impl DynamicFastFieldReader { let mut bytes = file.read_bytes()?; let header = read_header(&mut bytes); - Self::open_from_id(bytes, header.field_id, header.gcd, header.min_value) + Self::open_from_id(bytes, header.codec_id, header.gcd, header.min_value) } } @@ -203,7 +203,7 @@ impl FastFieldReaderCodecWrapper crate::Result { let mut bytes = file.read_bytes()?; let header = read_header(&mut bytes); - let id = header.field_id; + let id = header.codec_id; assert_eq!( BitpackedFastFieldSerializer::ID, id, diff --git a/src/fastfield/serializer/mod.rs b/src/fastfield/serializer/mod.rs index 0911b74c9..8af4805d6 100644 --- a/src/fastfield/serializer/mod.rs +++ b/src/fastfield/serializer/mod.rs @@ -134,7 +134,7 @@ impl CompositeFastFieldSerializer { /// automatically. pub fn write_header( field_write: &mut W, - field_id: u8, + codec_id: u8, stats: FastFieldStats, gcd: Option, ) -> io::Result<()> { @@ -142,7 +142,7 @@ impl CompositeFastFieldSerializer { let header_version = 1_u8; header_version.serialize(field_write)?; - field_id.serialize(field_write)?; + codec_id.serialize(field_write)?; gcd.unwrap_or(GCD_DEFAULT).serialize(field_write)?; stats.min_value.serialize(field_write)?;