remove type analysis field

Signed-off-by: Runji Wang <wangrunji0408@163.com>

src/binder_v2/mod.rs

@@ -105,10 +105,7 @@ impl Binder {
     pub fn new(catalog: Arc<RootCatalog>) -> Self {
         Binder {
             catalog: catalog.clone(),
-            egraph: egg::EGraph::new(TypeSchemaAnalysis {
-                catalog,
-                alias_types: Default::default(),
-            }),
+            egraph: egg::EGraph::new(TypeSchemaAnalysis { catalog }),
             contexts: vec![Context::default()],
         }
     }

src/binder_v2/table.rs

@@ -261,7 +261,6 @@ mod tests {
 
             let mut egraph = egg::EGraph::new(TypeSchemaAnalysis {
                 catalog: catalog.clone(),
-                alias_types: Default::default(),
             });
             println!("{}", optimized.pretty(10));
             egraph.add_expr(&optimized);

src/executor_v2/mod.rs

@@ -138,7 +138,6 @@ impl<S: Storage> Builder<S> {
     fn new(catalog: RootCatalogRef, storage: Arc<S>, plan: &RecExpr) -> Self {
         let mut egraph = egg::EGraph::new(TypeSchemaAnalysis {
             catalog: catalog.clone(),
-            alias_types: Default::default(),
         });
         let root = egraph.add_expr(plan);
         Builder {

src/planner/rules/mod.rs

@@ -22,14 +22,14 @@
 //! [`Type`]: type_::Type
 //! [`Rows`]: rows::Rows
 
-use std::collections::{HashMap, HashSet};
+use std::collections::HashSet;
 use std::hash::Hash;
 use std::sync::LazyLock;
 
 use egg::{rewrite as rw, *};
 
 use super::{EGraph, Expr, Pattern, Rewrite};
-use crate::catalog::{ColumnRefId, RootCatalogRef};
+use crate::catalog::RootCatalogRef;
 use crate::types::F32;
 
 mod agg;
@@ -121,10 +121,6 @@ impl Analysis<Expr> for ExprAnalysis {
 #[derive(Default)]
 pub struct TypeSchemaAnalysis {
     pub catalog: RootCatalogRef,
-    /// Types for alias node.
-    ///
-    /// Once meet `(as alias expr)`, it will insert `(alias, type(expr))` to this map.
-    pub alias_types: HashMap<ColumnRefId, type_::Type>,
 }
 
 #[derive(Debug, Clone)]
@@ -147,7 +143,11 @@ impl Analysis<Expr> for TypeSchemaAnalysis {
 
     fn make(egraph: &egg::EGraph<Expr, Self>, enode: &Expr) -> Self::Data {
         TypeSchema {
-            type_: type_::analyze_type(enode, |i| egraph[*i].data.type_.clone(), &egraph.analysis),
+            type_: type_::analyze_type(
+                enode,
+                |i| egraph[*i].data.type_.clone(),
+                &egraph.analysis.catalog,
+            ),
             schema: schema::analyze_schema(enode, |i| egraph[*i].data.schema.clone()),
             aggs: agg::analyze_aggs(enode, |i| egraph[*i].data.aggs.clone()),
         }

src/planner/rules/type_.rs

@@ -15,7 +15,7 @@ pub enum TypeError {
 }
 
 /// Returns data type of the expression.
-pub fn analyze_type(enode: &Expr, x: impl Fn(&Id) -> Type, data: &TypeSchemaAnalysis) -> Type {
+pub fn analyze_type(enode: &Expr, x: impl Fn(&Id) -> Type, catalog: &RootCatalogRef) -> Type {
     use Expr::*;
     let concat_struct = |t1: DataType, t2: DataType| match (t1.kind, t2.kind) {
         (Kind::Struct(l), Kind::Struct(r)) => {
@@ -27,8 +27,7 @@ pub fn analyze_type(enode: &Expr, x: impl Fn(&Id) -> Type, data: &TypeSchemaAnal
         // values
         Constant(v) => Ok(v.data_type()),
         Type(t) => Ok(t.clone().not_null()),
-        Column(col) => Ok(data
-            .catalog
+        Column(col) => Ok(catalog
             .get_column(col)
             .ok_or_else(|| TypeError::Unavailable(enode.to_string()))?
             .datatype()),