switch implementation of tand to use ScalarUDFImpl

src/postgres/math_udfs.rs

@@ -138,22 +138,56 @@ pub fn atand(args: &[ArrayRef]) -> Result<ArrayRef> {
 }
 
 /// Tangent, argument in degrees.
-pub fn tand(args: &[ArrayRef]) -> Result<ArrayRef> {
- let values = datafusion::common::cast::as_float64_array(&args[0])?;
- let mut float64array_builder = Float64Array::builder(args[0].len());
+#[derive(Debug)]
+pub struct Tand {
+ signature: Signature,
+}
 
- values.iter().try_for_each(|value| {
- if let Some(value) = value {
- let result = value.to_radians().tan();
- float64array_builder.append_value(result);
- Ok::<(), DataFusionError>(())
- } else {
- float64array_builder.append_null();
- Ok::<(), DataFusionError>(())
+impl Tand {
+ pub fn new() -> Self {
+ Self {
+ signature: Signature::uniform(1, vec![Float64], Volatility::Immutable),
  }
- })?;
+ }
+}
 
- Ok(Arc::new(float64array_builder.finish()) as ArrayRef)
+impl ScalarUDFImpl for Tand {
+ fn as_any(&self) -> &dyn std::any::Any {
+ self
+ }
+
+ fn name(&self) -> &str {
+ "tand"
+ }
+
+ fn signature(&self) -> &Signature {
+ &self.signature
+ }
+
+ fn return_type(&self, _arg_types: &[DataType]) -> Result<DataType> {
+ Ok(Float64)
+ }
+
+ fn invoke(&self, args: &[ColumnarValue]) -> Result<ColumnarValue> {
+ let args = ColumnarValue::values_to_arrays(args)?;
+ let values = datafusion::common::cast::as_float64_array(&args[0])?;
+ let mut float64array_builder = Float64Array::builder(args[0].len());
+
+ values.iter().try_for_each(|value| {
+ if let Some(value) = value {
+ let result = value.to_radians().tan();
+ float64array_builder.append_value(result);
+ Ok::<(), DataFusionError>(())
+ } else {
+ float64array_builder.append_null();
+ Ok::<(), DataFusionError>(())
+ }
+ })?;
+
+ Ok(ColumnarValue::Array(
+ Arc::new(float64array_builder.finish()) as ArrayRef,
+ ))
+ }
 }
 
 /// Nearest integer greater than or equal to argument (same as ceil).

src/postgres/mod.rs

@@ -10,7 +10,7 @@ use datafusion::physical_expr::functions::make_scalar_function;
 use datafusion::prelude::SessionContext;
 
 use crate::postgres::math_udfs::{
- acosd, asind, atand, cosd, cotd, sind, tand, Ceiling, Div, Erf, Erfc, RandomNormal,
+ acosd, asind, atand, cosd, cotd, sind, Ceiling, Div, Erf, Erfc, RandomNormal, Tand,
 };
 use crate::postgres::network_udfs::{
  broadcast, family, host, hostmask, inet_merge, inet_same_family, masklen, netmask, network,
@@ -33,7 +33,7 @@ fn register_math_udfs(ctx: &SessionContext) -> Result<()> {
  register_asind(ctx);
  register_sind(ctx);
  register_atand(ctx);
- register_tand(ctx);
+ ctx.register_udf(ScalarUDF::from(Tand::new()));
  ctx.register_udf(ScalarUDF::from(Ceiling::new()));
  ctx.register_udf(ScalarUDF::from(Div::new()));
  ctx.register_udf(ScalarUDF::from(Erf::new()));
@@ -120,19 +120,6 @@ fn register_atand(ctx: &SessionContext) {
  ctx.register_udf(atand_udf);
 }
 
-fn register_tand(ctx: &SessionContext) {
- let tand_udf = make_scalar_function(tand);
- let return_type: ReturnTypeFunction = Arc::new(move |_| Ok(Arc::new(Float64)));
- let tand_udf = ScalarUDF::new(
- "tand",
- &Signature::uniform(1, vec![Float64], Volatility::Immutable),
- &return_type,
- &tand_udf,
- );
-
- ctx.register_udf(tand_udf);
-}
-
 fn register_network_udfs(ctx: &SessionContext) -> Result<()> {
  register_broadcast(ctx);
  register_family(ctx);