Merge branch 'main' into bump

src/query/catalog/src/table.rs

@@ -29,7 +29,6 @@ use common_legacy_planners::Extras;
 use common_legacy_planners::Partitions;
 use common_legacy_planners::ReadDataSourcePlan;
 use common_legacy_planners::Statistics;
-use common_legacy_planners::TruncateTablePlan;
 use common_meta_app::schema::TableInfo;
 use common_meta_types::MetaId;
 use common_pipeline_core::Pipeline;
@@ -166,7 +165,8 @@ pub trait Table: Sync + Send {
     async fn truncate(
         &self,
         _ctx: Arc<dyn TableContext>,
-        _truncate_plan: TruncateTablePlan,
+        _catalog_name: &str,
+        _purge: bool,
     ) -> Result<()> {
         Err(ErrorCode::UnImplement(format!(
             "truncate for table {} is not implemented",

src/query/functions/src/scalars/logics/and.rs

@@ -79,7 +79,7 @@ impl Function for LogicAndFiltersFunction {
         input_rows: usize,
     ) -> Result<ColumnRef> {
         if columns.len() == 1 {
-            return Ok(columns[1].column().clone());
+            return Ok(columns[0].column().clone());
         }
 
         let mut validity = None;

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

@@ -15,13 +15,6 @@
 mod plan_aggregator_final;
 mod plan_aggregator_partial;
 mod plan_broadcast;
-mod plan_call;
-mod plan_copy;
-mod plan_database_create;
-mod plan_database_drop;
-mod plan_database_rename;
-mod plan_database_show_create;
-mod plan_database_undrop;
 mod plan_delete;
 mod plan_empty;
 mod plan_explain;
@@ -40,10 +33,8 @@ mod plan_expression_visitor;
 mod plan_filter;
 mod plan_having;
 mod plan_insert_into;
-mod plan_kill;
 mod plan_limit;
 mod plan_limit_by;
-mod plan_list;
 mod plan_node;
 mod plan_node_builder;
 mod plan_node_display;
@@ -55,72 +46,20 @@ mod plan_node_stage_table;
 mod plan_node_statistics;
 mod plan_node_visitor;
 mod plan_partition;
-mod plan_privilege_grant;
-mod plan_privilege_revoke;
 mod plan_projection;
 mod plan_read_datasource;
 mod plan_remote;
-mod plan_role_create;
-mod plan_role_drop;
-mod plan_role_grant;
-mod plan_role_revoke;
 mod plan_select;
 mod plan_setting;
-mod plan_show;
-mod plan_show_databases;
-mod plan_show_engines;
-mod plan_show_functions;
-mod plan_show_grants;
-mod plan_show_metrics;
-mod plan_show_processlist;
-mod plan_show_roles;
-mod plan_show_settings;
-mod plan_show_tables;
-mod plan_show_tables_status;
-mod plan_show_users;
 mod plan_sink;
 mod plan_sort;
 mod plan_subqueries_set;
-mod plan_table_alter_cluster_key;
-mod plan_table_describe;
-mod plan_table_drop;
-mod plan_table_drop_cluster_key;
-mod plan_table_exists;
-mod plan_table_optimize;
 mod plan_table_recluster;
-mod plan_table_rename;
-mod plan_table_show_create;
-mod plan_table_truncate;
-mod plan_table_undrop;
-mod plan_use_database;
-mod plan_user_alter;
-mod plan_user_create;
-mod plan_user_drop;
-mod plan_user_stage_create;
-mod plan_user_stage_describe;
-mod plan_user_stage_drop;
-mod plan_user_stage_remove;
-mod plan_user_udf_alter;
-mod plan_user_udf_create;
-mod plan_user_udf_drop;
-mod plan_view_alter;
-mod plan_view_create;
-mod plan_view_drop;
 mod plan_window_func;
 
 pub use plan_aggregator_final::AggregatorFinalPlan;
 pub use plan_aggregator_partial::AggregatorPartialPlan;
 pub use plan_broadcast::BroadcastPlan;
-pub use plan_call::CallPlan;
-pub use plan_copy::CopyMode;
-pub use plan_copy::CopyPlan;
-pub use plan_copy::ValidationMode;
-pub use plan_database_create::CreateDatabasePlan;
-pub use plan_database_drop::DropDatabasePlan;
-pub use plan_database_rename::RenameDatabaseEntity;
-pub use plan_database_rename::RenameDatabasePlan;
-pub use plan_database_show_create::ShowCreateDatabasePlan;
-pub use plan_database_undrop::UndropDatabasePlan;
 pub use plan_delete::DeletePlan;
 pub use plan_empty::EmptyPlan;
 pub use plan_explain::ExplainPlan;
@@ -169,10 +108,8 @@ pub use plan_having::HavingPlan;
 pub use plan_insert_into::InsertInputSource;
 pub use plan_insert_into::InsertPlan;
 pub use plan_insert_into::InsertValueBlock;
-pub use plan_kill::KillPlan;
 pub use plan_limit::LimitPlan;
 pub use plan_limit_by::LimitByPlan;
-pub use plan_list::ListPlan;
 pub use plan_node::PlanNode;
 pub use plan_node_builder::PlanBuilder;
 pub use plan_node_extras::Extras;
@@ -188,63 +125,18 @@ pub use plan_node_visitor::PlanVisitor;
 pub use plan_partition::PartInfo;
 pub use plan_partition::PartInfoPtr;
 pub use plan_partition::Partitions;
-pub use plan_privilege_grant::GrantPrivilegePlan;
-pub use plan_privilege_revoke::RevokePrivilegePlan;
 pub use plan_projection::ProjectionPlan;
 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_role_create::CreateRolePlan;
-pub use plan_role_drop::DropRolePlan;
-pub use plan_role_grant::GrantRolePlan;
-pub use plan_role_revoke::RevokeRolePlan;
 pub use plan_select::SelectPlan;
 pub use plan_setting::SettingPlan;
 pub use plan_setting::VarValue;
-pub use plan_show::PlanShowKind;
-pub use plan_show::ShowPlan;
-pub use plan_show_databases::ShowDatabasesPlan;
-pub use plan_show_engines::ShowEnginesPlan;
-pub use plan_show_functions::ShowFunctionsPlan;
-pub use plan_show_grants::ShowGrantsPlan;
-pub use plan_show_metrics::ShowMetricsPlan;
-pub use plan_show_processlist::ShowProcessListsPlan;
-pub use plan_show_roles::ShowRolesPlan;
-pub use plan_show_settings::ShowSettingsPlan;
-pub use plan_show_tables::ShowTablesPlan;
-pub use plan_show_tables_status::ShowTablesStatusPlan;
-pub use plan_show_users::ShowUsersPlan;
 pub use plan_sink::SinkPlan;
 pub use plan_sink::SINK_SCHEMA;
 pub use plan_sort::SortPlan;
 pub use plan_subqueries_set::SubQueriesSetPlan;
-pub use plan_table_alter_cluster_key::AlterTableClusterKeyPlan;
-pub use plan_table_describe::DescribeTablePlan;
-pub use plan_table_drop::DropTablePlan;
-pub use plan_table_drop_cluster_key::DropTableClusterKeyPlan;
-pub use plan_table_exists::ExistsTablePlan;
-pub use plan_table_optimize::OptimizeTableAction;
-pub use plan_table_optimize::OptimizeTablePlan;
 pub use plan_table_recluster::ReclusterTablePlan;
-pub use plan_table_rename::RenameTableEntity;
-pub use plan_table_rename::RenameTablePlan;
-pub use plan_table_show_create::ShowCreateTablePlan;
-pub use plan_table_truncate::TruncateTablePlan;
-pub use plan_table_undrop::UndropTablePlan;
-pub use plan_use_database::UseDatabasePlan;
-pub use plan_user_alter::AlterUserPlan;
-pub use plan_user_create::CreateUserPlan;
-pub use plan_user_drop::DropUserPlan;
-pub use plan_user_stage_create::CreateUserStagePlan;
-pub use plan_user_stage_describe::DescribeUserStagePlan;
-pub use plan_user_stage_drop::DropUserStagePlan;
-pub use plan_user_stage_remove::RemoveUserStagePlan;
-pub use plan_user_udf_alter::AlterUserUDFPlan;
-pub use plan_user_udf_create::CreateUserUDFPlan;
-pub use plan_user_udf_drop::DropUserUDFPlan;
-pub use plan_view_alter::AlterViewPlan;
-pub use plan_view_create::CreateViewPlan;
-pub use plan_view_drop::DropViewPlan;
 pub use plan_window_func::WindowFuncPlan;