From 4026fc5fb13834455bdf2860fa587dd6b5e6dad0 Mon Sep 17 00:00:00 2001
From: Paul Masurel <paul.masurel@gmail.com>
Date: Tue, 20 Feb 2018 08:28:28 +0900
Subject: [PATCH] Removed redundant compressed_block_size function

---
 src/compression/mod.rs                          | 10 +++-------
 src/compression/pack/compression_pack_nosimd.rs |  2 +-
 src/compression/pack/compression_pack_simd.rs   |  4 +---
 src/postings/segment_postings.rs                |  4 ++--
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/compression/mod.rs b/src/compression/mod.rs
index 503fee052..f331ce60b 100644
--- a/src/compression/mod.rs
+++ b/src/compression/mod.rs
@@ -7,8 +7,9 @@ pub use self::stream::CompressedIntStream;
 
 pub const COMPRESSION_BLOCK_SIZE: usize = 128;
 
-pub(crate) fn compute_block_size(num_bits: u8) -> usize {
-    1 + (num_bits as usize * COMPRESSION_BLOCK_SIZE + 7) / 8
+/// Returns the size in bytes of a compressed block, given `num_bits`.
+pub fn compressed_block_size(num_bits: u8) -> usize {
+    1 + (num_bits as usize) * 16
 }
 
 #[cfg(not(feature = "simdcompression"))]
@@ -37,11 +38,6 @@ mod vint {
     pub(crate) use self::compression_vint_simd::*;
 }
 
-/// Returns the size in bytes of a compressed block, given `num_bits`.
-pub fn compressed_block_size(num_bits: u8) -> usize {
-    1 + (num_bits as usize) * 16
-}
-
 pub trait VIntEncoder {
     /// Compresses an array of `u32` integers,
     /// using [delta-encoding](https://en.wikipedia.org/wiki/Delta_encoding)
diff --git a/src/compression/pack/compression_pack_nosimd.rs b/src/compression/pack/compression_pack_nosimd.rs
index 4c3fc078b..443e210db 100644
--- a/src/compression/pack/compression_pack_nosimd.rs
+++ b/src/compression/pack/compression_pack_nosimd.rs
@@ -3,7 +3,7 @@ use common::bitpacker::{BitPacker, BitUnpacker};
 use common::CountingWriter;
 use std::cmp;
 use std::io::Write;
-use super::super::{compute_block_size, COMPRESSION_BLOCK_SIZE};
+use super::super::{compressed_block_size, COMPRESSION_BLOCK_SIZE};
 
 const COMPRESSED_BLOCK_MAX_SIZE: usize = COMPRESSION_BLOCK_SIZE * 4 + 1;
 
diff --git a/src/compression/pack/compression_pack_simd.rs b/src/compression/pack/compression_pack_simd.rs
index f77cc6159..f7374294e 100644
--- a/src/compression/pack/compression_pack_simd.rs
+++ b/src/compression/pack/compression_pack_simd.rs
@@ -1,4 +1,4 @@
-use super::super::{compute_block_size, COMPRESSION_BLOCK_SIZE};
+use compression::COMPRESSION_BLOCK_SIZE;
 
 const COMPRESSED_BLOCK_MAX_SIZE: usize = COMPRESSION_BLOCK_SIZE * 4 + 1;
 
@@ -51,13 +51,11 @@ impl BlockEncoder {
 
     pub fn compress_block_sorted(&mut self, vals: &[u32], offset: u32) -> &[u8] {
         let compressed_size = compress_sorted(vals, &mut self.output, offset);
-        assert_eq!(compressed_size, compute_block_size(self.output[0]));
         &self.output[..compressed_size]
     }
 
     pub fn compress_block_unsorted(&mut self, vals: &[u32]) -> &[u8] {
         let compressed_size = compress_unsorted(vals, &mut self.output);
-        assert_eq!(compressed_size, compute_block_size(self.output[0]));
         &self.output[..compressed_size]
     }
 }
diff --git a/src/postings/segment_postings.rs b/src/postings/segment_postings.rs
index 4dcee66f6..239e8c306 100644
--- a/src/postings/segment_postings.rs
+++ b/src/postings/segment_postings.rs
@@ -7,7 +7,7 @@ use postings::Postings;
 use docset::{DocSet, SkipResult};
 use std::cmp;
 use fst::Streamer;
-use compression::compute_block_size;
+use compression::compressed_block_size;
 use fastfield::DeleteBitSet;
 use std::cell::UnsafeCell;
 use directory::{ReadOnlySource, SourceRead};
@@ -436,7 +436,7 @@ impl BlockSegmentPostings {
             match self.freq_reading_option {
                 FreqReadingOption::NoFreq => {}
                 FreqReadingOption::SkipFreq => {
-                    let num_bytes_to_skip = compute_block_size(self.remaining_data.as_ref()[0]);
+                    let num_bytes_to_skip = compressed_block_size(self.remaining_data.as_ref()[0]);
                     self.remaining_data.advance(num_bytes_to_skip);
                 }
                 FreqReadingOption::ReadFreq => {