Made bool not ArrowNativeType.

apache · Jan 16, 2021 · 1cd33d0 · 1cd33d0
1 parent eaa7b7a
commit 1cd33d0
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 27 deletions.
diff --git a/rust/arrow/src/compute/kernels/sort.rs b/rust/arrow/src/compute/kernels/sort.rs
@@ -385,7 +385,7 @@ where
 }
 
 // insert valid and nan values in the correct order depending on the descending flag
-fn insert_valid_values<T: ArrowNativeType>(
+fn insert_valid_values<T>(
     result_slice: &mut [u32],
     offset: usize,
     valids: Vec<(u32, T)>,

diff --git a/rust/arrow/src/datatypes.rs b/rust/arrow/src/datatypes.rs
@@ -199,11 +199,18 @@ pub struct Field {
     metadata: Option<BTreeMap<String, String>>,
 }
 
-pub trait ArrowNativeType:
-    fmt::Debug + Send + Sync + Copy + PartialOrd + FromStr + Default + 'static
-{
+/// Trait declaring any type that is serializable to JSON. This includes all primitive types (bool, i32, etc.).
+pub trait JsonSerializable: 'static {
     fn into_json_value(self) -> Option<Value>;
+}
 
+/// Trait expressing a Rust type that has the same in-memory representation
+/// as Arrow. This includes `i16`, `f32`, but excludes `bool` (which in arrow is represented in bits).
+/// In little endian machines, types that implement [`ArrowNativeType`] can be memcopied to arrow buffers
+/// as is.
+pub trait ArrowNativeType:
+    fmt::Debug + Send + Sync + Copy + PartialOrd + FromStr + Default + JsonSerializable
+{
     /// Convert native type from usize.
     fn from_usize(_: usize) -> Option<Self> {
         None
@@ -225,7 +232,8 @@ pub trait ArrowNativeType:
     }
 }
 
-/// Trait indicating a primitive fixed-width type (bool, ints and floats).
+/// Trait bridging the dynamic-typed nature of Arrow (via [`DataType`]) with the
+/// static-typed nature of rust types ([`ArrowNativeType`]) for all types that implement [`ArrowNativeType`].
 pub trait ArrowPrimitiveType: 'static {
     /// Corresponding Rust native type for the primitive type.
     type Native: ArrowNativeType;
@@ -246,17 +254,19 @@ pub trait ArrowPrimitiveType: 'static {
     }
 }
 
-impl ArrowNativeType for bool {
+impl JsonSerializable for bool {
     fn into_json_value(self) -> Option<Value> {
         Some(self.into())
     }
 }
 
-impl ArrowNativeType for i8 {
+impl JsonSerializable for i8 {
     fn into_json_value(self) -> Option<Value> {
-        Some(VNumber(Number::from(self)))
+        Some(self.into())
     }
+}
 
+impl ArrowNativeType for i8 {
     fn from_usize(v: usize) -> Option<Self> {
         num::FromPrimitive::from_usize(v)
     }
@@ -266,11 +276,13 @@ impl ArrowNativeType for i8 {
     }
 }
 
-impl ArrowNativeType for i16 {
+impl JsonSerializable for i16 {
     fn into_json_value(self) -> Option<Value> {
-        Some(VNumber(Number::from(self)))
+        Some(self.into())
     }
+}
 
+impl ArrowNativeType for i16 {
     fn from_usize(v: usize) -> Option<Self> {
         num::FromPrimitive::from_usize(v)
     }
@@ -280,11 +292,13 @@ impl ArrowNativeType for i16 {
     }
 }
 
-impl ArrowNativeType for i32 {
+impl JsonSerializable for i32 {
     fn into_json_value(self) -> Option<Value> {
-        Some(VNumber(Number::from(self)))
+        Some(self.into())
     }
+}
 
+impl ArrowNativeType for i32 {
     fn from_usize(v: usize) -> Option<Self> {
         num::FromPrimitive::from_usize(v)
     }
@@ -299,11 +313,13 @@ impl ArrowNativeType for i32 {
     }
 }
 
-impl ArrowNativeType for i64 {
+impl JsonSerializable for i64 {
     fn into_json_value(self) -> Option<Value> {
         Some(VNumber(Number::from(self)))
     }
+}
 
+impl ArrowNativeType for i64 {
     fn from_usize(v: usize) -> Option<Self> {
         num::FromPrimitive::from_usize(v)
     }
@@ -318,11 +334,13 @@ impl ArrowNativeType for i64 {
     }
 }
 
-impl ArrowNativeType for u8 {
+impl JsonSerializable for u8 {
     fn into_json_value(self) -> Option<Value> {
-        Some(VNumber(Number::from(self)))
+        Some(self.into())
     }
+}
 
+impl ArrowNativeType for u8 {
     fn from_usize(v: usize) -> Option<Self> {
         num::FromPrimitive::from_usize(v)
     }
@@ -332,11 +350,13 @@ impl ArrowNativeType for u8 {
     }
 }
 
-impl ArrowNativeType for u16 {
+impl JsonSerializable for u16 {
     fn into_json_value(self) -> Option<Value> {
-        Some(VNumber(Number::from(self)))
+        Some(self.into())
     }
+}
 
+impl ArrowNativeType for u16 {
     fn from_usize(v: usize) -> Option<Self> {
         num::FromPrimitive::from_usize(v)
     }
@@ -346,11 +366,13 @@ impl ArrowNativeType for u16 {
     }
 }
 
-impl ArrowNativeType for u32 {
+impl JsonSerializable for u32 {
     fn into_json_value(self) -> Option<Value> {
-        Some(VNumber(Number::from(self)))
+        Some(self.into())
     }
+}
 
+impl ArrowNativeType for u32 {
     fn from_usize(v: usize) -> Option<Self> {
         num::FromPrimitive::from_usize(v)
     }
@@ -360,11 +382,13 @@ impl ArrowNativeType for u32 {
     }
 }
 
-impl ArrowNativeType for u64 {
+impl JsonSerializable for u64 {
     fn into_json_value(self) -> Option<Value> {
-        Some(VNumber(Number::from(self)))
+        Some(self.into())
     }
+}
 
+impl ArrowNativeType for u64 {
     fn from_usize(v: usize) -> Option<Self> {
         num::FromPrimitive::from_usize(v)
     }
@@ -374,18 +398,21 @@ impl ArrowNativeType for u64 {
     }
 }
 
-impl ArrowNativeType for f32 {
+impl JsonSerializable for f32 {
     fn into_json_value(self) -> Option<Value> {
         Number::from_f64(f64::round(self as f64 * 1000.0) / 1000.0).map(VNumber)
     }
 }
 
-impl ArrowNativeType for f64 {
+impl JsonSerializable for f64 {
     fn into_json_value(self) -> Option<Value> {
         Number::from_f64(self).map(VNumber)
     }
 }
 
+impl ArrowNativeType for f32 {}
+impl ArrowNativeType for f64 {}
+
 // BooleanType is special: its bit-width is not the size of the primitive type, and its `index`
 // operation assumes bit-packing.
 #[derive(Debug)]

diff --git a/rust/arrow/src/util/integration_util.rs b/rust/arrow/src/util/integration_util.rs
@@ -449,12 +449,10 @@ impl ArrowJsonBatch {
                     for i in 0..col.len() {
                         if col.is_null(i) {
                             validity.push(1);
-                            data.push(
-                                Int8Type::default_value().into_json_value().unwrap(),
-                            );
+                            data.push(0i8.into());
                         } else {
                             validity.push(0);
-                            data.push(col.value(i).into_json_value().unwrap());
+                            data.push(col.value(i).into());
                         }
                     }