diff --git a/read_buffer/Cargo.toml b/read_buffer/Cargo.toml index 704362b8fd..e5fd3bc9b5 100644 --- a/read_buffer/Cargo.toml +++ b/read_buffer/Cargo.toml @@ -42,7 +42,7 @@ name = "sum_fixed" harness = false [[bench]] -name = "dictionary" +name = "string" harness = false [[bench]] diff --git a/read_buffer/src/column.rs b/read_buffer/src/column.rs index c01e15a656..a0fc8c5e29 100644 --- a/read_buffer/src/column.rs +++ b/read_buffer/src/column.rs @@ -15,7 +15,7 @@ use arrow::array::Array; use crate::schema::LogicalDataType; use crate::value::{EncodedValues, OwnedValue, Scalar, Value, Values}; use boolean::BooleanEncoding; -use encoding::{bool, fixed_null, string::NULL_ID}; +use encoding::{bool, scalar}; use float::FloatEncoding; use integer::IntegerEncoding; use string::StringEncoding; @@ -1068,7 +1068,7 @@ impl From for Column { _ => unreachable!("min/max must both be Some or None"), }; - let data = fixed_null::FixedNull::::from(arr); + let data = scalar::FixedNull::::from(arr); let meta = MetaData { range, ..MetaData::default() @@ -1334,6 +1334,7 @@ pub(crate) struct Statistics { mod test { use super::*; use arrow::array::{Int64Array, StringArray}; + use encoding::string::NULL_ID; #[test] fn row_ids_intersect() { diff --git a/read_buffer/src/column/encoding.rs b/read_buffer/src/column/encoding.rs index db237093ad..2ab1350d27 100644 --- a/read_buffer/src/column/encoding.rs +++ b/read_buffer/src/column/encoding.rs @@ -1,4 +1,3 @@ pub mod bool; -pub mod fixed; -pub mod fixed_null; +pub mod scalar; pub mod string; diff --git a/read_buffer/src/column/encoding/scalar.rs b/read_buffer/src/column/encoding/scalar.rs new file mode 100644 index 0000000000..ff8442dd93 --- /dev/null +++ b/read_buffer/src/column/encoding/scalar.rs @@ -0,0 +1,5 @@ +pub mod fixed; +pub mod fixed_null; + +pub use fixed::Fixed; +pub use fixed_null::FixedNull; diff --git a/read_buffer/src/column/encoding/fixed.rs b/read_buffer/src/column/encoding/scalar/fixed.rs similarity index 100% rename from read_buffer/src/column/encoding/fixed.rs rename to read_buffer/src/column/encoding/scalar/fixed.rs diff --git a/read_buffer/src/column/encoding/fixed_null.rs b/read_buffer/src/column/encoding/scalar/fixed_null.rs similarity index 100% rename from read_buffer/src/column/encoding/fixed_null.rs rename to read_buffer/src/column/encoding/scalar/fixed_null.rs diff --git a/read_buffer/src/column/float.rs b/read_buffer/src/column/float.rs index 7eb4a5603d..09f5f280ce 100644 --- a/read_buffer/src/column/float.rs +++ b/read_buffer/src/column/float.rs @@ -1,6 +1,6 @@ use arrow::{self, array::Array}; -use super::encoding::{fixed::Fixed, fixed_null::FixedNull}; +use super::encoding::{scalar::Fixed, scalar::FixedNull}; use super::{cmp, Statistics}; use crate::column::{RowIDs, Scalar, Value, Values}; diff --git a/read_buffer/src/column/integer.rs b/read_buffer/src/column/integer.rs index 8b8522e3ef..3280c65f1c 100644 --- a/read_buffer/src/column/integer.rs +++ b/read_buffer/src/column/integer.rs @@ -1,6 +1,6 @@ use arrow::{self, array::Array}; -use super::encoding::{fixed::Fixed, fixed_null::FixedNull}; +use super::encoding::{scalar::Fixed, scalar::FixedNull}; use super::{cmp, Statistics}; use crate::column::{EncodedValues, RowIDs, Scalar, Value, Values}; diff --git a/read_buffer/src/lib.rs b/read_buffer/src/lib.rs index 4cf960baab..00550e3ff8 100644 --- a/read_buffer/src/lib.rs +++ b/read_buffer/src/lib.rs @@ -22,7 +22,7 @@ pub use table::ReadFilterResults; /// It should not be imported into any non-testing or benchmarking crates. pub mod benchmarks { pub use crate::column::{ - cmp::Operator, encoding::fixed::Fixed, encoding::fixed_null::FixedNull, encoding::string, + cmp::Operator, encoding::scalar::Fixed, encoding::scalar::FixedNull, encoding::string, Column, RowIDs, };