Revert "feat(rust): Add RLE to RLE_DICTIONARY encoder (#15959)"

This reverts commit 6730a72.

Author: nameexhaustion

crates/polars-arrow/src/compute/cast/binary_to.rs

@@ -139,7 +139,6 @@ pub fn binary_to_dictionary<O: Offset, K: DictionaryKey>(
     from: &BinaryArray<O>,
 ) -> PolarsResult<DictionaryArray<K>> {
     let mut array = MutableDictionaryArray::<K, MutableBinaryArray<O>>::new();
-    array.reserve(from.len());
     array.try_extend(from.iter())?;
 
     Ok(array.into())

crates/polars-arrow/src/compute/cast/binview_to.rs

@@ -21,7 +21,6 @@ pub(super) fn binview_to_dictionary<K: DictionaryKey>(
     from: &BinaryViewArray,
 ) -> PolarsResult<DictionaryArray<K>> {
     let mut array = MutableDictionaryArray::<K, MutableBinaryViewArray<[u8]>>::new();
-    array.reserve(from.len());
     array.try_extend(from.iter())?;
 
     Ok(array.into())
@@ -31,7 +30,6 @@ pub(super) fn utf8view_to_dictionary<K: DictionaryKey>(
     from: &Utf8ViewArray,
 ) -> PolarsResult<DictionaryArray<K>> {
     let mut array = MutableDictionaryArray::<K, MutableBinaryViewArray<str>>::new();
-    array.reserve(from.len());
     array.try_extend(from.iter())?;
 
     Ok(array.into())

crates/polars-arrow/src/compute/cast/primitive_to.rs

@@ -318,7 +318,6 @@ pub fn primitive_to_dictionary<T: NativeType + Eq + Hash, K: DictionaryKey>(
     let mut array = MutableDictionaryArray::<K, _>::try_empty(MutablePrimitiveArray::<T>::from(
         from.data_type().clone(),
     ))?;
-    array.reserve(from.len());
     array.try_extend(iter)?;
 
     Ok(array.into())

crates/polars-arrow/src/compute/cast/utf8_to.rs

@@ -27,7 +27,6 @@ pub fn utf8_to_dictionary<O: Offset, K: DictionaryKey>(
     from: &Utf8Array<O>,
 ) -> PolarsResult<DictionaryArray<K>> {
     let mut array = MutableDictionaryArray::<K, MutableUtf8Array<O>>::new();
-    array.reserve(from.len());
     array.try_extend(from.iter())?;
 
     Ok(array.into())

crates/polars-io/src/parquet/write/writer.rs

@@ -102,7 +102,7 @@ where
         WriteOptions {
             write_statistics: self.statistics,
             compression: self.compression,
-            version: Version::V1,
+            version: Version::V2,
             data_pagesize_limit: self.data_page_size,
         }
     }

crates/polars-parquet/src/arrow/write/dictionary.rs

@@ -1,6 +1,7 @@
 use arrow::array::{Array, BinaryViewArray, DictionaryArray, DictionaryKey, Utf8ViewArray};
 use arrow::bitmap::{Bitmap, MutableBitmap};
 use arrow::datatypes::{ArrowDataType, IntegerType};
+use num_traits::ToPrimitive;
 use polars_error::{polars_bail, PolarsResult};
 
 use super::binary::{
@@ -15,19 +16,23 @@ use super::primitive::{
 use super::{binview, nested, Nested, WriteOptions};
 use crate::arrow::read::schema::is_nullable;
 use crate::arrow::write::{slice_nested_leaf, utils};
-use crate::parquet::encoding::hybrid_rle::encode;
+use crate::parquet::encoding::hybrid_rle::encode_u32;
 use crate::parquet::encoding::Encoding;
 use crate::parquet::page::{DictPage, Page};
 use crate::parquet::schema::types::PrimitiveType;
 use crate::parquet::statistics::{serialize_statistics, ParquetStatistics};
-use crate::write::DynIter;
+use crate::write::{to_nested, DynIter, ParquetType};
 
 pub(crate) fn encode_as_dictionary_optional(
     array: &dyn Array,
-    nested: &[Nested],
     type_: PrimitiveType,
     options: WriteOptions,
 ) -> Option<PolarsResult<DynIter<'static, PolarsResult<Page>>>> {
+    let nested = to_nested(array, &ParquetType::PrimitiveType(type_.clone()))
+        .ok()?
+        .pop()
+        .unwrap();
+
     let dtype = Box::new(array.data_type().clone());
 
     let len_before = array.len();
@@ -47,11 +52,35 @@ pub(crate) fn encode_as_dictionary_optional(
     if (array.values().len() as f64) / (len_before as f64) > 0.75 {
         return None;
     }
+    if array.values().len().to_u16().is_some() {
+        let array = arrow::compute::cast::cast(
+            array,
+            &ArrowDataType::Dictionary(
+                IntegerType::UInt16,
+                Box::new(array.values().data_type().clone()),
+                false,
+            ),
+            Default::default(),
+        )
+        .unwrap();
+
+        let array = array
+            .as_any()
+            .downcast_ref::<DictionaryArray<u16>>()
+            .unwrap();
+        return Some(array_to_pages(
+            array,
+            type_,
+            &nested,
+            options,
+            Encoding::RleDictionary,
+        ));
+    }
 
     Some(array_to_pages(
         array,
         type_,
-        nested,
+        &nested,
         options,
         Encoding::RleDictionary,
     ))
@@ -87,15 +116,15 @@ fn serialize_keys_values<K: DictionaryKey>(
         buffer.push(num_bits as u8);
 
         // followed by the encoded indices.
-        Ok(encode::<u32, _, _>(buffer, keys, num_bits)?)
+        Ok(encode_u32(buffer, keys, num_bits)?)
     } else {
         let num_bits = utils::get_bit_width(keys.clone().max().unwrap_or(0) as u64);
 
         // num_bits as a single byte
         buffer.push(num_bits as u8);
 
         // followed by the encoded indices.
-        Ok(encode::<u32, _, _>(buffer, keys, num_bits)?)
+        Ok(encode_u32(buffer, keys, num_bits)?)
     }
 }
 

crates/polars-parquet/src/arrow/write/mod.rs

@@ -219,7 +219,7 @@ pub fn array_to_pages(
         // Only take this path for primitive columns
         if matches!(nested.first(), Some(Nested::Primitive(_, _, _))) {
             if let Some(result) =
-                encode_as_dictionary_optional(primitive_array, nested, type_.clone(), options)
+                encode_as_dictionary_optional(primitive_array, type_.clone(), options)
             {
                 return result;
             }

crates/polars-parquet/src/arrow/write/nested/mod.rs

@@ -6,7 +6,7 @@ use polars_error::PolarsResult;
 pub use rep::num_values;
 
 use super::Nested;
-use crate::parquet::encoding::hybrid_rle::encode;
+use crate::parquet::encoding::hybrid_rle::encode_u32;
 use crate::parquet::read::levels::get_bit_width;
 use crate::parquet::write::Version;
 
@@ -41,12 +41,12 @@ fn write_rep_levels(buffer: &mut Vec<u8>, nested: &[Nested], version: Version) -
     match version {
         Version::V1 => {
             write_levels_v1(buffer, |buffer: &mut Vec<u8>| {
-                encode::<u32, _, _>(buffer, levels, num_bits)?;
+                encode_u32(buffer, levels, num_bits)?;
                 Ok(())
             })?;
         },
         Version::V2 => {
-            encode::<u32, _, _>(buffer, levels, num_bits)?;
+            encode_u32(buffer, levels, num_bits)?;
         },
     }
 
@@ -65,10 +65,10 @@ fn write_def_levels(buffer: &mut Vec<u8>, nested: &[Nested], version: Version) -
 
     match version {
         Version::V1 => write_levels_v1(buffer, move |buffer: &mut Vec<u8>| {
-            encode::<u32, _, _>(buffer, levels, num_bits)?;
+            encode_u32(buffer, levels, num_bits)?;
             Ok(())
         }),
-        Version::V2 => Ok(encode::<u32, _, _>(buffer, levels, num_bits)?),
+        Version::V2 => Ok(encode_u32(buffer, levels, num_bits)?),
     }
 }
 

crates/polars-parquet/src/arrow/write/utils.rs

@@ -4,7 +4,7 @@ use polars_error::*;
 
 use super::{Version, WriteOptions};
 use crate::parquet::compression::CompressionOptions;
-use crate::parquet::encoding::hybrid_rle::encode;
+use crate::parquet::encoding::hybrid_rle::encode_bool;
 use crate::parquet::encoding::Encoding;
 use crate::parquet::metadata::Descriptor;
 use crate::parquet::page::{DataPage, DataPageHeader, DataPageHeaderV1, DataPageHeaderV2};
@@ -14,7 +14,7 @@ use crate::parquet::statistics::ParquetStatistics;
 fn encode_iter_v1<I: Iterator<Item = bool>>(buffer: &mut Vec<u8>, iter: I) -> PolarsResult<()> {
     buffer.extend_from_slice(&[0; 4]);
     let start = buffer.len();
-    encode::<bool, _, _>(buffer, iter, 1)?;
+    encode_bool(buffer, iter)?;
     let end = buffer.len();
     let length = end - start;
 
@@ -25,7 +25,7 @@ fn encode_iter_v1<I: Iterator<Item = bool>>(buffer: &mut Vec<u8>, iter: I) -> Po
 }
 
 fn encode_iter_v2<I: Iterator<Item = bool>>(writer: &mut Vec<u8>, iter: I) -> PolarsResult<()> {
-    Ok(encode::<bool, _, _>(writer, iter, 1)?)
+    Ok(encode_bool(writer, iter)?)
 }
 
 fn encode_iter<I: Iterator<Item = bool>>(