Merge branch 'main' into dev-refine-mod

Author: mergify[bot]

src/query/legacy-planners/src/lib.rs

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 mod plan_delete;
-mod plan_empty;
 mod plan_expression;
 mod plan_expression_action;
 mod plan_expression_chain;
@@ -22,7 +21,6 @@ mod plan_expression_common;
 mod plan_expression_function;
 mod plan_expression_literal;
 mod plan_expression_monotonicity;
-mod plan_expression_sort;
 mod plan_expression_validator;
 mod plan_expression_visitor;
 mod plan_node_extras;
@@ -31,33 +29,16 @@ mod plan_node_stage_table;
 mod plan_node_statistics;
 mod plan_partition;
 mod plan_read_datasource;
-mod plan_remote;
 mod plan_setting;
 mod plan_sink;
 mod plan_table_recluster;
 
 pub use plan_delete::DeletePlan;
-pub use plan_empty::EmptyPlan;
 pub use plan_expression::Expression;
 pub use plan_expression::Expressions;
 pub use plan_expression_action::*;
 pub use plan_expression_chain::ExpressionChain;
 pub use plan_expression_column::col;
-pub use plan_expression_common::expand_aggregate_arg_exprs;
-pub use plan_expression_common::expand_wildcard;
-pub use plan_expression_common::expr_as_column_expr;
-pub use plan_expression_common::extract_aliases;
-pub use plan_expression_common::find_aggregate_exprs;
-pub use plan_expression_common::find_aggregate_exprs_in_expr;
-pub use plan_expression_common::find_column_exprs;
-pub use plan_expression_common::find_columns_not_satisfy_exprs;
-pub use plan_expression_common::find_window_exprs;
-pub use plan_expression_common::find_window_exprs_in_expr;
-pub use plan_expression_common::rebase_expr;
-pub use plan_expression_common::rebase_expr_from_input;
-pub use plan_expression_common::resolve_aliases_to_exprs;
-pub use plan_expression_common::sort_to_inner_expr;
-pub use plan_expression_common::unwrap_alias_exprs;
 pub use plan_expression_common::RequireColumnsVisitor;
 pub use plan_expression_function::add;
 pub use plan_expression_function::avg;
@@ -69,8 +50,6 @@ pub use plan_expression_function::sum;
 pub use plan_expression_literal::lit;
 pub use plan_expression_literal::lit_null;
 pub use plan_expression_monotonicity::ExpressionMonotonicityVisitor;
-pub use plan_expression_sort::sort;
-pub use plan_expression_validator::validate_clustering;
 pub use plan_expression_validator::validate_expression;
 pub use plan_expression_validator::validate_function_arg;
 pub use plan_expression_visitor::ExpressionVisitor;
@@ -86,9 +65,6 @@ pub use plan_partition::PartInfoPtr;
 pub use plan_partition::Partitions;
 pub use plan_read_datasource::ReadDataSourcePlan;
 pub use plan_read_datasource::SourceInfo;
-pub use plan_remote::RemotePlan;
-pub use plan_remote::V1RemotePlan;
-pub use plan_remote::V2RemotePlan;
 pub use plan_setting::SettingPlan;
 pub use plan_setting::VarValue;
 pub use plan_sink::SINK_SCHEMA;

src/query/legacy-planners/src/plan_empty.rs

@@ -20,7 +20,6 @@ use common_exception::ErrorCode;
 use common_exception::Result;
 use common_functions::aggregates::AggregateFunctionFactory;
 use common_functions::aggregates::AggregateFunctionRef;
-use common_functions::window::WindowFrame;
 use once_cell::sync::Lazy;
 
 use crate::plan_expression_common::ExpressionDataTypeVisitor;
@@ -75,22 +74,6 @@ pub enum Expression {
         args: Vec<Expression>,
     },
 
-    /// WindowFunction
-    WindowFunction {
-        /// operation performed
-        op: String,
-        /// params
-        params: Vec<DataValue>,
-        /// arguments
-        args: Vec<Expression>,
-        /// partition by
-        partition_by: Vec<Expression>,
-        /// order by
-        order_by: Vec<Expression>,
-        /// window frame
-        window_frame: Option<WindowFrame>,
-    },
-
     /// A sort expression, that can be used to sort values.
     Sort {
         /// The expression to sort on
@@ -226,10 +209,6 @@ impl Expression {
             .map(|return_type| DataField::new(&name, return_type))
     }
 
-    pub fn nullable(&self, input_schema: &DataSchemaRef) -> Result<bool> {
-        Ok(self.to_data_type(input_schema)?.is_nullable())
-    }
-
     pub fn to_data_type(&self, input_schema: &DataSchemaRef) -> Result<DataTypeImpl> {
         let visitor = ExpressionDataTypeVisitor::create(input_schema.clone());
         visitor.visit(self)?.finalize()
@@ -348,53 +327,6 @@ impl fmt::Debug for Expression {
                 Ok(())
             }
 
-            Expression::WindowFunction {
-                op,
-                params,
-                args,
-                partition_by,
-                order_by,
-                window_frame,
-            } => {
-                let args_column_name = args.iter().map(Expression::column_name).collect::<Vec<_>>();
-                let params_name = params
-                    .iter()
-                    .map(|v| DataValue::custom_display(v, true))
-                    .collect::<Vec<_>>();
-
-                if params.is_empty() {
-                    write!(f, "{}", op)?;
-                } else {
-                    write!(f, "{}({})", op, params_name.join(", "))?;
-                }
-
-                write!(f, "({})", args_column_name.join(","))?;
-
-                write!(f, " OVER(")?;
-                if !partition_by.is_empty() {
-                    write!(f, "PARTITION BY {:?}", partition_by)?;
-                }
-                if !order_by.is_empty() {
-                    if !partition_by.is_empty() {
-                        write!(f, " ")?;
-                    }
-                    write!(f, "ORDER BY {:?}", order_by)?;
-                }
-                if let Some(window_frame) = window_frame {
-                    if !partition_by.is_empty() || !order_by.is_empty() {
-                        write!(f, " ")?;
-                    }
-                    write!(
-                        f,
-                        "{} BETWEEN {} AND {}",
-                        window_frame.units, window_frame.start_bound, window_frame.end_bound
-                    )?;
-                }
-                write!(f, ")")?;
-
-                Ok(())
-            }
-
             Expression::Sort { expr, .. } => write!(f, "{:?}", expr),
             Expression::Wildcard => write!(f, "*"),
             Expression::Cast {

src/query/legacy-planners/src/plan_expression.rs

@@ -179,8 +179,6 @@ impl ExpressionChain {
                 ));
             }
 
-            Expression::WindowFunction { .. } => {}
-
             Expression::Wildcard | Expression::Sort { .. } => {}
 
             Expression::Cast {