From beaf307c4804693d8580a354364acf3313b35b44 Mon Sep 17 00:00:00 2001
From: "Jorge C. Leitao" <jorgecarleitao@gmail.com>
Date: Thu, 19 Aug 2021 07:48:20 +0000
Subject: [PATCH] Reverted.

---
 src/array/growable/fixed_binary.rs |  5 +++--
 src/scalar/list.rs                 | 14 +++++++-------
 tests/it/scalar/list.rs            |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/array/growable/fixed_binary.rs b/src/array/growable/fixed_binary.rs
index 3a4ca15e90a..945786968b8 100644
--- a/src/array/growable/fixed_binary.rs
+++ b/src/array/growable/fixed_binary.rs
@@ -69,11 +69,12 @@ impl<'a> Growable<'a> for GrowableFixedSizeBinary<'a> {
         let values = array.values();
 
         self.values
-            .extend_from_slice(&values[start * self.size..(start + len) * self.size]);
+            .extend_from_slice(&values[start * self.size..start * self.size + len * self.size]);
     }
 
     fn extend_validity(&mut self, additional: usize) {
-        self.values.extend_constant(self.size * additional, 0);
+        self.values
+            .extend_from_slice(&vec![0; self.size * additional]);
         self.validity.extend_constant(additional, false);
     }
 
diff --git a/src/scalar/list.rs b/src/scalar/list.rs
index 3439df9fe28..4623711a5b2 100644
--- a/src/scalar/list.rs
+++ b/src/scalar/list.rs
@@ -9,7 +9,7 @@ use super::Scalar;
 /// [`Array`]. The only difference is that this has only one element.
 #[derive(Debug, Clone)]
 pub struct ListScalar<O: Offset> {
-    value: Arc<dyn Array>,
+    values: Arc<dyn Array>,
     is_valid: bool,
     phantom: std::marker::PhantomData<O>,
     data_type: DataType,
@@ -19,7 +19,7 @@ impl<O: Offset> PartialEq for ListScalar<O> {
     fn eq(&self, other: &Self) -> bool {
         (self.data_type == other.data_type)
             && (self.is_valid == other.is_valid)
-            && ((!self.is_valid) | (self.value.as_ref() == other.value.as_ref()))
+            && ((!self.is_valid) | (self.values.as_ref() == other.values.as_ref()))
     }
 }
 
@@ -29,9 +29,9 @@ impl<O: Offset> ListScalar<O> {
     /// * the `data_type` is not `List` or `LargeList` (depending on this scalar's offset `O`)
     /// * the child of the `data_type` is not equal to the `values`
     #[inline]
-    pub fn new(data_type: DataType, value: Option<Arc<dyn Array>>) -> Self {
+    pub fn new(data_type: DataType, values: Option<Arc<dyn Array>>) -> Self {
         let inner_data_type = ListArray::<O>::get_child_type(&data_type);
-        let (is_valid, value) = match value {
+        let (is_valid, values) = match values {
             Some(values) => {
                 assert_eq!(inner_data_type, values.data_type());
                 (true, values)
@@ -39,15 +39,15 @@ impl<O: Offset> ListScalar<O> {
             None => (false, new_empty_array(inner_data_type.clone()).into()),
         };
         Self {
-            value,
+            values,
             is_valid,
             phantom: std::marker::PhantomData,
             data_type,
         }
     }
 
-    pub fn value(&self) -> &Arc<dyn Array> {
-        &self.value
+    pub fn values(&self) -> &Arc<dyn Array> {
+        &self.values
     }
 }
 
diff --git a/tests/it/scalar/list.rs b/tests/it/scalar/list.rs
index 523b75b3bc8..9475a30a580 100644
--- a/tests/it/scalar/list.rs
+++ b/tests/it/scalar/list.rs
@@ -34,7 +34,7 @@ fn basics() {
         Some(Arc::new(BooleanArray::from_slice([true, false])) as Arc<dyn Array>),
     );
 
-    assert_eq!(BooleanArray::from_slice([true, false]), a.value().as_ref());
+    assert_eq!(BooleanArray::from_slice([true, false]), a.values().as_ref());
     assert_eq!(a.data_type(), &dt);
     assert!(a.is_valid());