reduce size of change

Author: samuelcolvin

src/common.rs

@@ -12,7 +12,9 @@ use datafusion::common::{exec_err, plan_err, Result as DataFusionResult, ScalarV
 use datafusion::logical_expr::ColumnarValue;
 use jiter::{Jiter, JiterError, Peek};
 
-use crate::common_union::{is_json_union, json_from_union_scalar, nested_json_array, TYPE_ID_NULL};
+use crate::common_union::{
+    is_json_union, json_from_union_scalar, nested_json_array, JsonUnion, JsonUnionField, TYPE_ID_NULL,
+};
 
 /// General implementation of `ScalarUDFImpl::return_type`.
 ///
@@ -124,6 +126,7 @@ impl_from_option_iter!(UInt64Array, u64);
 impl_from_option_iter!(Float64Array, f64);
 impl_from_option_iter!(StringArray, String);
 impl_from_option_iter!(BooleanArray, bool);
+impl_from_option_iter!(JsonUnion, JsonUnionField);
 
 pub fn invoke<C: FromOptionIter<I> + 'static, I>(
     args: &[ColumnarValue],

src/common_union.rs

@@ -8,8 +8,6 @@ use datafusion::arrow::datatypes::{DataType, Field, UnionFields, UnionMode};
 use datafusion::arrow::error::ArrowError;
 use datafusion::common::ScalarValue;
 
-use crate::common::FromOptionIter;
-
 pub fn is_json_union(data_type: &DataType) -> bool {
     match data_type {
         DataType::Union(fields, UnionMode::Sparse) => fields == &union_fields(),
@@ -98,8 +96,9 @@ impl JsonUnion {
     }
 }
 
-impl FromOptionIter<JsonUnionField> for JsonUnion {
-    fn from_option_iter<I: IntoIterator<Item = Option<JsonUnionField>>>(iter: I) -> Self {
+/// So we can do `collect::<JsonUnion>()`
+impl FromIterator<Option<JsonUnionField>> for JsonUnion {
+    fn from_iter<I: IntoIterator<Item = Option<JsonUnionField>>>(iter: I) -> Self {
         let inner = iter.into_iter();
         let (lower, upper) = inner.size_hint();
         let mut union = Self::new(upper.unwrap_or(lower));
@@ -275,7 +274,7 @@ mod test {
 
     #[test]
     fn test_json_union() {
-        let json_union = JsonUnion::from_option_iter(vec![
+        let json_union = JsonUnion::from_iter(vec![
             Some(JsonUnionField::JsonNull),
             Some(JsonUnionField::Bool(true)),
             Some(JsonUnionField::Bool(false)),

src/json_as_text.rs

@@ -50,7 +50,7 @@ impl ScalarUDFImpl for JsonAsText {
     }
 
     fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
-        invoke::<StringArray, _>(
+        invoke::<StringArray, String>(
             args,
             jiter_json_as_text,
             |c| Ok(Arc::new(c) as ArrayRef),

src/json_contains.rs

@@ -53,7 +53,7 @@ impl ScalarUDFImpl for JsonContains {
     }
 
     fn invoke(&self, args: &[ColumnarValue]) -> Result<ColumnarValue> {
-        invoke::<BooleanArray, _>(
+        invoke::<BooleanArray, bool>(
             args,
             jiter_json_contains,
             |c| Ok(Arc::new(c) as ArrayRef),

src/json_get.rs

@@ -58,7 +58,7 @@ impl ScalarUDFImpl for JsonGet {
             let array: UnionArray = c.try_into()?;
             Ok(Arc::new(array) as ArrayRef)
         };
-        invoke::<JsonUnion, _>(args, jiter_json_get_union, to_array, JsonUnionField::scalar_value, true)
+        invoke::<JsonUnion, JsonUnionField>(args, jiter_json_get_union, to_array, JsonUnionField::scalar_value, true)
     }
 
     fn aliases(&self) -> &[String] {

src/json_get_bool.rs

@@ -50,7 +50,7 @@ impl ScalarUDFImpl for JsonGetBool {
     }
 
     fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
-        invoke::<BooleanArray, _>(
+        invoke::<BooleanArray, bool>(
             args,
             jiter_json_get_bool,
             |c| Ok(Arc::new(c) as ArrayRef),

src/json_get_float.rs

@@ -50,7 +50,7 @@ impl ScalarUDFImpl for JsonGetFloat {
     }
 
     fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
-        invoke::<Float64Array, _>(
+        invoke::<Float64Array, f64>(
             args,
             jiter_json_get_float,
             |c| Ok(Arc::new(c) as ArrayRef),

src/json_get_int.rs

@@ -50,7 +50,7 @@ impl ScalarUDFImpl for JsonGetInt {
     }
 
     fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
-        invoke::<Int64Array, _>(
+        invoke::<Int64Array, i64>(
             args,
             jiter_json_get_int,
             |c| Ok(Arc::new(c) as ArrayRef),

src/json_get_json.rs

@@ -49,7 +49,7 @@ impl ScalarUDFImpl for JsonGetJson {
     }
 
     fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
-        invoke::<StringArray, _>(
+        invoke::<StringArray, String>(
             args,
             jiter_json_get_json,
             |c| Ok(Arc::new(c) as ArrayRef),

src/json_get_str.rs

@@ -50,7 +50,7 @@ impl ScalarUDFImpl for JsonGetStr {
     }
 
     fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
-        invoke::<StringArray, _>(
+        invoke::<StringArray, String>(
             args,
             jiter_json_get_str,
             |c| Ok(Arc::new(c) as ArrayRef),