You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ag...@apache.org on 2019/01/08 05:51:19 UTC
[arrow] branch master updated: ARROW-4042: [Rust] Rename
BinaryArray::get_value to value
This is an automated email from the ASF dual-hosted git repository.
agrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 1143942 ARROW-4042: [Rust] Rename BinaryArray::get_value to value
1143942 is described below
commit 1143942bc5264d89a343031e522ffc5aa7abf7b3
Author: Andy Grove <an...@gmail.com>
AuthorDate: Mon Jan 7 22:51:10 2019 -0700
ARROW-4042: [Rust] Rename BinaryArray::get_value to value
This PR makes BinaryArray consistent with PrimitiveArray (and with the C++ implementation)
Author: Andy Grove <an...@gmail.com>
Closes #3343 from andygrove/ARROW-4042 and squashes the following commits:
861d09e <Andy Grove> Rename BinaryArray::get_value to value for consistency with PrimitiveArray
---
rust/arrow/examples/read_csv.rs | 2 +-
rust/arrow/src/array.rs | 16 ++++++++--------
rust/arrow/src/builder.rs | 12 ++++++------
rust/arrow/src/csv/reader.rs | 2 +-
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/rust/arrow/examples/read_csv.rs b/rust/arrow/examples/read_csv.rs
index 147d2f9..fd15e33 100644
--- a/rust/arrow/examples/read_csv.rs
+++ b/rust/arrow/examples/read_csv.rs
@@ -59,7 +59,7 @@ fn main() {
.unwrap();
for i in 0..batch.num_rows() {
- let city_name: String = String::from_utf8(city.get_value(i).to_vec()).unwrap();
+ let city_name: String = String::from_utf8(city.value(i).to_vec()).unwrap();
println!(
"City: {}, Latitude: {}, Longitude: {}",
diff --git a/rust/arrow/src/array.rs b/rust/arrow/src/array.rs
index 5184b66..f8272eb 100644
--- a/rust/arrow/src/array.rs
+++ b/rust/arrow/src/array.rs
@@ -470,7 +470,7 @@ pub struct BinaryArray {
impl BinaryArray {
/// Returns the element at index `i` as a byte slice.
- pub fn get_value(&self, i: usize) -> &[u8] {
+ pub fn value(&self, i: usize) -> &[u8] {
assert!(i < self.data.len(), "BinaryArray out of bounds access");
let offset = i.checked_add(self.data.offset()).unwrap();
unsafe {
@@ -486,7 +486,7 @@ impl BinaryArray {
///
/// Note this doesn't do any bound checking, for performance reason.
pub fn get_string(&self, i: usize) -> String {
- let slice = self.get_value(i);
+ let slice = self.value(i);
unsafe { String::from_utf8_unchecked(Vec::from(slice)) }
}
@@ -951,13 +951,13 @@ mod tests {
let binary_array = BinaryArray::from(array_data);
assert_eq!(3, binary_array.len());
assert_eq!(0, binary_array.null_count());
- assert_eq!([b'h', b'e', b'l', b'l', b'o'], binary_array.get_value(0));
+ assert_eq!([b'h', b'e', b'l', b'l', b'o'], binary_array.value(0));
assert_eq!("hello", binary_array.get_string(0));
- assert_eq!([] as [u8; 0], binary_array.get_value(1));
+ assert_eq!([] as [u8; 0], binary_array.value(1));
assert_eq!("", binary_array.get_string(1));
assert_eq!(
[b'p', b'a', b'r', b'q', b'u', b'e', b't'],
- binary_array.get_value(2)
+ binary_array.value(2)
);
assert_eq!("parquet", binary_array.get_string(2));
assert_eq!(5, binary_array.value_offset(2));
@@ -977,7 +977,7 @@ mod tests {
let binary_array = BinaryArray::from(array_data);
assert_eq!(
[b'p', b'a', b'r', b'q', b'u', b'e', b't'],
- binary_array.get_value(1)
+ binary_array.value(1)
);
assert_eq!("parquet", binary_array.get_string(1));
assert_eq!(5, binary_array.value_offset(0));
@@ -1019,7 +1019,7 @@ mod tests {
assert_eq!(binary_array1.len(), binary_array2.len());
assert_eq!(binary_array1.null_count(), binary_array2.null_count());
for i in 0..binary_array1.len() {
- assert_eq!(binary_array1.get_value(i), binary_array2.get_value(i));
+ assert_eq!(binary_array1.value(i), binary_array2.value(i));
assert_eq!(binary_array1.get_string(i), binary_array2.get_string(i));
assert_eq!(binary_array1.value_offset(i), binary_array2.value_offset(i));
assert_eq!(binary_array1.value_length(i), binary_array2.value_length(i));
@@ -1082,7 +1082,7 @@ mod tests {
.add_buffer(Buffer::from(&values[..]))
.build();
let binary_array = BinaryArray::from(array_data);
- binary_array.get_value(4);
+ binary_array.value(4);
}
#[test]
diff --git a/rust/arrow/src/builder.rs b/rust/arrow/src/builder.rs
index b762c51..a0bb43c 100644
--- a/rust/arrow/src/builder.rs
+++ b/rust/arrow/src/builder.rs
@@ -1133,11 +1133,11 @@ mod tests {
assert_eq!(3, binary_array.len());
assert_eq!(0, binary_array.null_count());
- assert_eq!([b'h', b'e', b'l', b'l', b'o'], binary_array.get_value(0));
+ assert_eq!([b'h', b'e', b'l', b'l', b'o'], binary_array.value(0));
assert_eq!("hello", binary_array.get_string(0));
- assert_eq!([] as [u8; 0], binary_array.get_value(1));
+ assert_eq!([] as [u8; 0], binary_array.value(1));
assert_eq!("", binary_array.get_string(1));
- assert_eq!([b'w', b'o', b'r', b'l', b'd'], binary_array.get_value(2));
+ assert_eq!([b'w', b'o', b'r', b'l', b'd'], binary_array.value(2));
assert_eq!("world", binary_array.get_string(2));
assert_eq!(5, binary_array.value_offset(2));
assert_eq!(5, binary_array.value_length(2));
@@ -1175,11 +1175,11 @@ mod tests {
assert_eq!(3, binary_array.len());
assert_eq!(0, binary_array.null_count());
- assert_eq!([b'h', b'e', b'l', b'l', b'o'], binary_array.get_value(0));
+ assert_eq!([b'h', b'e', b'l', b'l', b'o'], binary_array.value(0));
assert_eq!("hello", binary_array.get_string(0));
- assert_eq!([] as [u8; 0], binary_array.get_value(1));
+ assert_eq!([] as [u8; 0], binary_array.value(1));
assert_eq!("", binary_array.get_string(1));
- assert_eq!([b'w', b'o', b'r', b'l', b'd'], binary_array.get_value(2));
+ assert_eq!([b'w', b'o', b'r', b'l', b'd'], binary_array.value(2));
assert_eq!("world", binary_array.get_string(2));
assert_eq!(5, binary_array.value_offset(2));
assert_eq!(5, binary_array.value_length(2));
diff --git a/rust/arrow/src/csv/reader.rs b/rust/arrow/src/csv/reader.rs
index 10be0ab..57c7dde 100644
--- a/rust/arrow/src/csv/reader.rs
+++ b/rust/arrow/src/csv/reader.rs
@@ -231,7 +231,7 @@ mod tests {
.downcast_ref::<BinaryArray>()
.unwrap();
- let city_name: String = String::from_utf8(city.get_value(13).to_vec()).unwrap();
+ let city_name: String = String::from_utf8(city.value(13).to_vec()).unwrap();
assert_eq!("Aberdeen, Aberdeen City, UK", city_name);
}