This is an automated email from the ASF dual-hosted git repository.
tustvold pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-rs.git
The following commit(s) were added to refs/heads/master by this push:
new 4fa0ee8a1 Return reference from ListArray::values (#3561)
4fa0ee8a1 is described below
commit 4fa0ee8a1ed679d91c4adf82608fb3d5de68598d
Author: Raphael Taylor-Davies <1781103+tustv...@users.noreply.github.com>
AuthorDate: Thu Jan 19 21:53:54 2023 +0000
Return reference from ListArray::values (#3561)
---
arrow-array/src/array/list_array.rs | 4 ++--
arrow-cast/src/cast.rs | 15 +++++--------
arrow-ipc/src/writer.rs | 4 ++--
arrow-json/src/reader.rs | 44 ++++++++++++-------------------------
arrow-row/src/lib.rs | 2 +-
arrow/src/util/data_gen.rs | 2 +-
6 files changed, 26 insertions(+), 45 deletions(-)
diff --git a/arrow-array/src/array/list_array.rs
b/arrow-array/src/array/list_array.rs
index 3f581a886..6c49fc7fc 100644
--- a/arrow-array/src/array/list_array.rs
+++ b/arrow-array/src/array/list_array.rs
@@ -90,8 +90,8 @@ impl<OffsetSize: OffsetSizeTrait>
GenericListArray<OffsetSize> {
};
/// Returns a reference to the values of this list.
- pub fn values(&self) -> ArrayRef {
- self.values.clone()
+ pub fn values(&self) -> &ArrayRef {
+ &self.values
}
/// Returns a clone of the value type of this list.
diff --git a/arrow-cast/src/cast.rs b/arrow-cast/src/cast.rs
index aa6697a71..6b385ccd4 100644
--- a/arrow-cast/src/cast.rs
+++ b/arrow-cast/src/cast.rs
@@ -4709,8 +4709,7 @@ mod tests {
assert_eq!(1, arr.value_length(2));
assert_eq!(1, arr.value_length(3));
assert_eq!(1, arr.value_length(4));
- let values = arr.values();
- let c = values.as_any().downcast_ref::<Int32Array>().unwrap();
+ let c = as_primitive_array::<Int32Type>(arr.values());
assert_eq!(5, c.value(0));
assert_eq!(6, c.value(1));
assert_eq!(7, c.value(2));
@@ -4736,8 +4735,8 @@ mod tests {
assert_eq!(1, arr.value_length(2));
assert_eq!(1, arr.value_length(3));
assert_eq!(1, arr.value_length(4));
- let values = arr.values();
- let c = values.as_any().downcast_ref::<Int32Array>().unwrap();
+
+ let c = as_primitive_array::<Int32Type>(arr.values());
assert_eq!(1, c.null_count());
assert_eq!(5, c.value(0));
assert!(!c.is_valid(1));
@@ -4764,8 +4763,7 @@ mod tests {
assert_eq!(1, arr.value_length(1));
assert_eq!(1, arr.value_length(2));
assert_eq!(1, arr.value_length(3));
- let values = arr.values();
- let c = values.as_any().downcast_ref::<Float64Array>().unwrap();
+ let c = as_primitive_array::<Float64Type>(arr.values());
assert_eq!(1, c.null_count());
assert_eq!(7.0, c.value(0));
assert_eq!(8.0, c.value(1));
@@ -4914,9 +4912,8 @@ mod tests {
assert_eq!(2, array.value_length(2));
// expect 4 nulls: negative numbers and overflow
- let values = array.values();
- assert_eq!(4, values.null_count());
- let u16arr = values.as_any().downcast_ref::<UInt16Array>().unwrap();
+ let u16arr = as_primitive_array::<UInt16Type>(array.values());
+ assert_eq!(4, u16arr.null_count());
// expect 4 nulls: negative numbers and overflow
let expected: UInt16Array =
diff --git a/arrow-ipc/src/writer.rs b/arrow-ipc/src/writer.rs
index d7cc83aab..ec3cba64a 100644
--- a/arrow-ipc/src/writer.rs
+++ b/arrow-ipc/src/writer.rs
@@ -223,7 +223,7 @@ impl IpcDataGenerator {
let list = as_list_array(column);
self.encode_dictionaries(
field,
- &list.values(),
+ list.values(),
encoded_dictionaries,
dictionary_tracker,
write_options,
@@ -233,7 +233,7 @@ impl IpcDataGenerator {
let list = as_large_list_array(column);
self.encode_dictionaries(
field,
- &list.values(),
+ list.values(),
encoded_dictionaries,
dictionary_tracker,
write_options,
diff --git a/arrow-json/src/reader.rs b/arrow-json/src/reader.rs
index 0d3148c5a..64a1b5319 100644
--- a/arrow-json/src/reader.rs
+++ b/arrow-json/src/reader.rs
@@ -1758,6 +1758,10 @@ impl<R: Read> Iterator for Reader<R> {
#[cfg(test)]
mod tests {
use super::*;
+ use arrow_array::cast::{
+ as_boolean_array, as_dictionary_array, as_primitive_array,
as_string_array,
+ as_struct_array,
+ };
use arrow_buffer::ToByteSlice;
use arrow_schema::DataType::{Dictionary, List};
use flate2::read::GzDecoder;
@@ -2056,8 +2060,7 @@ mod tests {
.as_any()
.downcast_ref::<ListArray>()
.unwrap();
- let bb = bb.values();
- let bb = bb.as_any().downcast_ref::<Float64Array>().unwrap();
+ let bb = as_primitive_array::<Float64Type>(bb.values());
assert_eq!(9, bb.len());
assert_eq!(2.0, bb.value(0));
assert_eq!(-6.1, bb.value(5));
@@ -2068,8 +2071,7 @@ mod tests {
.as_any()
.downcast_ref::<ListArray>()
.unwrap();
- let cc = cc.values();
- let cc = cc.as_any().downcast_ref::<BooleanArray>().unwrap();
+ let cc = as_boolean_array(cc.values());
assert_eq!(6, cc.len());
assert!(!cc.value(0));
assert!(!cc.value(4));
@@ -2183,8 +2185,7 @@ mod tests {
.as_any()
.downcast_ref::<ListArray>()
.unwrap();
- let bb = bb.values();
- let bb = bb.as_any().downcast_ref::<Float64Array>().unwrap();
+ let bb = as_primitive_array::<Float64Type>(bb.values());
assert_eq!(10, bb.len());
assert_eq!(4.0, bb.value(9));
@@ -2198,8 +2199,7 @@ mod tests {
cc.data().buffers()[0],
Buffer::from_slice_ref([0i32, 2, 2, 4, 5])
);
- let cc = cc.values();
- let cc = cc.as_any().downcast_ref::<BooleanArray>().unwrap();
+ let cc = as_boolean_array(cc.values());
let cc_expected = BooleanArray::from(vec![
Some(false),
Some(true),
@@ -2219,8 +2219,8 @@ mod tests {
dd.data().buffers()[0],
Buffer::from_slice_ref([0i32, 1, 1, 2, 6])
);
- let dd = dd.values();
- let dd = dd.as_any().downcast_ref::<StringArray>().unwrap();
+
+ let dd = as_string_array(dd.values());
// values are 6 because a `d: null` is treated as a null slot
// and a list's null slot can be omitted from the child (i.e. same
offset)
assert_eq!(6, dd.len());
@@ -2366,16 +2366,8 @@ mod tests {
// compare list null buffers
assert_eq!(read.data().null_buffer(), expected.data().null_buffer());
// build struct from list
- let struct_values = read.values();
- let struct_array: &StructArray = struct_values
- .as_any()
- .downcast_ref::<StructArray>()
- .unwrap();
- let expected_struct_values = expected.values();
- let expected_struct_array = expected_struct_values
- .as_any()
- .downcast_ref::<StructArray>()
- .unwrap();
+ let struct_array = as_struct_array(read.values());
+ let expected_struct_array = as_struct_array(expected.values());
assert_eq!(7, struct_array.len());
assert_eq!(1, struct_array.null_count());
@@ -2694,11 +2686,7 @@ mod tests {
.as_any()
.downcast_ref::<ListArray>()
.unwrap();
- let evs_list = evs_list.values();
- let evs_list = evs_list
- .as_any()
- .downcast_ref::<DictionaryArray<UInt64Type>>()
- .unwrap();
+ let evs_list = as_dictionary_array::<UInt64Type>(evs_list.values());
assert_eq!(6, evs_list.len());
assert!(evs_list.is_valid(1));
assert_eq!(DataType::Utf8, evs_list.value_type());
@@ -2755,11 +2743,7 @@ mod tests {
.as_any()
.downcast_ref::<ListArray>()
.unwrap();
- let evs_list = evs_list.values();
- let evs_list = evs_list
- .as_any()
- .downcast_ref::<DictionaryArray<UInt64Type>>()
- .unwrap();
+ let evs_list = as_dictionary_array::<UInt64Type>(evs_list.values());
assert_eq!(8, evs_list.len());
assert!(evs_list.is_valid(1));
assert_eq!(DataType::Utf8, evs_list.value_type());
diff --git a/arrow-row/src/lib.rs b/arrow-row/src/lib.rs
index cf23e6e5c..eb9dc2984 100644
--- a/arrow-row/src/lib.rs
+++ b/arrow-row/src/lib.rs
@@ -512,7 +512,7 @@ impl Codec {
DataType::LargeList(_) =>
as_large_list_array(array).values(),
_ => unreachable!(),
};
- let rows = converter.convert_columns(&[values])?;
+ let rows = converter.convert_columns(&[values.clone()])?;
Ok(Encoder::List(rows))
}
}
diff --git a/arrow/src/util/data_gen.rs b/arrow/src/util/data_gen.rs
index 01f4ef5c7..8db4b154e 100644
--- a/arrow/src/util/data_gen.rs
+++ b/arrow/src/util/data_gen.rs
@@ -342,7 +342,7 @@ mod tests {
let col_c_values = col_c.values();
assert!(col_c_values.len() > size);
// col_c_values should be a list
- let col_c_list =
col_c_values.as_any().downcast_ref::<ListArray>().unwrap();
+ let col_c_list = as_list_array(col_c_values);
// Its values should be FixedSizeBinary(6)
let fsb = col_c_list.values();
assert_eq!(fsb.data_type(), &DataType::FixedSizeBinary(6));
