Fixed growable of dictionaries negative keys

src/array/dictionary/mod.rs

@@ -14,6 +14,7 @@ pub use iterator::*;
 pub use mutable::*;
 
 use super::{new_empty_array, primitive::PrimitiveArray, Array};
+use crate::scalar::NullScalar;
 
 /// Trait denoting [`NativeType`]s that can be used as keys of a dictionary.
 pub trait DictionaryKey:
@@ -127,8 +128,12 @@ impl<K: DictionaryKey> DictionaryArray<K> {
     /// Returns the value of the [`DictionaryArray`] at position `i`.
     #[inline]
     pub fn value(&self, index: usize) -> Box<dyn Scalar> {
-        let index = self.keys.value(index).to_usize().unwrap();
-        new_scalar(self.values.as_ref(), index)
+        if self.keys.is_null(index) {
+            Box::new(NullScalar::new())
+        } else {
+            let index = self.keys.value(index).to_usize().unwrap();
+            new_scalar(self.values.as_ref(), index)
+        }
     }
 }
 

src/array/growable/dictionary.rs

@@ -100,7 +100,7 @@ impl<'a, T: DictionaryKey> Growable<'a> for GrowableDictionary<'a, T> {
         self.key_values.extend(
             values
                 .iter()
-                .map(|x| T::from_usize(offset + x.to_usize().unwrap()).unwrap()),
+                .map(|x| T::from_usize(offset + x.to_usize().unwrap_or(0)).unwrap()),
         );
     }
 

tests/it/array/growable/dictionary.rs

@@ -2,6 +2,7 @@ use std::sync::Arc;
 
 use arrow2::array::growable::{Growable, GrowableDictionary};
 use arrow2::array::*;
+use arrow2::datatypes::DataType;
 use arrow2::error::Result;
 
 #[test]
@@ -29,6 +30,24 @@ fn test_single() -> Result<()> {
     Ok(())
 }
 
+#[test]
+fn test_negative_keys() {
+    let vals = vec![Some("a"), Some("b"), Some("c")];
+    let keys = vec![0, 1, 2, -1];
+
+    let keys = PrimitiveArray::from_data(
+        DataType::Int32,
+        keys.into(),
+        Some(vec![true, true, true, false].into()),
+    );
+
+    let arr = DictionaryArray::from_data(keys, Arc::new(Utf8Array::<i32>::from(vals)));
+    // check that we don't panic with negative keys to usize conversion
+    let out = arrow2::compute::concat::concatenate(&[&arr]).unwrap();
+    let out = out.as_any().downcast_ref::<DictionaryArray<i32>>().unwrap();
+    assert_eq!(out, &arr);
+}
+
 #[test]
 fn test_multi() -> Result<()> {
     let mut original_data1 = vec![Some("a"), Some("b"), None, Some("a")];