refactor(rust): remove rev-map from ChunkedArray (#5721)

pola-rs · Dec 5, 2022 · 05afe5b · 05afe5b
1 parent e6b33ce
commit 05afe5b
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 20 deletions.
diff --git a/polars/polars-core/src/chunked_array/builder/binary.rs b/polars/polars-core/src/chunked_array/builder/binary.rs
@@ -46,7 +46,6 @@ impl BinaryChunkedBuilder {
             field: Arc::new(self.field),
             chunks: vec![arr],
             phantom: PhantomData,
-            categorical_map: None,
             bit_settings: Default::default(),
             length,
         }

diff --git a/polars/polars-core/src/chunked_array/builder/boolean.rs b/polars/polars-core/src/chunked_array/builder/boolean.rs
@@ -26,7 +26,6 @@ impl ChunkedBuilder<bool, BooleanType> for BooleanChunkedBuilder {
             field: Arc::new(self.field),
             chunks: vec![arr],
             phantom: PhantomData,
-            categorical_map: None,
             bit_settings: Default::default(),
             length,
         }

diff --git a/polars/polars-core/src/chunked_array/builder/list.rs b/polars/polars-core/src/chunked_array/builder/list.rs
@@ -53,7 +53,6 @@ macro_rules! finish_list_builder {
             field: Arc::new($self.field.clone()),
             chunks: vec![arr],
             phantom: PhantomData,
-            categorical_map: None,
             ..Default::default()
         };
         ca.compute_len();

diff --git a/polars/polars-core/src/chunked_array/builder/primitive.rs b/polars/polars-core/src/chunked_array/builder/primitive.rs
@@ -31,7 +31,6 @@ where
             field: Arc::new(self.field),
             chunks: vec![arr],
             phantom: PhantomData,
-            categorical_map: None,
             bit_settings: Default::default(),
             length,
         }

diff --git a/polars/polars-core/src/chunked_array/builder/utf8.rs b/polars/polars-core/src/chunked_array/builder/utf8.rs
@@ -46,7 +46,6 @@ impl Utf8ChunkedBuilder {
             field: Arc::new(self.field),
             chunks: vec![arr],
             phantom: PhantomData,
-            categorical_map: None,
             bit_settings: Default::default(),
             length,
         }

diff --git a/polars/polars-core/src/chunked_array/from.rs b/polars/polars-core/src/chunked_array/from.rs
@@ -62,7 +62,6 @@ where
             field,
             chunks,
             phantom: PhantomData,
-            categorical_map: None,
             bit_settings: Default::default(),
             length: 0,
         };
@@ -81,7 +80,6 @@ impl Int32Chunked {
             field,
             chunks,
             phantom: PhantomData,
-            categorical_map: None,
             bit_settings: Default::default(),
             length: 0,
         };
@@ -111,7 +109,6 @@ where
             field: Arc::new(Field::new(name, T::get_dtype())),
             chunks: vec![arr],
             phantom: PhantomData,
-            categorical_map: None,
             ..Default::default()
         };
         out.compute_len();

diff --git a/polars/polars-core/src/chunked_array/mod.rs b/polars/polars-core/src/chunked_array/mod.rs
@@ -50,8 +50,6 @@ use std::slice::Iter;
 use bitflags::bitflags;
 use polars_arrow::prelude::*;
 
-#[cfg(feature = "dtype-categorical")]
-use crate::chunked_array::categorical::RevMapping;
 use crate::series::IsSorted;
 use crate::utils::{first_non_null, last_non_null, CustomIterTools};
 
@@ -151,9 +149,6 @@ pub struct ChunkedArray<T: PolarsDataType> {
     pub(crate) field: Arc<Field>,
     pub(crate) chunks: Vec<ArrayRef>,
     phantom: PhantomData<T>,
-    /// TODO! remove this. Should be in the DataType
-    /// maps categorical u32 indexes to String values
-    pub(crate) categorical_map: Option<Arc<RevMapping>>,
     pub(crate) bit_settings: Settings,
     length: IdxSize,
 }
@@ -337,7 +332,6 @@ impl<T: PolarsDataType> ChunkedArray<T> {
             field: self.field.clone(),
             chunks,
             phantom: PhantomData,
-            categorical_map: self.categorical_map.clone(),
             bit_settings: self.bit_settings,
             length: 0,
         };
@@ -546,7 +540,6 @@ impl<T: PolarsDataType> Clone for ChunkedArray<T> {
             field: self.field.clone(),
             chunks: self.chunks.clone(),
             phantom: PhantomData,
-            categorical_map: self.categorical_map.clone(),
             bit_settings: self.bit_settings,
             length: self.length,
         }

diff --git a/polars/polars-core/src/chunked_array/object/builder.rs b/polars/polars-core/src/chunked_array/object/builder.rs
@@ -74,7 +74,6 @@ where
             field: Arc::new(self.field),
             chunks: vec![arr],
             phantom: PhantomData,
-            categorical_map: None,
             bit_settings: Default::default(),
             length: len as IdxSize,
         }
@@ -139,7 +138,6 @@ where
             field,
             chunks: vec![arr],
             phantom: PhantomData,
-            categorical_map: None,
             bit_settings: Default::default(),
             length: len as IdxSize,
         }

diff --git a/polars/polars-core/src/chunked_array/upstream_traits.rs b/polars/polars-core/src/chunked_array/upstream_traits.rs
@@ -24,7 +24,6 @@ impl<T: PolarsDataType> Default for ChunkedArray<T> {
             field: Arc::new(Field::new("default", DataType::Null)),
             chunks: Default::default(),
             phantom: PhantomData,
-            categorical_map: None,
             bit_settings: Default::default(),
             length: 0,
         }
@@ -341,7 +340,6 @@ impl<T: PolarsObject> FromIterator<Option<T>> for ObjectChunked<T> {
             field: Arc::new(Field::new("", DataType::Object(T::type_name()))),
             chunks: vec![arr],
             phantom: PhantomData,
-            categorical_map: None,
             bit_settings: Default::default(),
             length: 0,
         };

diff --git a/polars/polars-core/src/frame/groupby/into_groups.rs b/polars/polars-core/src/frame/groupby/into_groups.rs
@@ -30,7 +30,7 @@ where
 {
     // set group size hint
     #[cfg(feature = "dtype-categorical")]
-    let group_size_hint = if let Some(m) = &ca.categorical_map {
+    let group_size_hint = if let DataType::Categorical(Some(m)) = ca.dtype() {
         ca.len() / m.len()
     } else {
         0