chore(expr): remove run_auto_type (databendlabs#11612)

ZhiHanZ · May 29, 2023 · 501c0c7 · 501c0c7
1 parent e38f7eb
commit 501c0c7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 43 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/query/expression/src/evaluator.rs b/src/query/expression/src/evaluator.rs
@@ -85,42 +85,6 @@ impl<'a> Evaluator<'a> {
         }
     }
 
-    /// TODO(sundy/andy): refactor this if we got better idea
-    pub fn run_auto_type(&self, expr: &Expr) -> Result<Value<AnyType>> {
-        let column_refs = expr.column_refs();
-
-        let mut columns = self.input_columns.columns().to_vec();
-        for (index, datatype) in column_refs.iter() {
-            let column = &columns[*index];
-            if datatype != &column.data_type {
-                let value = self.run(&Expr::Cast {
-                    span: None,
-                    is_try: false,
-                    expr: Box::new(Expr::ColumnRef {
-                        span: None,
-                        id: *index,
-                        data_type: column.data_type.clone(),
-                        display_name: String::new(),
-                    }),
-                    dest_type: datatype.clone(),
-                })?;
-
-                columns[*index] = BlockEntry {
-                    data_type: datatype.clone(),
-                    value,
-                };
-            }
-        }
-
-        let new_blocks = DataBlock::new_with_meta(
-            columns,
-            self.input_columns.num_rows(),
-            self.input_columns.get_meta().cloned(),
-        );
-        let new_evaluator = Evaluator::new(&new_blocks, self.func_ctx, self.fn_registry);
-        new_evaluator.run(expr)
-    }
-
     pub fn run(&self, expr: &Expr) -> Result<Value<AnyType>> {
         self.partial_run(expr, None)
     }

diff --git a/src/query/service/src/api/rpc/flight_scatter_hash.rs b/src/query/service/src/api/rpc/flight_scatter_hash.rs
@@ -120,7 +120,7 @@ impl FlightScatter for OneHashKeyFlightScatter {
         let evaluator = Evaluator::new(&data_block, &self.func_ctx, &BUILTIN_FUNCTIONS);
         let num = data_block.num_rows();
 
-        let indices = evaluator.run_auto_type(&self.indices_scalar).unwrap();
+        let indices = evaluator.run(&self.indices_scalar).unwrap();
         let indices = get_hash_values(&indices, num)?;
         let data_blocks = DataBlock::scatter(&data_block, &indices, self.scatter_size)?;
 
@@ -141,7 +141,7 @@ impl FlightScatter for HashFlightScatter {
         let indices = if !self.hash_key.is_empty() {
             let mut hash_keys = vec![];
             for expr in &self.hash_key {
-                let indices = evaluator.run_auto_type(expr).unwrap();
+                let indices = evaluator.run(expr).unwrap();
                 let indices = get_hash_values(&indices, num)?;
                 hash_keys.push(indices)
             }

diff --git a/src/query/service/src/pipelines/processors/transforms/hash_join/common.rs b/src/query/service/src/pipelines/processors/transforms/hash_join/common.rs
@@ -212,7 +212,7 @@ impl JoinHashTable {
         let func_ctx = self.ctx.get_function_context()?;
         let evaluator = Evaluator::new(merged_block, &func_ctx, &BUILTIN_FUNCTIONS);
         let predicates = evaluator
-            .run_auto_type(&filter)?
+            .run(&filter)?
             .try_downcast::<BooleanType>()
             .unwrap();
 
@@ -234,7 +234,7 @@ impl JoinHashTable {
         let func_ctx = self.ctx.get_function_context()?;
         let evaluator = Evaluator::new(merged_block, &func_ctx, &BUILTIN_FUNCTIONS);
 
-        let filter_vector: Value<AnyType> = evaluator.run_auto_type(filter)?;
+        let filter_vector: Value<AnyType> = evaluator.run(filter)?;
         let filter_vector =
             filter_vector.convert_to_full_column(filter.data_type(), merged_block.num_rows());