Merge remote-tracking branch 'upstream/master' into revisit-multipart…

…-upload

Cargo.toml

@@ -62,7 +62,7 @@ exclude = [
 ]
 
 [workspace.package]
-version = "50.0.0"
+version = "51.0.0"
 homepage = "https://github.com/apache/arrow-rs"
 repository = "https://github.com/apache/arrow-rs"
 authors = ["Apache Arrow <[email protected]>"]
@@ -77,20 +77,20 @@ edition = "2021"
 rust-version = "1.62"
 
 [workspace.dependencies]
-arrow = { version = "50.0.0", path = "./arrow", default-features = false }
-arrow-arith = { version = "50.0.0", path = "./arrow-arith" }
-arrow-array = { version = "50.0.0", path = "./arrow-array" }
-arrow-buffer = { version = "50.0.0", path = "./arrow-buffer" }
-arrow-cast = { version = "50.0.0", path = "./arrow-cast" }
-arrow-csv = { version = "50.0.0", path = "./arrow-csv" }
-arrow-data = { version = "50.0.0", path = "./arrow-data" }
-arrow-ipc = { version = "50.0.0", path = "./arrow-ipc" }
-arrow-json = { version = "50.0.0", path = "./arrow-json" }
-arrow-ord = { version = "50.0.0", path = "./arrow-ord" }
-arrow-row = { version = "50.0.0", path = "./arrow-row" }
-arrow-schema = { version = "50.0.0", path = "./arrow-schema" }
-arrow-select = { version = "50.0.0", path = "./arrow-select" }
-arrow-string = { version = "50.0.0", path = "./arrow-string" }
-parquet = { version = "50.0.0", path = "./parquet", default-features = false }
+arrow = { version = "51.0.0", path = "./arrow", default-features = false }
+arrow-arith = { version = "51.0.0", path = "./arrow-arith" }
+arrow-array = { version = "51.0.0", path = "./arrow-array" }
+arrow-buffer = { version = "51.0.0", path = "./arrow-buffer" }
+arrow-cast = { version = "51.0.0", path = "./arrow-cast" }
+arrow-csv = { version = "51.0.0", path = "./arrow-csv" }
+arrow-data = { version = "51.0.0", path = "./arrow-data" }
+arrow-ipc = { version = "51.0.0", path = "./arrow-ipc" }
+arrow-json = { version = "51.0.0", path = "./arrow-json" }
+arrow-ord = { version = "51.0.0", path = "./arrow-ord" }
+arrow-row = { version = "51.0.0", path = "./arrow-row" }
+arrow-schema = { version = "51.0.0", path = "./arrow-schema" }
+arrow-select = { version = "51.0.0", path = "./arrow-select" }
+arrow-string = { version = "51.0.0", path = "./arrow-string" }
+parquet = { version = "51.0.0", path = "./parquet", default-features = false }
 
 chrono = { version = "0.4.34", default-features = false, features = ["clock"] }

arrow-array/src/array/byte_array.rs

@@ -94,7 +94,7 @@ pub struct GenericByteArray<T: ByteArrayType> {
 impl<T: ByteArrayType> Clone for GenericByteArray<T> {
     fn clone(&self) -> Self {
         Self {
-            data_type: self.data_type.clone(),
+            data_type: T::DATA_TYPE,
             value_offsets: self.value_offsets.clone(),
             value_data: self.value_data.clone(),
             nulls: self.nulls.clone(),
@@ -323,7 +323,7 @@ impl<T: ByteArrayType> GenericByteArray<T> {
     /// Returns a zero-copy slice of this array with the indicated offset and length.
     pub fn slice(&self, offset: usize, length: usize) -> Self {
         Self {
-            data_type: self.data_type.clone(),
+            data_type: T::DATA_TYPE,
             value_offsets: self.value_offsets.slice(offset, length),
             value_data: self.value_data.clone(),
             nulls: self.nulls.as_ref().map(|n| n.slice(offset, length)),
@@ -511,7 +511,7 @@ impl<T: ByteArrayType> From<ArrayData> for GenericByteArray<T> {
         Self {
             value_offsets,
             value_data,
-            data_type: data.data_type().clone(),
+            data_type: T::DATA_TYPE,
             nulls: data.nulls().cloned(),
         }
     }