fix: messed up rebase

Author: Sl1mb0

host/src/lib.rs

@@ -8,7 +8,7 @@ use ::http::HeaderName;
 use arrow::datatypes::DataType;
 use datafusion_common::{DataFusionError, Result as DataFusionResult, config::ConfigOptions};
 use datafusion_expr::{
-    ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature,
+    ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature,
     async_udf::{AsyncScalarUDF, AsyncScalarUDFImpl},
 };
 use tokio::{runtime::Handle, sync::Mutex};
@@ -538,11 +538,7 @@ impl AsyncScalarUDFImpl for WasmScalarUdf {
         let columnar_value: ColumnarValue = return_type.try_into()?;
         match columnar_value {
             ColumnarValue::Array(v) => Ok(v),
-<<<<<<< HEAD
             ColumnarValue::Scalar(v) => v.to_array_of_size(args.number_rows as usize),
-=======
-            ColumnarValue::Scalar(v) => v.to_array_of_size(1),
->>>>>>> c980278 (feat: use AsyncScalarUDFImpl instead of ScalarUDFImpl)
         }
     }
 }

query/src/lib.rs

@@ -2,11 +2,9 @@
 #![allow(unused_crate_dependencies)]
 
 use std::collections::HashMap;
-use std::sync::Arc;
 
 use datafusion::execution::TaskContext;
 use datafusion_common::{DataFusionError, Result as DataFusionResult};
-use datafusion_expr::async_udf::AsyncScalarUDFImpl;
 use datafusion_sql::parser::{DFParserBuilder, Statement};
 use sqlparser::ast::{CreateFunctionBody, Expr, Statement as SqlStatement, Value};
 use sqlparser::dialect::dialect_from_str;
@@ -33,7 +31,7 @@ pub struct Lang<'a> {
 #[derive(Debug)]
 pub struct ParsedQuery {
     /// Extracted UDFs from the query
-    pub udfs: Vec<Arc<dyn AsyncScalarUDFImpl>>,
+    pub udfs: Vec<WasmScalarUdf>,
     /// SQL query string with UDF definitions removed
     pub sql: String,
 }

query/tests/integration.rs

@@ -20,7 +20,6 @@ use datafusion_udf_wasm_query::{
 use tokio::runtime::Handle;
 
 mod integration_tests;
-use datafusion_expr::async_udf::AsyncScalarUDF;
 
 use crate::integration_tests::python::test_utils::python_component;