merge main

crates/core/Cargo.toml

@@ -26,3 +26,4 @@ itertools = { workspace = true }
 serde.workspace = true
 rocksdb = "0.22.0"
 bincode = "1.3.3"
+half = "2.4.1"

crates/core/src/accumulators/mod.rs

@@ -0,0 +1,2 @@
+pub(crate) mod serializable_accumulator;
+mod serialize;

crates/core/src/accumulators/serializable_accumulator.rs

@@ -0,0 +1,112 @@
+use arrow::array::{Array, ArrayRef};
+use datafusion::common::{Result, ScalarValue};
+use datafusion::functions_aggregate::array_agg::ArrayAggAccumulator;
+use datafusion::logical_expr::Accumulator;
+use serde::{Deserialize, Serialize};
+
+use super::serialize::SerializableScalarValue;
+
+#[allow(dead_code)]
+pub trait SerializableAccumulator {
+    fn serialize(&mut self) -> Result<String>;
+    fn deserialize(self, bytes: String) -> Result<Box<dyn Accumulator>>;
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+struct SerializableArrayAggState {
+    state: Vec<SerializableScalarValue>,
+}
+
+impl SerializableAccumulator for ArrayAggAccumulator {
+    fn serialize(&mut self) -> Result<String> {
+        let state = self.state()?;
+        let serializable_state = SerializableArrayAggState {
+            state: state
+                .into_iter()
+                .map(SerializableScalarValue::from)
+                .collect(),
+        };
+        Ok(serde_json::to_string(&serializable_state).unwrap())
+    }
+
+    fn deserialize(self, bytes: String) -> Result<Box<dyn Accumulator>> {
+        let serializable_state: SerializableArrayAggState =
+            serde_json::from_str(bytes.as_str()).unwrap();
+        let state: Vec<ScalarValue> = serializable_state
+            .state
+            .into_iter()
+            .map(ScalarValue::from)
+            .collect();
+
+        // Infer the datatype from the first element of the state
+        let datatype = if let Some(ScalarValue::List(list)) = state.first() {
+            list.data_type().clone()
+        } else {
+            return Err(datafusion::common::DataFusionError::Internal(
+                "Invalid state for ArrayAggAccumulator".to_string(),
+            ));
+        };
+
+        let mut acc = ArrayAggAccumulator::try_new(&datatype)?;
+
+        // Convert ScalarValue to ArrayRef for merge_batch
+        let arrays: Vec<ArrayRef> = state
+            .into_iter()
+            .filter_map(|s| {
+                if let ScalarValue::List(list) = s {
+                    Some(list.values().clone())
+                } else {
+                    None
+                }
+            })
+            .collect();
+
+        acc.update_batch(&arrays)?;
+
+        Ok(Box::new(acc))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use arrow::array::{Int32Array, StringArray};
+    use arrow::datatypes::DataType;
+    use std::sync::Arc;
+
+    fn create_int32_array(values: Vec<Option<i32>>) -> ArrayRef {
+        Arc::new(Int32Array::from(values)) as ArrayRef
+    }
+
+    fn create_string_array(values: Vec<Option<&str>>) -> ArrayRef {
+        Arc::new(StringArray::from(values)) as ArrayRef
+    }
+
+    #[test]
+    fn test_serialize_deserialize_int32() -> Result<()> {
+        let mut acc = ArrayAggAccumulator::try_new(&DataType::Int32)?;
+        acc.update_batch(&[create_int32_array(vec![Some(1)])])?;
+
+        let serialized = SerializableAccumulator::serialize(&mut acc)?;
+        let acc2 = ArrayAggAccumulator::try_new(&DataType::Int32)?;
+
+        let mut deserialized = ArrayAggAccumulator::deserialize(acc2, serialized)?;
+
+        assert_eq!(acc.evaluate()?, deserialized.evaluate()?);
+        Ok(())
+    }
+
+    #[test]
+    fn test_serialize_deserialize_string() -> Result<()> {
+        let mut acc = ArrayAggAccumulator::try_new(&DataType::Utf8)?;
+        acc.update_batch(&[create_string_array(vec![Some("hello")])])?;
+
+        let serialized = SerializableAccumulator::serialize(&mut acc)?;
+        let acc2 = ArrayAggAccumulator::try_new(&DataType::Utf8)?;
+
+        let mut deserialized = ArrayAggAccumulator::deserialize(acc2, serialized)?;
+
+        assert_eq!(acc.evaluate()?, deserialized.evaluate()?);
+        Ok(())
+    }
+}