Move integer RLE specific util functions

Author: Jefffrey

src/encoding/integer/mod.rs

@@ -19,3 +19,5 @@
 
 pub mod rle_v1;
 pub mod rle_v2;
+// TODO: make private?
+pub mod util;

src/encoding/integer/rle_v2/delta.rs

@@ -22,12 +22,14 @@ use snafu::OptionExt;
 
 use crate::{
     encoding::{
-        integer::rle_v2::{EncodingType, MAX_RUN_LENGTH},
-        util::{
-            extract_run_length_from_header, read_ints, read_u8, read_varint_zigzagged,
-            rle_v2_decode_bit_width, rle_v2_encode_bit_width, write_aligned_packed_ints,
-            write_varint_zigzagged,
+        integer::{
+            rle_v2::{EncodingType, MAX_RUN_LENGTH},
+            util::{
+                extract_run_length_from_header, read_ints, rle_v2_decode_bit_width,
+                rle_v2_encode_bit_width, write_aligned_packed_ints,
+            },
         },
+        util::{read_u8, read_varint_zigzagged, write_varint_zigzagged},
         EncodingSign, SignedEncoding, VarintSerde,
     },
     error::{OrcError, OutOfSpecSnafu, Result},

src/encoding/integer/rle_v2/direct.rs

@@ -21,11 +21,14 @@ use bytes::{BufMut, BytesMut};
 
 use crate::{
     encoding::{
-        integer::rle_v2::{EncodingType, MAX_RUN_LENGTH},
-        util::{
-            extract_run_length_from_header, read_ints, read_u8, rle_v2_decode_bit_width,
-            rle_v2_encode_bit_width, write_aligned_packed_ints,
+        integer::{
+            rle_v2::{EncodingType, MAX_RUN_LENGTH},
+            util::{
+                extract_run_length_from_header, read_ints, rle_v2_decode_bit_width,
+                rle_v2_encode_bit_width, write_aligned_packed_ints,
+            },
         },
+        util::read_u8,
         EncodingSign,
     },
     error::{OutOfSpecSnafu, Result},

src/encoding/integer/rle_v2/mod.rs

@@ -21,8 +21,8 @@ use bytes::BytesMut;
 
 use crate::{
     encoding::{
-        util::{calculate_percentile_bits, try_read_u8},
-        EncodingSign, NInt, PrimitiveValueDecoder, PrimitiveValueEncoder, VarintSerde,
+        util::try_read_u8, EncodingSign, NInt, PrimitiveValueDecoder, PrimitiveValueEncoder,
+        VarintSerde,
     },
     error::{OutOfSpecSnafu, Result},
     memory::EstimateMemory,
@@ -35,6 +35,8 @@ use self::{
     short_repeat::{read_short_repeat_values, write_short_repeat},
 };
 
+use super::util::calculate_percentile_bits;
+
 pub mod delta;
 pub mod direct;
 pub mod patched_base;

src/encoding/integer/rle_v2/patched_base.rs

@@ -23,10 +23,11 @@ use snafu::OptionExt;
 use super::{EncodingType, NInt};
 use crate::{
     encoding::{
-        util::{
+        integer::util::{
             encode_bit_width, extract_run_length_from_header, get_closest_fixed_bits, read_ints,
-            read_u8, rle_v2_decode_bit_width, signed_msb_encode, write_packed_ints,
+            rle_v2_decode_bit_width, write_packed_ints,
         },
+        util::{read_u8, signed_msb_encode},
         EncodingSign, VarintSerde,
     },
     error::{OutOfSpecSnafu, Result},
@@ -278,7 +279,7 @@ mod tests {
 
     use proptest::prelude::*;
 
-    use crate::encoding::{util::calculate_percentile_bits, SignedEncoding};
+    use crate::encoding::{integer::util::calculate_percentile_bits, SignedEncoding};
 
     use super::*;