Fix bad merge.

Author: alxmrs

Cargo.toml

@@ -23,7 +23,6 @@ async-stream = "0.3"
 async-trait = "0.1"
 datafusion = { version = "54.0.0" }
 datafusion-ffi = { version = "54.0.0" }
-sqlparser = { version = "0.59", features = ["visitor"] }
 futures = { version = "0.3" }
 # `abi3-py310` builds against CPython's stable ABI, so a single wheel per
 # platform works on all CPython >= 3.10 (matching `requires-python`). This

src/autograd.rs

@@ -51,7 +51,6 @@
 
 #![allow(dead_code)]
 
-use std::any::Any;
 use std::collections::HashMap;
 use std::f64::consts::{LN_10, LN_2};
 use std::ops::ControlFlow;
@@ -67,10 +66,10 @@ use datafusion::logical_expr::{
     ScalarUDF, ScalarUDFImpl, Signature, Volatility,
 };
 use datafusion::prelude::SessionContext;
+use datafusion::sql::sqlparser::ast::{Expr as SqlExpr, Visit, VisitMut, Visitor, VisitorMut};
+use datafusion::sql::sqlparser::dialect::GenericDialect;
+use datafusion::sql::sqlparser::parser::Parser;
 use datafusion::sql::unparser::expr_to_sql;
-use sqlparser::ast::{Expr as SqlExpr, Visit, VisitMut, Visitor, VisitorMut};
-use sqlparser::dialect::GenericDialect;
-use sqlparser::parser::Parser;
 
 // ---------------------------------------------------------------------------
 // Constant helpers and the 0/1-folding builders
@@ -220,7 +219,10 @@ fn linearize(expr: &Expr, leaf: &Leaf) -> Result<Expr> {
         // A numeric cast is (locally) linear: tangent of cast(u) = cast(du).
         Expr::Cast(c) => {
             let du = linearize(&c.expr, leaf)?;
-            Ok(Expr::Cast(Cast::new(Box::new(du), c.data_type.clone())))
+            Ok(Expr::Cast(Cast::new(
+                Box::new(du),
+                c.field.data_type().clone(),
+            )))
         }
 
         // tangent of -u = -(du).
@@ -402,10 +404,6 @@ impl MarkerUdf {
 }
 
 impl ScalarUDFImpl for MarkerUdf {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
     fn name(&self) -> &str {
         &self.name
     }

src/lib.rs

@@ -43,7 +43,6 @@
 
 mod autograd;
 
-use std::any::Any;
 use std::collections::{HashMap, HashSet};
 use std::ffi::CString;
 use std::fmt::Debug;
@@ -55,16 +54,11 @@ use arrow::pyarrow::{FromPyArrow, ToPyArrow};
 use async_stream::try_stream;
 use async_trait::async_trait;
 use datafusion::catalog::streaming::StreamingTable;
-use datafusion::catalog::{MemorySchemaProvider, Session};
-use datafusion::common::{
-    DFSchema, DataFusionError, Result as DFResult, ScalarValue, TableReference,
-};
 use datafusion::catalog::Session;
 use datafusion::common::stats::Precision;
 use datafusion::common::{
-    ColumnStatistics, DataFusionError, Result as DFResult, ScalarValue, Statistics,
+    ColumnStatistics, DFSchema, DataFusionError, Result as DFResult, ScalarValue, Statistics,
 };
-use datafusion::datasource::empty::EmptyTable;
 use datafusion::datasource::TableProvider;
 use datafusion::execution::TaskContext;
 use datafusion::logical_expr::expr::InList;