clean-up

Author: vigimite

src/common_union.rs

@@ -90,12 +90,6 @@ impl JsonUnion {
         debug_assert!(self.index <= self.length);
     }
 
-    fn push_array(&mut self, fields: Vec<String>) {
-        self.arrays[self.index] = Some(fields.join(","));
-        self.index += 1;
-        debug_assert!(self.index <= self.length);
-    }
-
     fn push_none(&mut self) {
         self.index += 1;
         debug_assert!(self.index <= self.length);
@@ -120,16 +114,16 @@ impl FromIterator<Option<JsonUnionField>> for JsonUnion {
     }
 }
 
-/// Tries to collect a String array to a JsonUnion
-impl FromIterator<Option<Vec<String>>> for JsonUnion {
-    fn from_iter<I: IntoIterator<Item = Option<Vec<String>>>>(iter: I) -> Self {
+/// Tries to collect an array represented as a string to a JsonUnion
+impl FromIterator<Option<String>> for JsonUnion {
+    fn from_iter<I: IntoIterator<Item = Option<String>>>(iter: I) -> Self {
         let inner = iter.into_iter();
         let (lower, upper) = inner.size_hint();
         let mut union = Self::new(upper.unwrap_or(lower));
 
         for row in inner {
-            if let Some(arrays) = row {
-                union.push_array(arrays);
+            if let Some(array) = row {
+                union.push(JsonUnionField::Array(array));
             } else {
                 union.push_none();
             }

src/json_get_array.rs

@@ -56,15 +56,15 @@ impl ScalarUDFImpl for JsonGetArray {
             let array: ListArray = c.try_into()?;
             Ok(Arc::new(array) as ArrayRef)
         };
-        invoke::<JsonUnion, Vec<String>>(args, jiter_json_get_array, to_array, scalar_value)
+        invoke::<JsonUnion, String>(args, jiter_json_get_array, to_array, ScalarValue::Utf8)
     }
 
     fn aliases(&self) -> &[String] {
         &self.aliases
     }
 }
 
-fn jiter_json_get_array(json_data: Option<&str>, path: &[JsonPath]) -> Result<Vec<String>, GetError> {
+fn jiter_json_get_array(json_data: Option<&str>, path: &[JsonPath]) -> Result<String, GetError> {
     if let Some((mut jiter, peek)) = jiter_json_find(json_data, path) {
         match peek {
             Peek::Array => {
@@ -82,24 +82,11 @@ fn jiter_json_get_array(json_data: Option<&str>, path: &[JsonPath]) -> Result<Ve
                     peek_opt = jiter.array_step()?;
                 }
 
-                Ok(array_values)
+                Ok(array_values.join(","))
             }
             _ => get_err!(),
         }
     } else {
         get_err!()
     }
 }
-
-pub fn scalar_value(f: Option<Vec<String>>) -> ScalarValue {
-    if let Some(array) = f {
-        let values = array
-            .into_iter()
-            .map(|e| ScalarValue::Utf8(Some(e)))
-            .collect::<Vec<_>>();
-
-        ScalarValue::List(ScalarValue::new_list_nullable(&values, &DataType::Utf8))
-    } else {
-        ScalarValue::Null
-    }
-}