diff --git a/Cargo.lock b/Cargo.lock index a44537ff66d75..ab22fe406d097 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1089,10 +1089,10 @@ dependencies = [ "common-exception", "common-functions", "common-io", + "common-legacy-planners", "common-meta-app", "common-meta-types", "common-pipeline-core", - "common-planners", "common-settings", "common-users", "dyn-clone", @@ -1395,10 +1395,28 @@ dependencies = [ "common-datavalues", "common-exception", "common-functions", - "common-planners", + "common-legacy-planners", "sqlparser", ] +[[package]] +name = "common-legacy-planners" +version = "0.1.0" +dependencies = [ + "bitflags", + "common-datablocks", + "common-datavalues", + "common-exception", + "common-functions", + "common-meta-app", + "common-meta-types", + "once_cell", + "pretty_assertions", + "serde", + "serde_json", + "typetag", +] + [[package]] name = "common-macros" version = "0.1.0" @@ -1685,29 +1703,11 @@ dependencies = [ "common-datablocks", "common-datavalues", "common-exception", + "common-legacy-planners", "common-pipeline-core", - "common-planners", "tracing", ] -[[package]] -name = "common-planners" -version = "0.1.0" -dependencies = [ - "bitflags", - "common-datablocks", - "common-datavalues", - "common-exception", - "common-functions", - "common-meta-app", - "common-meta-types", - "once_cell", - "pretty_assertions", - "serde", - "serde_json", - "typetag", -] - [[package]] name = "common-proto-conv" version = "0.1.0" @@ -1787,12 +1787,12 @@ dependencies = [ "common-functions", "common-fuse-meta", "common-legacy-parser", + "common-legacy-planners", "common-meta-app", "common-meta-types", "common-pipeline-core", "common-pipeline-sources", "common-pipeline-transforms", - "common-planners", "common-storages-index", "common-storages-util", "common-streams", @@ -1820,11 +1820,11 @@ dependencies = [ "common-exception", "common-fuse-meta", "common-hive-meta-store", + "common-legacy-planners", "common-meta-app", "common-meta-types", "common-pipeline-core", "common-pipeline-sources", - "common-planners", "common-storages-index", "common-storages-util", "futures", @@ -1847,8 +1847,8 @@ dependencies = [ "common-exception", "common-functions", "common-fuse-meta", + "common-legacy-planners", "common-pipeline-transforms", - "common-planners", "rand 0.8.5", "serde", "tracing", @@ -1874,6 +1874,7 @@ dependencies = [ "common-exception", "common-functions", "common-grpc", + "common-legacy-planners", "common-meta-app", "common-meta-types", "common-metrics", @@ -1881,7 +1882,6 @@ dependencies = [ "common-pipeline-sinks", "common-pipeline-sources", "common-pipeline-transforms", - "common-planners", "common-storage", "common-storages-util", "common-streams", @@ -2510,6 +2510,7 @@ dependencies = [ "common-http", "common-io", "common-legacy-parser", + "common-legacy-planners", "common-management", "common-meta-api", "common-meta-app", @@ -2524,7 +2525,6 @@ dependencies = [ "common-pipeline-sinks", "common-pipeline-sources", "common-pipeline-transforms", - "common-planners", "common-settings", "common-storage", "common-storages-fuse", diff --git a/Cargo.toml b/Cargo.toml index 0c91073841b41..22e7b088c4f55 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ members = [ "src/query/pipeline/sinks", "src/query/pipeline/sources", "src/query/pipeline/transforms", - "src/query/planners", + "src/query/legacy-planners", "src/query/settings", "src/query/storages/fuse", "src/query/storages/fuse-meta", diff --git a/src/query/catalog/Cargo.toml b/src/query/catalog/Cargo.toml index a3c6560da6b31..68a9639f050ef 100644 --- a/src/query/catalog/Cargo.toml +++ b/src/query/catalog/Cargo.toml @@ -17,10 +17,10 @@ common-datavalues = { path = "../datavalues" } common-exception = { path = "../../common/exception" } common-functions = { path = "../functions" } common-io = { path = "../../common/io" } +common-legacy-planners = { path = "../legacy-planners" } common-meta-app = { path = "../../meta/app" } common-meta-types = { path = "../../meta/types" } common-pipeline-core = { path = "../pipeline/core" } -common-planners = { path = "../planners" } common-settings = { path = "../settings" } common-users = { path = "../users" } diff --git a/src/query/catalog/src/table.rs b/src/query/catalog/src/table.rs index 307f2535bb4d6..5a23c29aa9a7e 100644 --- a/src/query/catalog/src/table.rs +++ b/src/query/catalog/src/table.rs @@ -23,16 +23,16 @@ use common_datavalues::chrono; use common_datavalues::DataSchemaRef; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::DeletePlan; +use common_legacy_planners::Expression; +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; -use common_planners::DeletePlan; -use common_planners::Expression; -use common_planners::Extras; -use common_planners::Partitions; -use common_planners::ReadDataSourcePlan; -use common_planners::Statistics; -use common_planners::TruncateTablePlan; use crate::table_context::TableContext; use crate::table_mutator::TableMutator; diff --git a/src/query/catalog/src/table_args.rs b/src/query/catalog/src/table_args.rs index 52c440ec1a3ee..cfad47e385df0 100644 --- a/src/query/catalog/src/table_args.rs +++ b/src/query/catalog/src/table_args.rs @@ -12,6 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -use common_planners::Expression; +use common_legacy_planners::Expression; pub type TableArgs = Option>; diff --git a/src/query/catalog/src/table_context.rs b/src/query/catalog/src/table_context.rs index 8aa788c6ce72a..9b772430d69a8 100644 --- a/src/query/catalog/src/table_context.rs +++ b/src/query/catalog/src/table_context.rs @@ -25,11 +25,11 @@ use common_exception::ErrorCode; use common_exception::Result; use common_functions::scalars::FunctionContext; use common_io::prelude::FormatSettings; +use common_legacy_planners::Partitions; +use common_legacy_planners::PlanNode; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::Statistics; use common_meta_types::UserInfo; -use common_planners::Partitions; -use common_planners::PlanNode; -use common_planners::ReadDataSourcePlan; -use common_planners::Statistics; use common_settings::Settings; use common_users::UserApiProvider; use opendal::Operator; diff --git a/src/query/legacy-parser/Cargo.toml b/src/query/legacy-parser/Cargo.toml index 0f7f29f7e8706..12c55a764f77b 100644 --- a/src/query/legacy-parser/Cargo.toml +++ b/src/query/legacy-parser/Cargo.toml @@ -12,7 +12,7 @@ test = false common-datavalues = { path = "../datavalues" } common-exception = { path = "../../common/exception" } common-functions = { path = "../functions" } -common-planners = { path = "../planners" } +common-legacy-planners = { path = "../legacy-planners" } async-trait = "0.1.56" sqlparser = { git = "https://github.com/datafuse-extras/sqlparser-rs", rev = "7f246e3" } diff --git a/src/query/legacy-parser/src/analyzer/analyzer_expr_sync.rs b/src/query/legacy-parser/src/analyzer/analyzer_expr_sync.rs index 808914be27f67..cb6f69c041379 100644 --- a/src/query/legacy-parser/src/analyzer/analyzer_expr_sync.rs +++ b/src/query/legacy-parser/src/analyzer/analyzer_expr_sync.rs @@ -18,7 +18,7 @@ use common_datavalues::type_coercion::merge_types; use common_exception::ErrorCode; use common_exception::Result; use common_functions::aggregates::AggregateFunctionFactory; -use common_planners::Expression; +use common_legacy_planners::Expression; use sqlparser::ast::BinaryOperator; use sqlparser::ast::DataType as AstDataType; use sqlparser::ast::DateTimeField; diff --git a/src/query/legacy-parser/src/analyzer/analyzer_value_expr.rs b/src/query/legacy-parser/src/analyzer/analyzer_value_expr.rs index fbfd3159cb42f..f4e9cd6a59451 100644 --- a/src/query/legacy-parser/src/analyzer/analyzer_value_expr.rs +++ b/src/query/legacy-parser/src/analyzer/analyzer_value_expr.rs @@ -15,7 +15,7 @@ use common_datavalues::prelude::*; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::Expression; +use common_legacy_planners::Expression; use sqlparser::ast::DateTimeField; use sqlparser::ast::Value; diff --git a/src/query/legacy-parser/src/parser/expression_parser.rs b/src/query/legacy-parser/src/parser/expression_parser.rs index 3666b23007544..4af377095a4b8 100644 --- a/src/query/legacy-parser/src/parser/expression_parser.rs +++ b/src/query/legacy-parser/src/parser/expression_parser.rs @@ -13,7 +13,7 @@ // limitations under the License. use common_exception::Result; -use common_planners::Expression; +use common_legacy_planners::Expression; use crate::analyzer_expr_sync::ExpressionSyncAnalyzer; use crate::ExprParser; diff --git a/src/query/planners/Cargo.toml b/src/query/legacy-planners/Cargo.toml similarity index 96% rename from src/query/planners/Cargo.toml rename to src/query/legacy-planners/Cargo.toml index a9d266d1845f2..5f71eecaf229b 100644 --- a/src/query/planners/Cargo.toml +++ b/src/query/legacy-planners/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "common-planners" +name = "common-legacy-planners" version = "0.1.0" authors = ["Databend Authors "] license = "Apache-2.0" diff --git a/src/query/planners/src/lib.rs b/src/query/legacy-planners/src/lib.rs similarity index 100% rename from src/query/planners/src/lib.rs rename to src/query/legacy-planners/src/lib.rs diff --git a/src/query/planners/src/plan_aggregator_final.rs b/src/query/legacy-planners/src/plan_aggregator_final.rs similarity index 100% rename from src/query/planners/src/plan_aggregator_final.rs rename to src/query/legacy-planners/src/plan_aggregator_final.rs diff --git a/src/query/planners/src/plan_aggregator_partial.rs b/src/query/legacy-planners/src/plan_aggregator_partial.rs similarity index 100% rename from src/query/planners/src/plan_aggregator_partial.rs rename to src/query/legacy-planners/src/plan_aggregator_partial.rs diff --git a/src/query/planners/src/plan_broadcast.rs b/src/query/legacy-planners/src/plan_broadcast.rs similarity index 100% rename from src/query/planners/src/plan_broadcast.rs rename to src/query/legacy-planners/src/plan_broadcast.rs diff --git a/src/query/planners/src/plan_call.rs b/src/query/legacy-planners/src/plan_call.rs similarity index 100% rename from src/query/planners/src/plan_call.rs rename to src/query/legacy-planners/src/plan_call.rs diff --git a/src/query/planners/src/plan_copy.rs b/src/query/legacy-planners/src/plan_copy.rs similarity index 100% rename from src/query/planners/src/plan_copy.rs rename to src/query/legacy-planners/src/plan_copy.rs diff --git a/src/query/planners/src/plan_database_create.rs b/src/query/legacy-planners/src/plan_database_create.rs similarity index 100% rename from src/query/planners/src/plan_database_create.rs rename to src/query/legacy-planners/src/plan_database_create.rs diff --git a/src/query/planners/src/plan_database_drop.rs b/src/query/legacy-planners/src/plan_database_drop.rs similarity index 100% rename from src/query/planners/src/plan_database_drop.rs rename to src/query/legacy-planners/src/plan_database_drop.rs diff --git a/src/query/planners/src/plan_database_rename.rs b/src/query/legacy-planners/src/plan_database_rename.rs similarity index 100% rename from src/query/planners/src/plan_database_rename.rs rename to src/query/legacy-planners/src/plan_database_rename.rs diff --git a/src/query/planners/src/plan_database_show_create.rs b/src/query/legacy-planners/src/plan_database_show_create.rs similarity index 100% rename from src/query/planners/src/plan_database_show_create.rs rename to src/query/legacy-planners/src/plan_database_show_create.rs diff --git a/src/query/planners/src/plan_database_undrop.rs b/src/query/legacy-planners/src/plan_database_undrop.rs similarity index 100% rename from src/query/planners/src/plan_database_undrop.rs rename to src/query/legacy-planners/src/plan_database_undrop.rs diff --git a/src/query/planners/src/plan_delete.rs b/src/query/legacy-planners/src/plan_delete.rs similarity index 100% rename from src/query/planners/src/plan_delete.rs rename to src/query/legacy-planners/src/plan_delete.rs diff --git a/src/query/planners/src/plan_empty.rs b/src/query/legacy-planners/src/plan_empty.rs similarity index 100% rename from src/query/planners/src/plan_empty.rs rename to src/query/legacy-planners/src/plan_empty.rs diff --git a/src/query/planners/src/plan_explain.rs b/src/query/legacy-planners/src/plan_explain.rs similarity index 100% rename from src/query/planners/src/plan_explain.rs rename to src/query/legacy-planners/src/plan_explain.rs diff --git a/src/query/planners/src/plan_expression.rs b/src/query/legacy-planners/src/plan_expression.rs similarity index 100% rename from src/query/planners/src/plan_expression.rs rename to src/query/legacy-planners/src/plan_expression.rs diff --git a/src/query/planners/src/plan_expression_action.rs b/src/query/legacy-planners/src/plan_expression_action.rs similarity index 100% rename from src/query/planners/src/plan_expression_action.rs rename to src/query/legacy-planners/src/plan_expression_action.rs diff --git a/src/query/planners/src/plan_expression_chain.rs b/src/query/legacy-planners/src/plan_expression_chain.rs similarity index 100% rename from src/query/planners/src/plan_expression_chain.rs rename to src/query/legacy-planners/src/plan_expression_chain.rs diff --git a/src/query/planners/src/plan_expression_column.rs b/src/query/legacy-planners/src/plan_expression_column.rs similarity index 100% rename from src/query/planners/src/plan_expression_column.rs rename to src/query/legacy-planners/src/plan_expression_column.rs diff --git a/src/query/planners/src/plan_expression_common.rs b/src/query/legacy-planners/src/plan_expression_common.rs similarity index 100% rename from src/query/planners/src/plan_expression_common.rs rename to src/query/legacy-planners/src/plan_expression_common.rs diff --git a/src/query/planners/src/plan_expression_function.rs b/src/query/legacy-planners/src/plan_expression_function.rs similarity index 100% rename from src/query/planners/src/plan_expression_function.rs rename to src/query/legacy-planners/src/plan_expression_function.rs diff --git a/src/query/planners/src/plan_expression_literal.rs b/src/query/legacy-planners/src/plan_expression_literal.rs similarity index 100% rename from src/query/planners/src/plan_expression_literal.rs rename to src/query/legacy-planners/src/plan_expression_literal.rs diff --git a/src/query/planners/src/plan_expression_monotonicity.rs b/src/query/legacy-planners/src/plan_expression_monotonicity.rs similarity index 100% rename from src/query/planners/src/plan_expression_monotonicity.rs rename to src/query/legacy-planners/src/plan_expression_monotonicity.rs diff --git a/src/query/planners/src/plan_expression_rewriter.rs b/src/query/legacy-planners/src/plan_expression_rewriter.rs similarity index 100% rename from src/query/planners/src/plan_expression_rewriter.rs rename to src/query/legacy-planners/src/plan_expression_rewriter.rs diff --git a/src/query/planners/src/plan_expression_sort.rs b/src/query/legacy-planners/src/plan_expression_sort.rs similarity index 100% rename from src/query/planners/src/plan_expression_sort.rs rename to src/query/legacy-planners/src/plan_expression_sort.rs diff --git a/src/query/planners/src/plan_expression_validator.rs b/src/query/legacy-planners/src/plan_expression_validator.rs similarity index 100% rename from src/query/planners/src/plan_expression_validator.rs rename to src/query/legacy-planners/src/plan_expression_validator.rs diff --git a/src/query/planners/src/plan_expression_visitor.rs b/src/query/legacy-planners/src/plan_expression_visitor.rs similarity index 100% rename from src/query/planners/src/plan_expression_visitor.rs rename to src/query/legacy-planners/src/plan_expression_visitor.rs diff --git a/src/query/planners/src/plan_filter.rs b/src/query/legacy-planners/src/plan_filter.rs similarity index 100% rename from src/query/planners/src/plan_filter.rs rename to src/query/legacy-planners/src/plan_filter.rs diff --git a/src/query/planners/src/plan_having.rs b/src/query/legacy-planners/src/plan_having.rs similarity index 100% rename from src/query/planners/src/plan_having.rs rename to src/query/legacy-planners/src/plan_having.rs diff --git a/src/query/planners/src/plan_insert_into.rs b/src/query/legacy-planners/src/plan_insert_into.rs similarity index 100% rename from src/query/planners/src/plan_insert_into.rs rename to src/query/legacy-planners/src/plan_insert_into.rs diff --git a/src/query/planners/src/plan_kill.rs b/src/query/legacy-planners/src/plan_kill.rs similarity index 100% rename from src/query/planners/src/plan_kill.rs rename to src/query/legacy-planners/src/plan_kill.rs diff --git a/src/query/planners/src/plan_limit.rs b/src/query/legacy-planners/src/plan_limit.rs similarity index 100% rename from src/query/planners/src/plan_limit.rs rename to src/query/legacy-planners/src/plan_limit.rs diff --git a/src/query/planners/src/plan_limit_by.rs b/src/query/legacy-planners/src/plan_limit_by.rs similarity index 100% rename from src/query/planners/src/plan_limit_by.rs rename to src/query/legacy-planners/src/plan_limit_by.rs diff --git a/src/query/planners/src/plan_list.rs b/src/query/legacy-planners/src/plan_list.rs similarity index 100% rename from src/query/planners/src/plan_list.rs rename to src/query/legacy-planners/src/plan_list.rs diff --git a/src/query/planners/src/plan_node.rs b/src/query/legacy-planners/src/plan_node.rs similarity index 100% rename from src/query/planners/src/plan_node.rs rename to src/query/legacy-planners/src/plan_node.rs diff --git a/src/query/planners/src/plan_node_builder.rs b/src/query/legacy-planners/src/plan_node_builder.rs similarity index 100% rename from src/query/planners/src/plan_node_builder.rs rename to src/query/legacy-planners/src/plan_node_builder.rs diff --git a/src/query/planners/src/plan_node_display.rs b/src/query/legacy-planners/src/plan_node_display.rs similarity index 100% rename from src/query/planners/src/plan_node_display.rs rename to src/query/legacy-planners/src/plan_node_display.rs diff --git a/src/query/planners/src/plan_node_display_indent.rs b/src/query/legacy-planners/src/plan_node_display_indent.rs similarity index 100% rename from src/query/planners/src/plan_node_display_indent.rs rename to src/query/legacy-planners/src/plan_node_display_indent.rs diff --git a/src/query/planners/src/plan_node_extras.rs b/src/query/legacy-planners/src/plan_node_extras.rs similarity index 100% rename from src/query/planners/src/plan_node_extras.rs rename to src/query/legacy-planners/src/plan_node_extras.rs diff --git a/src/query/planners/src/plan_node_rewriter.rs b/src/query/legacy-planners/src/plan_node_rewriter.rs similarity index 100% rename from src/query/planners/src/plan_node_rewriter.rs rename to src/query/legacy-planners/src/plan_node_rewriter.rs diff --git a/src/query/planners/src/plan_node_stage.rs b/src/query/legacy-planners/src/plan_node_stage.rs similarity index 100% rename from src/query/planners/src/plan_node_stage.rs rename to src/query/legacy-planners/src/plan_node_stage.rs diff --git a/src/query/planners/src/plan_node_stage_table.rs b/src/query/legacy-planners/src/plan_node_stage_table.rs similarity index 100% rename from src/query/planners/src/plan_node_stage_table.rs rename to src/query/legacy-planners/src/plan_node_stage_table.rs diff --git a/src/query/planners/src/plan_node_statistics.rs b/src/query/legacy-planners/src/plan_node_statistics.rs similarity index 100% rename from src/query/planners/src/plan_node_statistics.rs rename to src/query/legacy-planners/src/plan_node_statistics.rs diff --git a/src/query/planners/src/plan_node_visitor.rs b/src/query/legacy-planners/src/plan_node_visitor.rs similarity index 100% rename from src/query/planners/src/plan_node_visitor.rs rename to src/query/legacy-planners/src/plan_node_visitor.rs diff --git a/src/query/planners/src/plan_partition.rs b/src/query/legacy-planners/src/plan_partition.rs similarity index 100% rename from src/query/planners/src/plan_partition.rs rename to src/query/legacy-planners/src/plan_partition.rs diff --git a/src/query/planners/src/plan_privilege_grant.rs b/src/query/legacy-planners/src/plan_privilege_grant.rs similarity index 100% rename from src/query/planners/src/plan_privilege_grant.rs rename to src/query/legacy-planners/src/plan_privilege_grant.rs diff --git a/src/query/planners/src/plan_privilege_revoke.rs b/src/query/legacy-planners/src/plan_privilege_revoke.rs similarity index 100% rename from src/query/planners/src/plan_privilege_revoke.rs rename to src/query/legacy-planners/src/plan_privilege_revoke.rs diff --git a/src/query/planners/src/plan_projection.rs b/src/query/legacy-planners/src/plan_projection.rs similarity index 100% rename from src/query/planners/src/plan_projection.rs rename to src/query/legacy-planners/src/plan_projection.rs diff --git a/src/query/planners/src/plan_read_datasource.rs b/src/query/legacy-planners/src/plan_read_datasource.rs similarity index 100% rename from src/query/planners/src/plan_read_datasource.rs rename to src/query/legacy-planners/src/plan_read_datasource.rs diff --git a/src/query/planners/src/plan_remote.rs b/src/query/legacy-planners/src/plan_remote.rs similarity index 100% rename from src/query/planners/src/plan_remote.rs rename to src/query/legacy-planners/src/plan_remote.rs diff --git a/src/query/planners/src/plan_role_create.rs b/src/query/legacy-planners/src/plan_role_create.rs similarity index 100% rename from src/query/planners/src/plan_role_create.rs rename to src/query/legacy-planners/src/plan_role_create.rs diff --git a/src/query/planners/src/plan_role_drop.rs b/src/query/legacy-planners/src/plan_role_drop.rs similarity index 100% rename from src/query/planners/src/plan_role_drop.rs rename to src/query/legacy-planners/src/plan_role_drop.rs diff --git a/src/query/planners/src/plan_role_grant.rs b/src/query/legacy-planners/src/plan_role_grant.rs similarity index 100% rename from src/query/planners/src/plan_role_grant.rs rename to src/query/legacy-planners/src/plan_role_grant.rs diff --git a/src/query/planners/src/plan_role_revoke.rs b/src/query/legacy-planners/src/plan_role_revoke.rs similarity index 100% rename from src/query/planners/src/plan_role_revoke.rs rename to src/query/legacy-planners/src/plan_role_revoke.rs diff --git a/src/query/planners/src/plan_select.rs b/src/query/legacy-planners/src/plan_select.rs similarity index 100% rename from src/query/planners/src/plan_select.rs rename to src/query/legacy-planners/src/plan_select.rs diff --git a/src/query/planners/src/plan_setting.rs b/src/query/legacy-planners/src/plan_setting.rs similarity index 100% rename from src/query/planners/src/plan_setting.rs rename to src/query/legacy-planners/src/plan_setting.rs diff --git a/src/query/planners/src/plan_show.rs b/src/query/legacy-planners/src/plan_show.rs similarity index 100% rename from src/query/planners/src/plan_show.rs rename to src/query/legacy-planners/src/plan_show.rs diff --git a/src/query/planners/src/plan_show_databases.rs b/src/query/legacy-planners/src/plan_show_databases.rs similarity index 100% rename from src/query/planners/src/plan_show_databases.rs rename to src/query/legacy-planners/src/plan_show_databases.rs diff --git a/src/query/planners/src/plan_show_engines.rs b/src/query/legacy-planners/src/plan_show_engines.rs similarity index 100% rename from src/query/planners/src/plan_show_engines.rs rename to src/query/legacy-planners/src/plan_show_engines.rs diff --git a/src/query/planners/src/plan_show_functions.rs b/src/query/legacy-planners/src/plan_show_functions.rs similarity index 100% rename from src/query/planners/src/plan_show_functions.rs rename to src/query/legacy-planners/src/plan_show_functions.rs diff --git a/src/query/planners/src/plan_show_grants.rs b/src/query/legacy-planners/src/plan_show_grants.rs similarity index 100% rename from src/query/planners/src/plan_show_grants.rs rename to src/query/legacy-planners/src/plan_show_grants.rs diff --git a/src/query/planners/src/plan_show_metrics.rs b/src/query/legacy-planners/src/plan_show_metrics.rs similarity index 100% rename from src/query/planners/src/plan_show_metrics.rs rename to src/query/legacy-planners/src/plan_show_metrics.rs diff --git a/src/query/planners/src/plan_show_processlist.rs b/src/query/legacy-planners/src/plan_show_processlist.rs similarity index 100% rename from src/query/planners/src/plan_show_processlist.rs rename to src/query/legacy-planners/src/plan_show_processlist.rs diff --git a/src/query/planners/src/plan_show_roles.rs b/src/query/legacy-planners/src/plan_show_roles.rs similarity index 100% rename from src/query/planners/src/plan_show_roles.rs rename to src/query/legacy-planners/src/plan_show_roles.rs diff --git a/src/query/planners/src/plan_show_settings.rs b/src/query/legacy-planners/src/plan_show_settings.rs similarity index 100% rename from src/query/planners/src/plan_show_settings.rs rename to src/query/legacy-planners/src/plan_show_settings.rs diff --git a/src/query/planners/src/plan_show_tables.rs b/src/query/legacy-planners/src/plan_show_tables.rs similarity index 100% rename from src/query/planners/src/plan_show_tables.rs rename to src/query/legacy-planners/src/plan_show_tables.rs diff --git a/src/query/planners/src/plan_show_tables_status.rs b/src/query/legacy-planners/src/plan_show_tables_status.rs similarity index 100% rename from src/query/planners/src/plan_show_tables_status.rs rename to src/query/legacy-planners/src/plan_show_tables_status.rs diff --git a/src/query/planners/src/plan_show_users.rs b/src/query/legacy-planners/src/plan_show_users.rs similarity index 100% rename from src/query/planners/src/plan_show_users.rs rename to src/query/legacy-planners/src/plan_show_users.rs diff --git a/src/query/planners/src/plan_sink.rs b/src/query/legacy-planners/src/plan_sink.rs similarity index 100% rename from src/query/planners/src/plan_sink.rs rename to src/query/legacy-planners/src/plan_sink.rs diff --git a/src/query/planners/src/plan_sort.rs b/src/query/legacy-planners/src/plan_sort.rs similarity index 100% rename from src/query/planners/src/plan_sort.rs rename to src/query/legacy-planners/src/plan_sort.rs diff --git a/src/query/planners/src/plan_subqueries_set.rs b/src/query/legacy-planners/src/plan_subqueries_set.rs similarity index 100% rename from src/query/planners/src/plan_subqueries_set.rs rename to src/query/legacy-planners/src/plan_subqueries_set.rs diff --git a/src/query/planners/src/plan_table_alter_cluster_key.rs b/src/query/legacy-planners/src/plan_table_alter_cluster_key.rs similarity index 100% rename from src/query/planners/src/plan_table_alter_cluster_key.rs rename to src/query/legacy-planners/src/plan_table_alter_cluster_key.rs diff --git a/src/query/planners/src/plan_table_describe.rs b/src/query/legacy-planners/src/plan_table_describe.rs similarity index 100% rename from src/query/planners/src/plan_table_describe.rs rename to src/query/legacy-planners/src/plan_table_describe.rs diff --git a/src/query/planners/src/plan_table_drop.rs b/src/query/legacy-planners/src/plan_table_drop.rs similarity index 100% rename from src/query/planners/src/plan_table_drop.rs rename to src/query/legacy-planners/src/plan_table_drop.rs diff --git a/src/query/planners/src/plan_table_drop_cluster_key.rs b/src/query/legacy-planners/src/plan_table_drop_cluster_key.rs similarity index 100% rename from src/query/planners/src/plan_table_drop_cluster_key.rs rename to src/query/legacy-planners/src/plan_table_drop_cluster_key.rs diff --git a/src/query/planners/src/plan_table_exists.rs b/src/query/legacy-planners/src/plan_table_exists.rs similarity index 100% rename from src/query/planners/src/plan_table_exists.rs rename to src/query/legacy-planners/src/plan_table_exists.rs diff --git a/src/query/planners/src/plan_table_optimize.rs b/src/query/legacy-planners/src/plan_table_optimize.rs similarity index 100% rename from src/query/planners/src/plan_table_optimize.rs rename to src/query/legacy-planners/src/plan_table_optimize.rs diff --git a/src/query/planners/src/plan_table_recluster.rs b/src/query/legacy-planners/src/plan_table_recluster.rs similarity index 100% rename from src/query/planners/src/plan_table_recluster.rs rename to src/query/legacy-planners/src/plan_table_recluster.rs diff --git a/src/query/planners/src/plan_table_rename.rs b/src/query/legacy-planners/src/plan_table_rename.rs similarity index 100% rename from src/query/planners/src/plan_table_rename.rs rename to src/query/legacy-planners/src/plan_table_rename.rs diff --git a/src/query/planners/src/plan_table_show_create.rs b/src/query/legacy-planners/src/plan_table_show_create.rs similarity index 100% rename from src/query/planners/src/plan_table_show_create.rs rename to src/query/legacy-planners/src/plan_table_show_create.rs diff --git a/src/query/planners/src/plan_table_truncate.rs b/src/query/legacy-planners/src/plan_table_truncate.rs similarity index 100% rename from src/query/planners/src/plan_table_truncate.rs rename to src/query/legacy-planners/src/plan_table_truncate.rs diff --git a/src/query/planners/src/plan_table_undrop.rs b/src/query/legacy-planners/src/plan_table_undrop.rs similarity index 100% rename from src/query/planners/src/plan_table_undrop.rs rename to src/query/legacy-planners/src/plan_table_undrop.rs diff --git a/src/query/planners/src/plan_use_database.rs b/src/query/legacy-planners/src/plan_use_database.rs similarity index 100% rename from src/query/planners/src/plan_use_database.rs rename to src/query/legacy-planners/src/plan_use_database.rs diff --git a/src/query/planners/src/plan_user_alter.rs b/src/query/legacy-planners/src/plan_user_alter.rs similarity index 100% rename from src/query/planners/src/plan_user_alter.rs rename to src/query/legacy-planners/src/plan_user_alter.rs diff --git a/src/query/planners/src/plan_user_create.rs b/src/query/legacy-planners/src/plan_user_create.rs similarity index 100% rename from src/query/planners/src/plan_user_create.rs rename to src/query/legacy-planners/src/plan_user_create.rs diff --git a/src/query/planners/src/plan_user_drop.rs b/src/query/legacy-planners/src/plan_user_drop.rs similarity index 100% rename from src/query/planners/src/plan_user_drop.rs rename to src/query/legacy-planners/src/plan_user_drop.rs diff --git a/src/query/planners/src/plan_user_stage_create.rs b/src/query/legacy-planners/src/plan_user_stage_create.rs similarity index 100% rename from src/query/planners/src/plan_user_stage_create.rs rename to src/query/legacy-planners/src/plan_user_stage_create.rs diff --git a/src/query/planners/src/plan_user_stage_describe.rs b/src/query/legacy-planners/src/plan_user_stage_describe.rs similarity index 100% rename from src/query/planners/src/plan_user_stage_describe.rs rename to src/query/legacy-planners/src/plan_user_stage_describe.rs diff --git a/src/query/planners/src/plan_user_stage_drop.rs b/src/query/legacy-planners/src/plan_user_stage_drop.rs similarity index 100% rename from src/query/planners/src/plan_user_stage_drop.rs rename to src/query/legacy-planners/src/plan_user_stage_drop.rs diff --git a/src/query/planners/src/plan_user_stage_remove.rs b/src/query/legacy-planners/src/plan_user_stage_remove.rs similarity index 100% rename from src/query/planners/src/plan_user_stage_remove.rs rename to src/query/legacy-planners/src/plan_user_stage_remove.rs diff --git a/src/query/planners/src/plan_user_udf_alter.rs b/src/query/legacy-planners/src/plan_user_udf_alter.rs similarity index 100% rename from src/query/planners/src/plan_user_udf_alter.rs rename to src/query/legacy-planners/src/plan_user_udf_alter.rs diff --git a/src/query/planners/src/plan_user_udf_create.rs b/src/query/legacy-planners/src/plan_user_udf_create.rs similarity index 100% rename from src/query/planners/src/plan_user_udf_create.rs rename to src/query/legacy-planners/src/plan_user_udf_create.rs diff --git a/src/query/planners/src/plan_user_udf_drop.rs b/src/query/legacy-planners/src/plan_user_udf_drop.rs similarity index 100% rename from src/query/planners/src/plan_user_udf_drop.rs rename to src/query/legacy-planners/src/plan_user_udf_drop.rs diff --git a/src/query/planners/src/plan_view_alter.rs b/src/query/legacy-planners/src/plan_view_alter.rs similarity index 100% rename from src/query/planners/src/plan_view_alter.rs rename to src/query/legacy-planners/src/plan_view_alter.rs diff --git a/src/query/planners/src/plan_view_create.rs b/src/query/legacy-planners/src/plan_view_create.rs similarity index 100% rename from src/query/planners/src/plan_view_create.rs rename to src/query/legacy-planners/src/plan_view_create.rs diff --git a/src/query/planners/src/plan_view_drop.rs b/src/query/legacy-planners/src/plan_view_drop.rs similarity index 100% rename from src/query/planners/src/plan_view_drop.rs rename to src/query/legacy-planners/src/plan_view_drop.rs diff --git a/src/query/planners/src/plan_window_func.rs b/src/query/legacy-planners/src/plan_window_func.rs similarity index 100% rename from src/query/planners/src/plan_window_func.rs rename to src/query/legacy-planners/src/plan_window_func.rs diff --git a/src/query/planners/tests/it/main.rs b/src/query/legacy-planners/tests/it/main.rs similarity index 100% rename from src/query/planners/tests/it/main.rs rename to src/query/legacy-planners/tests/it/main.rs diff --git a/src/query/planners/tests/it/plan_builder.rs b/src/query/legacy-planners/tests/it/plan_builder.rs similarity index 99% rename from src/query/planners/tests/it/plan_builder.rs rename to src/query/legacy-planners/tests/it/plan_builder.rs index 0809b477ba5c4..2b64cafaf4431 100644 --- a/src/query/planners/tests/it/plan_builder.rs +++ b/src/query/legacy-planners/tests/it/plan_builder.rs @@ -13,7 +13,7 @@ // limitations under the License. use common_exception::Result; -use common_planners::*; +use common_legacy_planners::*; use crate::test::Test; diff --git a/src/query/planners/tests/it/plan_explain.rs b/src/query/legacy-planners/tests/it/plan_explain.rs similarity index 98% rename from src/query/planners/tests/it/plan_explain.rs rename to src/query/legacy-planners/tests/it/plan_explain.rs index 8cc16c4588d4e..09975e8050367 100644 --- a/src/query/planners/tests/it/plan_explain.rs +++ b/src/query/legacy-planners/tests/it/plan_explain.rs @@ -16,7 +16,7 @@ use std::sync::Arc; use common_datavalues::prelude::*; use common_exception::Result; -use common_planners::*; +use common_legacy_planners::*; use pretty_assertions::assert_eq; use crate::test::Test; diff --git a/src/query/planners/tests/it/plan_expression.rs b/src/query/legacy-planners/tests/it/plan_expression.rs similarity index 99% rename from src/query/planners/tests/it/plan_expression.rs rename to src/query/legacy-planners/tests/it/plan_expression.rs index aeaa9c584d0cc..328e2aeadee75 100644 --- a/src/query/planners/tests/it/plan_expression.rs +++ b/src/query/legacy-planners/tests/it/plan_expression.rs @@ -17,7 +17,7 @@ use std::sync::Arc; use common_datavalues::prelude::*; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::*; +use common_legacy_planners::*; use crate::test::Test; diff --git a/src/query/planners/tests/it/plan_expression_monotonicity.rs b/src/query/legacy-planners/tests/it/plan_expression_monotonicity.rs similarity index 99% rename from src/query/planners/tests/it/plan_expression_monotonicity.rs rename to src/query/legacy-planners/tests/it/plan_expression_monotonicity.rs index 3dde8c340ffb6..83128e48643d8 100644 --- a/src/query/planners/tests/it/plan_expression_monotonicity.rs +++ b/src/query/legacy-planners/tests/it/plan_expression_monotonicity.rs @@ -17,7 +17,7 @@ use std::collections::HashMap; use common_datavalues::prelude::*; use common_exception::Result; use common_functions::scalars::Monotonicity; -use common_planners::*; +use common_legacy_planners::*; struct Test { name: &'static str, diff --git a/src/query/planners/tests/it/plan_extras.rs b/src/query/legacy-planners/tests/it/plan_extras.rs similarity index 96% rename from src/query/planners/tests/it/plan_extras.rs rename to src/query/legacy-planners/tests/it/plan_extras.rs index d28897d0aa045..6742d8eb6288c 100644 --- a/src/query/planners/tests/it/plan_extras.rs +++ b/src/query/legacy-planners/tests/it/plan_extras.rs @@ -13,7 +13,7 @@ // limitations under the License. use common_exception::Result; -use common_planners::*; +use common_legacy_planners::*; use pretty_assertions::assert_eq; #[test] diff --git a/src/query/planners/tests/it/plan_filter.rs b/src/query/legacy-planners/tests/it/plan_filter.rs similarity index 97% rename from src/query/planners/tests/it/plan_filter.rs rename to src/query/legacy-planners/tests/it/plan_filter.rs index 2b0d5a2f1960f..4a6d40913eb8c 100644 --- a/src/query/planners/tests/it/plan_filter.rs +++ b/src/query/legacy-planners/tests/it/plan_filter.rs @@ -13,7 +13,7 @@ // limitations under the License. use common_exception::Result; -use common_planners::*; +use common_legacy_planners::*; use crate::test::Test; diff --git a/src/query/planners/tests/it/plan_having.rs b/src/query/legacy-planners/tests/it/plan_having.rs similarity index 97% rename from src/query/planners/tests/it/plan_having.rs rename to src/query/legacy-planners/tests/it/plan_having.rs index b2f56b0c6651e..24bcc2d5f5707 100644 --- a/src/query/planners/tests/it/plan_having.rs +++ b/src/query/legacy-planners/tests/it/plan_having.rs @@ -13,7 +13,7 @@ // limitations under the License. use common_exception::Result; -use common_planners::*; +use common_legacy_planners::*; use crate::test::Test; diff --git a/src/query/planners/tests/it/plan_limit.rs b/src/query/legacy-planners/tests/it/plan_limit.rs similarity index 96% rename from src/query/planners/tests/it/plan_limit.rs rename to src/query/legacy-planners/tests/it/plan_limit.rs index f0cbc71713252..b9ad908f8e966 100644 --- a/src/query/planners/tests/it/plan_limit.rs +++ b/src/query/legacy-planners/tests/it/plan_limit.rs @@ -15,7 +15,7 @@ use std::sync::Arc; use common_exception::Result; -use common_planners::*; +use common_legacy_planners::*; #[test] fn test_limit_plan() -> Result<()> { diff --git a/src/query/planners/tests/it/plan_partition.rs b/src/query/legacy-planners/tests/it/plan_partition.rs similarity index 98% rename from src/query/planners/tests/it/plan_partition.rs rename to src/query/legacy-planners/tests/it/plan_partition.rs index 21bb40a6228cf..8c6e33f027f4f 100644 --- a/src/query/planners/tests/it/plan_partition.rs +++ b/src/query/legacy-planners/tests/it/plan_partition.rs @@ -15,7 +15,7 @@ use std::any::Any; use common_exception::Result; -use common_planners::PartInfo; +use common_legacy_planners::PartInfo; #[derive(serde::Serialize, serde::Deserialize, PartialEq)] struct TestPartInfoA { diff --git a/src/query/planners/tests/it/plan_projection.rs b/src/query/legacy-planners/tests/it/plan_projection.rs similarity index 97% rename from src/query/planners/tests/it/plan_projection.rs rename to src/query/legacy-planners/tests/it/plan_projection.rs index 01618a897e134..eaea37285938b 100644 --- a/src/query/planners/tests/it/plan_projection.rs +++ b/src/query/legacy-planners/tests/it/plan_projection.rs @@ -16,7 +16,7 @@ use std::sync::Arc; use common_datavalues::prelude::*; use common_exception::Result; -use common_planners::*; +use common_legacy_planners::*; #[test] fn test_projection_plan() -> Result<()> { diff --git a/src/query/planners/tests/it/plan_rewriter.rs b/src/query/legacy-planners/tests/it/plan_rewriter.rs similarity index 99% rename from src/query/planners/tests/it/plan_rewriter.rs rename to src/query/legacy-planners/tests/it/plan_rewriter.rs index 2e6a3fa9a44d5..2877a488b6d2f 100644 --- a/src/query/planners/tests/it/plan_rewriter.rs +++ b/src/query/legacy-planners/tests/it/plan_rewriter.rs @@ -16,7 +16,7 @@ use std::collections::HashMap; use std::sync::Arc; use common_exception::Result; -use common_planners::*; +use common_legacy_planners::*; use crate::test::Test; @@ -205,7 +205,7 @@ impl PlanRewriter for DefaultRewriter { #[test] fn test_plan_rewriter_1() -> Result<()> { - use common_planners::*; + use common_legacy_planners::*; use pretty_assertions::assert_eq; let source = Test::create().generate_source_plan_for_test(10000)?; diff --git a/src/query/planners/tests/it/plan_select.rs b/src/query/legacy-planners/tests/it/plan_select.rs similarity index 97% rename from src/query/planners/tests/it/plan_select.rs rename to src/query/legacy-planners/tests/it/plan_select.rs index 9781f1706399a..21a3883842e54 100644 --- a/src/query/planners/tests/it/plan_select.rs +++ b/src/query/legacy-planners/tests/it/plan_select.rs @@ -16,7 +16,7 @@ use std::sync::Arc; use common_datavalues::prelude::*; use common_exception::Result; -use common_planners::*; +use common_legacy_planners::*; #[test] fn test_select_wildcard_plan() -> Result<()> { diff --git a/src/query/planners/tests/it/test.rs b/src/query/legacy-planners/tests/it/test.rs similarity index 92% rename from src/query/planners/tests/it/test.rs rename to src/query/legacy-planners/tests/it/test.rs index 07efa96ece224..ef05725e7f796 100644 --- a/src/query/planners/tests/it/test.rs +++ b/src/query/legacy-planners/tests/it/test.rs @@ -17,13 +17,13 @@ use std::sync::Arc; use common_datavalues::prelude::*; use common_exception::Result; +use common_legacy_planners::PartInfo; +use common_legacy_planners::Partitions; +use common_legacy_planners::PlanNode; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::SourceInfo; +use common_legacy_planners::Statistics; use common_meta_app::schema::TableInfo; -use common_planners::PartInfo; -use common_planners::Partitions; -use common_planners::PlanNode; -use common_planners::ReadDataSourcePlan; -use common_planners::SourceInfo; -use common_planners::Statistics; pub struct Test {} diff --git a/src/query/pipeline/transforms/Cargo.toml b/src/query/pipeline/transforms/Cargo.toml index 7372bd17f2735..2844809c70310 100644 --- a/src/query/pipeline/transforms/Cargo.toml +++ b/src/query/pipeline/transforms/Cargo.toml @@ -13,8 +13,8 @@ common-catalog = { path = "../../catalog" } common-datablocks = { path = "../../datablocks" } common-datavalues = { path = "../../datavalues" } common-exception = { path = "../../../common/exception" } +common-legacy-planners = { path = "../../legacy-planners" } common-pipeline-core = { path = "../core" } -common-planners = { path = "../../planners" } async-trait = { version = "0.1.0", package = "async-trait-fn" } tracing = "0.1.35" diff --git a/src/query/pipeline/transforms/src/processors/transforms/transform_expression.rs b/src/query/pipeline/transforms/src/processors/transforms/transform_expression.rs index 487bab92be53e..07a3b45899e41 100644 --- a/src/query/pipeline/transforms/src/processors/transforms/transform_expression.rs +++ b/src/query/pipeline/transforms/src/processors/transforms/transform_expression.rs @@ -18,10 +18,10 @@ use common_catalog::table_context::TableContext; use common_datablocks::DataBlock; use common_datavalues::DataSchemaRef; use common_exception::Result; +use common_legacy_planners::Expression; use common_pipeline_core::processors::port::InputPort; use common_pipeline_core::processors::port::OutputPort; use common_pipeline_core::processors::processor::ProcessorPtr; -use common_planners::Expression; use crate::processors::transforms::transform::Transform; use crate::processors::transforms::transform::Transformer; diff --git a/src/query/pipeline/transforms/src/processors/transforms/transform_expression_executor.rs b/src/query/pipeline/transforms/src/processors/transforms/transform_expression_executor.rs index b79c49bc1bc0b..6310cb64daf3d 100644 --- a/src/query/pipeline/transforms/src/processors/transforms/transform_expression_executor.rs +++ b/src/query/pipeline/transforms/src/processors/transforms/transform_expression_executor.rs @@ -20,10 +20,10 @@ use common_datablocks::DataBlock; use common_datavalues::prelude::*; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::ActionFunction; -use common_planners::Expression; -use common_planners::ExpressionAction; -use common_planners::ExpressionChain; +use common_legacy_planners::ActionFunction; +use common_legacy_planners::Expression; +use common_legacy_planners::ExpressionAction; +use common_legacy_planners::ExpressionChain; use tracing::debug; /// ExpressionExecutor is a helper struct for expressions and projections diff --git a/src/query/pipeline/transforms/src/processors/transforms/transform_sort_partial.rs b/src/query/pipeline/transforms/src/processors/transforms/transform_sort_partial.rs index ed5bead8d0685..2c1b420138a0f 100644 --- a/src/query/pipeline/transforms/src/processors/transforms/transform_sort_partial.rs +++ b/src/query/pipeline/transforms/src/processors/transforms/transform_sort_partial.rs @@ -19,10 +19,10 @@ use common_datablocks::SortColumnDescription; use common_datavalues::DataSchemaRef; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::Expression; use common_pipeline_core::processors::port::InputPort; use common_pipeline_core::processors::port::OutputPort; use common_pipeline_core::processors::processor::ProcessorPtr; -use common_planners::Expression; use crate::processors::transforms::Transform; use crate::processors::transforms::Transformer; diff --git a/src/query/service/Cargo.toml b/src/query/service/Cargo.toml index e38245a615a6b..75a1a45ce1ae2 100644 --- a/src/query/service/Cargo.toml +++ b/src/query/service/Cargo.toml @@ -46,6 +46,7 @@ common-hive-meta-store = { path = "../storages/hive-meta-store", optional = true common-http = { path = "../../common/http" } common-io = { path = "../../common/io" } common-legacy-parser = { path = "../legacy-parser" } +common-legacy-planners = { path = "../legacy-planners" } common-management = { path = "../management" } common-meta-api = { path = "../../meta/api" } common-meta-app = { path = "../../meta/app" } @@ -60,7 +61,6 @@ common-pipeline-core = { path = "../pipeline/core" } common-pipeline-sinks = { path = "../pipeline/sinks" } common-pipeline-sources = { path = "../pipeline/sources" } common-pipeline-transforms = { path = "../pipeline/transforms" } -common-planners = { path = "../planners" } common-settings = { path = "../settings" } common-storage = { path = "../../common/storage" } common-storages-fuse = { path = "../storages/fuse" } diff --git a/src/query/service/benches/suites/mod.rs b/src/query/service/benches/suites/mod.rs index 470ebe39b2eaf..c7324abbaa1e7 100644 --- a/src/query/service/benches/suites/mod.rs +++ b/src/query/service/benches/suites/mod.rs @@ -14,7 +14,7 @@ use common_base::base::tokio; use common_exception::Result; -use common_planners::PlanNode; +use common_legacy_planners::PlanNode; use criterion::Criterion; use databend_query::interpreters::Interpreter; use databend_query::interpreters::SelectInterpreter; diff --git a/src/query/service/src/api/rpc/exchange/data_exchange.rs b/src/query/service/src/api/rpc/exchange/data_exchange.rs index 89e8fdf31d125..ef74c8f698a36 100644 --- a/src/query/service/src/api/rpc/exchange/data_exchange.rs +++ b/src/query/service/src/api/rpc/exchange/data_exchange.rs @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -use common_planners::Expression; +use common_legacy_planners::Expression; use crate::sql::executor::PhysicalScalar; diff --git a/src/query/service/src/api/rpc/flight_scatter_hash.rs b/src/query/service/src/api/rpc/flight_scatter_hash.rs index 44f9e931a113f..654d6272be91f 100644 --- a/src/query/service/src/api/rpc/flight_scatter_hash.rs +++ b/src/query/service/src/api/rpc/flight_scatter_hash.rs @@ -18,7 +18,7 @@ use common_datablocks::DataBlock; use common_datavalues::prelude::*; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::Expression; +use common_legacy_planners::Expression; use crate::api::rpc::flight_scatter::FlightScatter; use crate::pipelines::processors::transforms::ExpressionExecutor; diff --git a/src/query/service/src/api/rpc/packets/packet_fragment.rs b/src/query/service/src/api/rpc/packets/packet_fragment.rs index 5de207c96622f..02a0a2d9f282e 100644 --- a/src/query/service/src/api/rpc/packets/packet_fragment.rs +++ b/src/query/service/src/api/rpc/packets/packet_fragment.rs @@ -17,7 +17,7 @@ use std::fmt::Formatter; use common_datavalues::DataSchemaRef; use common_exception::Result; -use common_planners::PlanNode; +use common_legacy_planners::PlanNode; use crate::api::DataExchange; use crate::sql::executor::PhysicalPlan; diff --git a/src/query/service/src/context_function.rs b/src/query/service/src/context_function.rs index ac205c002b8db..07ee8ea53d110 100644 --- a/src/query/service/src/context_function.rs +++ b/src/query/service/src/context_function.rs @@ -18,7 +18,7 @@ use common_datavalues::DataValue; use common_exception::ErrorCode; use common_exception::Result; use common_functions::is_builtin_function; -use common_planners::Expression; +use common_legacy_planners::Expression; use crate::sessions::QueryContext; use crate::sessions::TableContext; diff --git a/src/query/service/src/interpreters/access/management_mode_access.rs b/src/query/service/src/interpreters/access/management_mode_access.rs index 46014f60ca1ca..eb4db91f7196b 100644 --- a/src/query/service/src/interpreters/access/management_mode_access.rs +++ b/src/query/service/src/interpreters/access/management_mode_access.rs @@ -16,7 +16,7 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::PlanNode; +use common_legacy_planners::PlanNode; use crate::sessions::QueryContext; use crate::sessions::TableContext; diff --git a/src/query/service/src/interpreters/async_insert_queue.rs b/src/query/service/src/interpreters/async_insert_queue.rs index 80c2227bf4730..7dffbe60aa876 100644 --- a/src/query/service/src/interpreters/async_insert_queue.rs +++ b/src/query/service/src/interpreters/async_insert_queue.rs @@ -30,9 +30,9 @@ use common_config::Config; use common_datablocks::DataBlock; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::InsertInputSource; -use common_planners::InsertPlan; -use common_planners::SelectPlan; +use common_legacy_planners::InsertInputSource; +use common_legacy_planners::InsertPlan; +use common_legacy_planners::SelectPlan; use futures_util::future::Either; use once_cell::sync::OnceCell; use parking_lot::Mutex; diff --git a/src/query/service/src/interpreters/fragments/query_fragment.rs b/src/query/service/src/interpreters/fragments/query_fragment.rs index 8c6957cb91cb1..acd2c245253d2 100644 --- a/src/query/service/src/interpreters/fragments/query_fragment.rs +++ b/src/query/service/src/interpreters/fragments/query_fragment.rs @@ -17,23 +17,23 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::AggregatorFinalPlan; -use common_planners::AggregatorPartialPlan; -use common_planners::BroadcastPlan; -use common_planners::ExpressionPlan; -use common_planners::FilterPlan; -use common_planners::HavingPlan; -use common_planners::LimitByPlan; -use common_planners::LimitPlan; -use common_planners::PlanNode; -use common_planners::ProjectionPlan; -use common_planners::ReadDataSourcePlan; -use common_planners::SelectPlan; -use common_planners::SinkPlan; -use common_planners::SortPlan; -use common_planners::StagePlan; -use common_planners::SubQueriesSetPlan; -use common_planners::WindowFuncPlan; +use common_legacy_planners::AggregatorFinalPlan; +use common_legacy_planners::AggregatorPartialPlan; +use common_legacy_planners::BroadcastPlan; +use common_legacy_planners::ExpressionPlan; +use common_legacy_planners::FilterPlan; +use common_legacy_planners::HavingPlan; +use common_legacy_planners::LimitByPlan; +use common_legacy_planners::LimitPlan; +use common_legacy_planners::PlanNode; +use common_legacy_planners::ProjectionPlan; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::SelectPlan; +use common_legacy_planners::SinkPlan; +use common_legacy_planners::SortPlan; +use common_legacy_planners::StagePlan; +use common_legacy_planners::SubQueriesSetPlan; +use common_legacy_planners::WindowFuncPlan; use crate::interpreters::fragments::partition_state::PartitionState; use crate::interpreters::fragments::query_fragment_actions::QueryFragmentsActions; diff --git a/src/query/service/src/interpreters/fragments/query_fragment_actions.rs b/src/query/service/src/interpreters/fragments/query_fragment_actions.rs index 883822b655999..164a2a3bd352e 100644 --- a/src/query/service/src/interpreters/fragments/query_fragment_actions.rs +++ b/src/query/service/src/interpreters/fragments/query_fragment_actions.rs @@ -21,8 +21,8 @@ use std::sync::Arc; use common_datavalues::DataSchemaRef; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::PlanNode; use common_meta_types::NodeInfo; -use common_planners::PlanNode; use itertools::Itertools; use crate::api::ConnectionInfo; diff --git a/src/query/service/src/interpreters/fragments/query_fragment_broadcast.rs b/src/query/service/src/interpreters/fragments/query_fragment_broadcast.rs index a678421eece6f..61c0d3a68a1af 100644 --- a/src/query/service/src/interpreters/fragments/query_fragment_broadcast.rs +++ b/src/query/service/src/interpreters/fragments/query_fragment_broadcast.rs @@ -19,13 +19,13 @@ use std::sync::Arc; use common_catalog::table_context::TableContext; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::AggregatorFinalPlan; -use common_planners::AggregatorPartialPlan; -use common_planners::BroadcastPlan; -use common_planners::PlanBuilder; -use common_planners::PlanNode; -use common_planners::PlanRewriter; -use common_planners::RemotePlan; +use common_legacy_planners::AggregatorFinalPlan; +use common_legacy_planners::AggregatorPartialPlan; +use common_legacy_planners::BroadcastPlan; +use common_legacy_planners::PlanBuilder; +use common_legacy_planners::PlanNode; +use common_legacy_planners::PlanRewriter; +use common_legacy_planners::RemotePlan; use crate::api::BroadcastExchange; use crate::api::FragmentPayload; diff --git a/src/query/service/src/interpreters/fragments/query_fragment_read_source.rs b/src/query/service/src/interpreters/fragments/query_fragment_read_source.rs index c5c7710a92ba5..905442f68dd55 100644 --- a/src/query/service/src/interpreters/fragments/query_fragment_read_source.rs +++ b/src/query/service/src/interpreters/fragments/query_fragment_read_source.rs @@ -18,13 +18,13 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::AggregatorFinalPlan; -use common_planners::AggregatorPartialPlan; -use common_planners::Partitions; -use common_planners::PlanBuilder; -use common_planners::PlanNode; -use common_planners::PlanRewriter; -use common_planners::ReadDataSourcePlan; +use common_legacy_planners::AggregatorFinalPlan; +use common_legacy_planners::AggregatorPartialPlan; +use common_legacy_planners::Partitions; +use common_legacy_planners::PlanBuilder; +use common_legacy_planners::PlanNode; +use common_legacy_planners::PlanRewriter; +use common_legacy_planners::ReadDataSourcePlan; use crate::interpreters::fragments::partition_state::PartitionState; use crate::interpreters::fragments::query_fragment::QueryFragment; diff --git a/src/query/service/src/interpreters/fragments/query_fragment_root.rs b/src/query/service/src/interpreters/fragments/query_fragment_root.rs index 53435ddf6d71d..32947872196c8 100644 --- a/src/query/service/src/interpreters/fragments/query_fragment_root.rs +++ b/src/query/service/src/interpreters/fragments/query_fragment_root.rs @@ -16,7 +16,7 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::PlanNode; +use common_legacy_planners::PlanNode; use crate::api::FragmentPayload; use crate::api::MergeExchange; diff --git a/src/query/service/src/interpreters/fragments/query_fragment_stage.rs b/src/query/service/src/interpreters/fragments/query_fragment_stage.rs index 19790c4a00d54..be4b839a50f94 100644 --- a/src/query/service/src/interpreters/fragments/query_fragment_stage.rs +++ b/src/query/service/src/interpreters/fragments/query_fragment_stage.rs @@ -18,14 +18,14 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::AggregatorFinalPlan; -use common_planners::AggregatorPartialPlan; -use common_planners::PlanBuilder; -use common_planners::PlanNode; -use common_planners::PlanRewriter; -use common_planners::RemotePlan; -use common_planners::StageKind; -use common_planners::StagePlan; +use common_legacy_planners::AggregatorFinalPlan; +use common_legacy_planners::AggregatorPartialPlan; +use common_legacy_planners::PlanBuilder; +use common_legacy_planners::PlanNode; +use common_legacy_planners::PlanRewriter; +use common_legacy_planners::RemotePlan; +use common_legacy_planners::StageKind; +use common_legacy_planners::StagePlan; use crate::api::FragmentPayload; use crate::api::MergeExchange; diff --git a/src/query/service/src/interpreters/fragments/query_fragment_subqueries.rs b/src/query/service/src/interpreters/fragments/query_fragment_subqueries.rs index 387c4e081dc24..bfc79ea53d74b 100644 --- a/src/query/service/src/interpreters/fragments/query_fragment_subqueries.rs +++ b/src/query/service/src/interpreters/fragments/query_fragment_subqueries.rs @@ -19,14 +19,14 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::AggregatorFinalPlan; -use common_planners::AggregatorPartialPlan; -use common_planners::Expression; -use common_planners::Expressions; -use common_planners::PlanBuilder; -use common_planners::PlanNode; -use common_planners::PlanRewriter; -use common_planners::SubQueriesSetPlan; +use common_legacy_planners::AggregatorFinalPlan; +use common_legacy_planners::AggregatorPartialPlan; +use common_legacy_planners::Expression; +use common_legacy_planners::Expressions; +use common_legacy_planners::PlanBuilder; +use common_legacy_planners::PlanNode; +use common_legacy_planners::PlanRewriter; +use common_legacy_planners::SubQueriesSetPlan; use crate::api::FragmentPayload; use crate::interpreters::fragments::partition_state::PartitionState; diff --git a/src/query/service/src/interpreters/fragments/v2/fragmenter.rs b/src/query/service/src/interpreters/fragments/v2/fragmenter.rs index e78922a15c495..3a4e0cfcd2bf9 100644 --- a/src/query/service/src/interpreters/fragments/v2/fragmenter.rs +++ b/src/query/service/src/interpreters/fragments/v2/fragmenter.rs @@ -16,7 +16,7 @@ use std::sync::Arc; use common_catalog::table_context::TableContext; use common_exception::Result; -use common_planners::StageKind; +use common_legacy_planners::StageKind; use super::FragmentType; use super::PlanFragment; diff --git a/src/query/service/src/interpreters/fragments/v2/plan_fragment.rs b/src/query/service/src/interpreters/fragments/v2/plan_fragment.rs index fc494e0470d28..3da25d9329a4a 100644 --- a/src/query/service/src/interpreters/fragments/v2/plan_fragment.rs +++ b/src/query/service/src/interpreters/fragments/v2/plan_fragment.rs @@ -16,7 +16,7 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::ReadDataSourcePlan; +use common_legacy_planners::ReadDataSourcePlan; use super::Fragmenter; use crate::api::DataExchange; diff --git a/src/query/service/src/interpreters/interpreter_call.rs b/src/query/service/src/interpreters/interpreter_call.rs index d351bcda31760..e15da62021c6a 100644 --- a/src/query/service/src/interpreters/interpreter_call.rs +++ b/src/query/service/src/interpreters/interpreter_call.rs @@ -17,8 +17,8 @@ use std::sync::RwLock; use common_datavalues::DataSchemaRef; use common_exception::Result; +use common_legacy_planners::CallPlan; use common_pipeline_core::Pipeline; -use common_planners::CallPlan; use common_streams::SendableDataBlockStream; use super::Interpreter; diff --git a/src/query/service/src/interpreters/interpreter_cluster_key_alter.rs b/src/query/service/src/interpreters/interpreter_cluster_key_alter.rs index 1f76215da0cbc..81739ba3c5a9c 100644 --- a/src/query/service/src/interpreters/interpreter_cluster_key_alter.rs +++ b/src/query/service/src/interpreters/interpreter_cluster_key_alter.rs @@ -15,9 +15,9 @@ use std::sync::Arc; use common_exception::Result; +use common_legacy_planners::AlterTableClusterKeyPlan; use common_meta_types::GrantObject; use common_meta_types::UserPrivilegeType; -use common_planners::AlterTableClusterKeyPlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_cluster_key_drop.rs b/src/query/service/src/interpreters/interpreter_cluster_key_drop.rs index 76a92455c98a1..6c89573b4cd21 100644 --- a/src/query/service/src/interpreters/interpreter_cluster_key_drop.rs +++ b/src/query/service/src/interpreters/interpreter_cluster_key_drop.rs @@ -15,9 +15,9 @@ use std::sync::Arc; use common_exception::Result; +use common_legacy_planners::DropTableClusterKeyPlan; use common_meta_types::GrantObject; use common_meta_types::UserPrivilegeType; -use common_planners::DropTableClusterKeyPlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_copy_v2.rs b/src/query/service/src/interpreters/interpreter_copy_v2.rs index c89a299594174..c6015accfa9cc 100644 --- a/src/query/service/src/interpreters/interpreter_copy_v2.rs +++ b/src/query/service/src/interpreters/interpreter_copy_v2.rs @@ -19,10 +19,10 @@ use common_datablocks::DataBlock; use common_datavalues::prelude::*; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::SourceInfo; +use common_legacy_planners::StageTableInfo; use common_meta_types::UserStageInfo; -use common_planners::ReadDataSourcePlan; -use common_planners::SourceInfo; -use common_planners::StageTableInfo; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; use futures::TryStreamExt; diff --git a/src/query/service/src/interpreters/interpreter_database_create.rs b/src/query/service/src/interpreters/interpreter_database_create.rs index 2b72614cab95b..18d025ee75b33 100644 --- a/src/query/service/src/interpreters/interpreter_database_create.rs +++ b/src/query/service/src/interpreters/interpreter_database_create.rs @@ -16,9 +16,9 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::CreateDatabasePlan; use common_meta_types::GrantObject; use common_meta_types::UserPrivilegeType; -use common_planners::CreateDatabasePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_database_drop.rs b/src/query/service/src/interpreters/interpreter_database_drop.rs index 0173ce39d47c0..bda754ac9948f 100644 --- a/src/query/service/src/interpreters/interpreter_database_drop.rs +++ b/src/query/service/src/interpreters/interpreter_database_drop.rs @@ -15,9 +15,9 @@ use std::sync::Arc; use common_exception::Result; +use common_legacy_planners::DropDatabasePlan; use common_meta_types::GrantObject; use common_meta_types::UserPrivilegeType; -use common_planners::DropDatabasePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_database_rename.rs b/src/query/service/src/interpreters/interpreter_database_rename.rs index f03328ba36cb3..58a66a8958ea4 100644 --- a/src/query/service/src/interpreters/interpreter_database_rename.rs +++ b/src/query/service/src/interpreters/interpreter_database_rename.rs @@ -15,9 +15,9 @@ use std::sync::Arc; use common_exception::Result; +use common_legacy_planners::RenameDatabasePlan; use common_meta_app::schema::DatabaseNameIdent; use common_meta_app::schema::RenameDatabaseReq; -use common_planners::RenameDatabasePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_database_show_create.rs b/src/query/service/src/interpreters/interpreter_database_show_create.rs index 505ad0f187ea2..50333af9bdfb8 100644 --- a/src/query/service/src/interpreters/interpreter_database_show_create.rs +++ b/src/query/service/src/interpreters/interpreter_database_show_create.rs @@ -18,7 +18,7 @@ use std::sync::Arc; use common_datablocks::DataBlock; use common_datavalues::prelude::*; use common_exception::Result; -use common_planners::ShowCreateDatabasePlan; +use common_legacy_planners::ShowCreateDatabasePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_database_undrop.rs b/src/query/service/src/interpreters/interpreter_database_undrop.rs index 1c7bf984540c2..bfb5ee31306f5 100644 --- a/src/query/service/src/interpreters/interpreter_database_undrop.rs +++ b/src/query/service/src/interpreters/interpreter_database_undrop.rs @@ -15,9 +15,9 @@ use std::sync::Arc; use common_exception::Result; +use common_legacy_planners::UndropDatabasePlan; use common_meta_types::GrantObject; use common_meta_types::UserPrivilegeType; -use common_planners::UndropDatabasePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_delete.rs b/src/query/service/src/interpreters/interpreter_delete.rs index 6b4b487749c3e..58231ba0c0e83 100644 --- a/src/query/service/src/interpreters/interpreter_delete.rs +++ b/src/query/service/src/interpreters/interpreter_delete.rs @@ -17,7 +17,7 @@ use std::sync::Arc; use common_datavalues::DataSchema; use common_datavalues::DataSchemaRef; use common_exception::Result; -use common_planners::DeletePlan; +use common_legacy_planners::DeletePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_empty.rs b/src/query/service/src/interpreters/interpreter_empty.rs index ccf800fc7c67c..477f21f847481 100644 --- a/src/query/service/src/interpreters/interpreter_empty.rs +++ b/src/query/service/src/interpreters/interpreter_empty.rs @@ -16,7 +16,7 @@ use std::sync::Arc; use common_datavalues::prelude::*; use common_exception::Result; -use common_planners::EmptyPlan; +use common_legacy_planners::EmptyPlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_explain.rs b/src/query/service/src/interpreters/interpreter_explain.rs index 0f5e21d5769dc..9a79a10ed17ae 100644 --- a/src/query/service/src/interpreters/interpreter_explain.rs +++ b/src/query/service/src/interpreters/interpreter_explain.rs @@ -17,8 +17,8 @@ use std::sync::Arc; use common_datablocks::DataBlock; use common_datavalues::prelude::*; use common_exception::Result; -use common_planners::ExplainPlan; -use common_planners::ExplainType; +use common_legacy_planners::ExplainPlan; +use common_legacy_planners::ExplainType; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_factory.rs b/src/query/service/src/interpreters/interpreter_factory.rs index f12cdccbb8e0e..6d6e12c1775fc 100644 --- a/src/query/service/src/interpreters/interpreter_factory.rs +++ b/src/query/service/src/interpreters/interpreter_factory.rs @@ -16,7 +16,7 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::PlanNode; +use common_legacy_planners::PlanNode; use crate::interpreters::DeleteInterpreter; use crate::interpreters::EmptyInterpreter; diff --git a/src/query/service/src/interpreters/interpreter_factory_interceptor.rs b/src/query/service/src/interpreters/interpreter_factory_interceptor.rs index d54ee96946999..effcbf1f52be4 100644 --- a/src/query/service/src/interpreters/interpreter_factory_interceptor.rs +++ b/src/query/service/src/interpreters/interpreter_factory_interceptor.rs @@ -17,7 +17,7 @@ use std::time::SystemTime; use common_datavalues::DataSchemaRef; use common_exception::Result; -use common_planners::PlanNode; +use common_legacy_planners::PlanNode; use common_streams::ErrorStream; use common_streams::ProgressStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_factory_v2.rs b/src/query/service/src/interpreters/interpreter_factory_v2.rs index 99ae7d767c271..b95c42912598c 100644 --- a/src/query/service/src/interpreters/interpreter_factory_v2.rs +++ b/src/query/service/src/interpreters/interpreter_factory_v2.rs @@ -15,8 +15,8 @@ use std::sync::Arc; use common_exception::Result; -use common_planners::EmptyPlan; -use common_planners::PlanNode; +use common_legacy_planners::EmptyPlan; +use common_legacy_planners::PlanNode; use super::interpreter_share_desc::DescShareInterpreter; use super::interpreter_user_stage_drop::DropUserStageInterpreter; diff --git a/src/query/service/src/interpreters/interpreter_insert.rs b/src/query/service/src/interpreters/interpreter_insert.rs index 70b906f938caf..17958de8f998f 100644 --- a/src/query/service/src/interpreters/interpreter_insert.rs +++ b/src/query/service/src/interpreters/interpreter_insert.rs @@ -19,10 +19,10 @@ use common_datavalues::DataType; use common_exception::ErrorCode; use common_exception::Result; use common_functions::scalars::CastFunction; -use common_planners::InsertInputSource; -use common_planners::InsertPlan; -use common_planners::PlanNode; -use common_planners::SelectPlan; +use common_legacy_planners::InsertInputSource; +use common_legacy_planners::InsertPlan; +use common_legacy_planners::PlanNode; +use common_legacy_planners::SelectPlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; use parking_lot::Mutex; diff --git a/src/query/service/src/interpreters/interpreter_kill.rs b/src/query/service/src/interpreters/interpreter_kill.rs index ee4a198248f07..7dac03d5c8ee1 100644 --- a/src/query/service/src/interpreters/interpreter_kill.rs +++ b/src/query/service/src/interpreters/interpreter_kill.rs @@ -17,9 +17,9 @@ use std::sync::Arc; use common_datavalues::DataSchema; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::KillPlan; use common_meta_types::GrantObject; use common_meta_types::UserPrivilegeType; -use common_planners::KillPlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_list.rs b/src/query/service/src/interpreters/interpreter_list.rs index 7da1b272352a5..5620286f2290d 100644 --- a/src/query/service/src/interpreters/interpreter_list.rs +++ b/src/query/service/src/interpreters/interpreter_list.rs @@ -19,7 +19,7 @@ use common_datavalues::DataSchemaRef; use common_datavalues::Series; use common_datavalues::SeriesFrom; use common_exception::Result; -use common_planners::ListPlan; +use common_legacy_planners::ListPlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_privilege_grant.rs b/src/query/service/src/interpreters/interpreter_privilege_grant.rs index 918fffbe230a4..aaa51ebc46f19 100644 --- a/src/query/service/src/interpreters/interpreter_privilege_grant.rs +++ b/src/query/service/src/interpreters/interpreter_privilege_grant.rs @@ -15,10 +15,10 @@ use std::sync::Arc; use common_exception::Result; +use common_legacy_planners::GrantPrivilegePlan; use common_meta_types::GrantObject; use common_meta_types::PrincipalIdentity; use common_meta_types::UserPrivilegeSet; -use common_planners::GrantPrivilegePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_privilege_revoke.rs b/src/query/service/src/interpreters/interpreter_privilege_revoke.rs index 7b3dd451c829c..aa0d7ea0c5b68 100644 --- a/src/query/service/src/interpreters/interpreter_privilege_revoke.rs +++ b/src/query/service/src/interpreters/interpreter_privilege_revoke.rs @@ -15,8 +15,8 @@ use std::sync::Arc; use common_exception::Result; +use common_legacy_planners::RevokePrivilegePlan; use common_meta_types::PrincipalIdentity; -use common_planners::RevokePrivilegePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_role_create.rs b/src/query/service/src/interpreters/interpreter_role_create.rs index 4d217f00d2f0b..014c4a92eff7c 100644 --- a/src/query/service/src/interpreters/interpreter_role_create.rs +++ b/src/query/service/src/interpreters/interpreter_role_create.rs @@ -15,8 +15,8 @@ use std::sync::Arc; use common_exception::Result; +use common_legacy_planners::CreateRolePlan; use common_meta_types::RoleInfo; -use common_planners::CreateRolePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_role_drop.rs b/src/query/service/src/interpreters/interpreter_role_drop.rs index 2381b69c95f27..16bad3c4edf27 100644 --- a/src/query/service/src/interpreters/interpreter_role_drop.rs +++ b/src/query/service/src/interpreters/interpreter_role_drop.rs @@ -15,7 +15,7 @@ use std::sync::Arc; use common_exception::Result; -use common_planners::DropRolePlan; +use common_legacy_planners::DropRolePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_role_grant.rs b/src/query/service/src/interpreters/interpreter_role_grant.rs index c81db861d7516..f7fe8f34285f6 100644 --- a/src/query/service/src/interpreters/interpreter_role_grant.rs +++ b/src/query/service/src/interpreters/interpreter_role_grant.rs @@ -15,8 +15,8 @@ use std::sync::Arc; use common_exception::Result; +use common_legacy_planners::GrantRolePlan; use common_meta_types::PrincipalIdentity; -use common_planners::GrantRolePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_role_revoke.rs b/src/query/service/src/interpreters/interpreter_role_revoke.rs index ebcf9607c11f7..99bee7e654a33 100644 --- a/src/query/service/src/interpreters/interpreter_role_revoke.rs +++ b/src/query/service/src/interpreters/interpreter_role_revoke.rs @@ -15,8 +15,8 @@ use std::sync::Arc; use common_exception::Result; +use common_legacy_planners::RevokeRolePlan; use common_meta_types::PrincipalIdentity; -use common_planners::RevokeRolePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_select.rs b/src/query/service/src/interpreters/interpreter_select.rs index 90106f0f5cf1d..da4fe1dc92ccc 100644 --- a/src/query/service/src/interpreters/interpreter_select.rs +++ b/src/query/service/src/interpreters/interpreter_select.rs @@ -16,8 +16,8 @@ use std::sync::Arc; use common_datavalues::DataSchemaRef; use common_exception::Result; -use common_planners::PlanNode; -use common_planners::SelectPlan; +use common_legacy_planners::PlanNode; +use common_legacy_planners::SelectPlan; use common_streams::SendableDataBlockStream; use crate::clusters::ClusterHelper; diff --git a/src/query/service/src/interpreters/interpreter_setting.rs b/src/query/service/src/interpreters/interpreter_setting.rs index dc7d25583c5a2..374bbed62e32f 100644 --- a/src/query/service/src/interpreters/interpreter_setting.rs +++ b/src/query/service/src/interpreters/interpreter_setting.rs @@ -18,7 +18,7 @@ use chrono_tz::Tz; use common_datavalues::prelude::*; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::SettingPlan; +use common_legacy_planners::SettingPlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_show_grants.rs b/src/query/service/src/interpreters/interpreter_show_grants.rs index a82e68e27c47a..cb1ddac503338 100644 --- a/src/query/service/src/interpreters/interpreter_show_grants.rs +++ b/src/query/service/src/interpreters/interpreter_show_grants.rs @@ -17,8 +17,8 @@ use std::sync::Arc; use common_datablocks::DataBlock; use common_datavalues::prelude::*; use common_exception::Result; +use common_legacy_planners::ShowGrantsPlan; use common_meta_types::PrincipalIdentity; -use common_planners::ShowGrantsPlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; use common_users::RoleCacheManager; diff --git a/src/query/service/src/interpreters/interpreter_table_describe.rs b/src/query/service/src/interpreters/interpreter_table_describe.rs index 140ab7ce3b49f..70fd03282a054 100644 --- a/src/query/service/src/interpreters/interpreter_table_describe.rs +++ b/src/query/service/src/interpreters/interpreter_table_describe.rs @@ -18,7 +18,7 @@ use common_datablocks::DataBlock; use common_datavalues::prelude::*; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::DescribeTablePlan; +use common_legacy_planners::DescribeTablePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_table_drop.rs b/src/query/service/src/interpreters/interpreter_table_drop.rs index 1d0509f55c609..118d0cb5a22b6 100644 --- a/src/query/service/src/interpreters/interpreter_table_drop.rs +++ b/src/query/service/src/interpreters/interpreter_table_drop.rs @@ -16,10 +16,10 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::DropTablePlan; +use common_legacy_planners::TruncateTablePlan; use common_meta_types::GrantObject; use common_meta_types::UserPrivilegeType; -use common_planners::DropTablePlan; -use common_planners::TruncateTablePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_table_exists.rs b/src/query/service/src/interpreters/interpreter_table_exists.rs index e2010b156c8ba..7f97bddeb4cc9 100644 --- a/src/query/service/src/interpreters/interpreter_table_exists.rs +++ b/src/query/service/src/interpreters/interpreter_table_exists.rs @@ -18,7 +18,7 @@ use common_datablocks::DataBlock; use common_datavalues::Series; use common_datavalues::SeriesFrom; use common_exception::Result; -use common_planners::ExistsTablePlan; +use common_legacy_planners::ExistsTablePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_table_optimize.rs b/src/query/service/src/interpreters/interpreter_table_optimize.rs index e6ca47a2d7c7f..2ff105c572dfc 100644 --- a/src/query/service/src/interpreters/interpreter_table_optimize.rs +++ b/src/query/service/src/interpreters/interpreter_table_optimize.rs @@ -15,8 +15,8 @@ use std::sync::Arc; use common_exception::Result; -use common_planners::OptimizeTableAction; -use common_planners::OptimizeTablePlan; +use common_legacy_planners::OptimizeTableAction; +use common_legacy_planners::OptimizeTablePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_table_recluster.rs b/src/query/service/src/interpreters/interpreter_table_recluster.rs index bc766c0fc0f35..8dc96434b31ec 100644 --- a/src/query/service/src/interpreters/interpreter_table_recluster.rs +++ b/src/query/service/src/interpreters/interpreter_table_recluster.rs @@ -16,7 +16,7 @@ use std::sync::Arc; use std::time::SystemTime; use common_exception::Result; -use common_planners::ReclusterTablePlan; +use common_legacy_planners::ReclusterTablePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_table_rename.rs b/src/query/service/src/interpreters/interpreter_table_rename.rs index 025ccafe2b8bb..3149a04410f1f 100644 --- a/src/query/service/src/interpreters/interpreter_table_rename.rs +++ b/src/query/service/src/interpreters/interpreter_table_rename.rs @@ -15,9 +15,9 @@ use std::sync::Arc; use common_exception::Result; +use common_legacy_planners::RenameTablePlan; use common_meta_app::schema::RenameTableReq; use common_meta_app::schema::TableNameIdent; -use common_planners::RenameTablePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_table_show_create.rs b/src/query/service/src/interpreters/interpreter_table_show_create.rs index bc37dc0590175..9235d5a9fc0f6 100644 --- a/src/query/service/src/interpreters/interpreter_table_show_create.rs +++ b/src/query/service/src/interpreters/interpreter_table_show_create.rs @@ -17,7 +17,7 @@ use std::sync::Arc; use common_datablocks::DataBlock; use common_datavalues::prelude::*; use common_exception::Result; -use common_planners::ShowCreateTablePlan; +use common_legacy_planners::ShowCreateTablePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; use tracing::debug; diff --git a/src/query/service/src/interpreters/interpreter_table_truncate.rs b/src/query/service/src/interpreters/interpreter_table_truncate.rs index 18e69839f8037..f421b7ceaaec2 100644 --- a/src/query/service/src/interpreters/interpreter_table_truncate.rs +++ b/src/query/service/src/interpreters/interpreter_table_truncate.rs @@ -15,9 +15,9 @@ use std::sync::Arc; use common_exception::Result; +use common_legacy_planners::TruncateTablePlan; use common_meta_types::GrantObject; use common_meta_types::UserPrivilegeType; -use common_planners::TruncateTablePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_table_undrop.rs b/src/query/service/src/interpreters/interpreter_table_undrop.rs index 5eb90801967bd..25b18402145c6 100644 --- a/src/query/service/src/interpreters/interpreter_table_undrop.rs +++ b/src/query/service/src/interpreters/interpreter_table_undrop.rs @@ -15,9 +15,9 @@ use std::sync::Arc; use common_exception::Result; +use common_legacy_planners::UndropTablePlan; use common_meta_types::GrantObject; use common_meta_types::UserPrivilegeType; -use common_planners::UndropTablePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_use_database.rs b/src/query/service/src/interpreters/interpreter_use_database.rs index 4746a65420f0d..d2627b982846c 100644 --- a/src/query/service/src/interpreters/interpreter_use_database.rs +++ b/src/query/service/src/interpreters/interpreter_use_database.rs @@ -17,7 +17,7 @@ use std::sync::Arc; use common_datavalues::DataSchema; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::UseDatabasePlan; +use common_legacy_planners::UseDatabasePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_user_alter.rs b/src/query/service/src/interpreters/interpreter_user_alter.rs index c529b07fbe632..e306f40d787af 100644 --- a/src/query/service/src/interpreters/interpreter_user_alter.rs +++ b/src/query/service/src/interpreters/interpreter_user_alter.rs @@ -15,7 +15,7 @@ use std::sync::Arc; use common_exception::Result; -use common_planners::AlterUserPlan; +use common_legacy_planners::AlterUserPlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_user_create.rs b/src/query/service/src/interpreters/interpreter_user_create.rs index f5c007f1eb5fc..b40571f800bf7 100644 --- a/src/query/service/src/interpreters/interpreter_user_create.rs +++ b/src/query/service/src/interpreters/interpreter_user_create.rs @@ -15,10 +15,10 @@ use std::sync::Arc; use common_exception::Result; +use common_legacy_planners::CreateUserPlan; use common_meta_types::UserGrantSet; use common_meta_types::UserInfo; use common_meta_types::UserQuota; -use common_planners::CreateUserPlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_user_drop.rs b/src/query/service/src/interpreters/interpreter_user_drop.rs index c1aefa1523f5e..69d15999befdc 100644 --- a/src/query/service/src/interpreters/interpreter_user_drop.rs +++ b/src/query/service/src/interpreters/interpreter_user_drop.rs @@ -15,7 +15,7 @@ use std::sync::Arc; use common_exception::Result; -use common_planners::DropUserPlan; +use common_legacy_planners::DropUserPlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_user_stage_create.rs b/src/query/service/src/interpreters/interpreter_user_stage_create.rs index 685a69011d5f0..98eab1a0a903c 100644 --- a/src/query/service/src/interpreters/interpreter_user_stage_create.rs +++ b/src/query/service/src/interpreters/interpreter_user_stage_create.rs @@ -16,8 +16,8 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::CreateUserStagePlan; use common_meta_types::StageType; -use common_planners::CreateUserStagePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_user_stage_drop.rs b/src/query/service/src/interpreters/interpreter_user_stage_drop.rs index 6443f045a4fa2..93ab9ab2ca811 100644 --- a/src/query/service/src/interpreters/interpreter_user_stage_drop.rs +++ b/src/query/service/src/interpreters/interpreter_user_stage_drop.rs @@ -15,8 +15,8 @@ use std::sync::Arc; use common_exception::Result; +use common_legacy_planners::DropUserStagePlan; use common_meta_types::StageType; -use common_planners::DropUserStagePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; use tracing::info; diff --git a/src/query/service/src/interpreters/interpreter_user_stage_remove.rs b/src/query/service/src/interpreters/interpreter_user_stage_remove.rs index b5771289d1195..23fa7ee84a3ea 100644 --- a/src/query/service/src/interpreters/interpreter_user_stage_remove.rs +++ b/src/query/service/src/interpreters/interpreter_user_stage_remove.rs @@ -15,7 +15,7 @@ use std::sync::Arc; use common_exception::Result; -use common_planners::RemoveUserStagePlan; +use common_legacy_planners::RemoveUserStagePlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_user_udf_alter.rs b/src/query/service/src/interpreters/interpreter_user_udf_alter.rs index 48480d6cdb071..28a3e08f9101f 100644 --- a/src/query/service/src/interpreters/interpreter_user_udf_alter.rs +++ b/src/query/service/src/interpreters/interpreter_user_udf_alter.rs @@ -15,7 +15,7 @@ use std::sync::Arc; use common_exception::Result; -use common_planners::AlterUserUDFPlan; +use common_legacy_planners::AlterUserUDFPlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_user_udf_create.rs b/src/query/service/src/interpreters/interpreter_user_udf_create.rs index e9d2489f57104..b1870eb25c136 100644 --- a/src/query/service/src/interpreters/interpreter_user_udf_create.rs +++ b/src/query/service/src/interpreters/interpreter_user_udf_create.rs @@ -15,7 +15,7 @@ use std::sync::Arc; use common_exception::Result; -use common_planners::CreateUserUDFPlan; +use common_legacy_planners::CreateUserUDFPlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_user_udf_drop.rs b/src/query/service/src/interpreters/interpreter_user_udf_drop.rs index 3414c18e95446..acf0a19559097 100644 --- a/src/query/service/src/interpreters/interpreter_user_udf_drop.rs +++ b/src/query/service/src/interpreters/interpreter_user_udf_drop.rs @@ -15,7 +15,7 @@ use std::sync::Arc; use common_exception::Result; -use common_planners::DropUserUDFPlan; +use common_legacy_planners::DropUserUDFPlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_view_alter.rs b/src/query/service/src/interpreters/interpreter_view_alter.rs index be97fecbcc4f8..727e2c1c994ce 100644 --- a/src/query/service/src/interpreters/interpreter_view_alter.rs +++ b/src/query/service/src/interpreters/interpreter_view_alter.rs @@ -17,13 +17,13 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::AlterViewPlan; use common_meta_app::schema::CreateTableReq; use common_meta_app::schema::DropTableReq; use common_meta_app::schema::TableMeta; use common_meta_app::schema::TableNameIdent; use common_meta_types::GrantObject; use common_meta_types::UserPrivilegeType; -use common_planners::AlterViewPlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_view_create.rs b/src/query/service/src/interpreters/interpreter_view_create.rs index e69d7fe38f3dd..fa410da238afd 100644 --- a/src/query/service/src/interpreters/interpreter_view_create.rs +++ b/src/query/service/src/interpreters/interpreter_view_create.rs @@ -17,12 +17,12 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::CreateViewPlan; use common_meta_app::schema::CreateTableReq; use common_meta_app::schema::TableMeta; use common_meta_app::schema::TableNameIdent; use common_meta_types::GrantObject; use common_meta_types::UserPrivilegeType; -use common_planners::CreateViewPlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/interpreter_view_drop.rs b/src/query/service/src/interpreters/interpreter_view_drop.rs index d512131eea06e..099e650795842 100644 --- a/src/query/service/src/interpreters/interpreter_view_drop.rs +++ b/src/query/service/src/interpreters/interpreter_view_drop.rs @@ -16,11 +16,11 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::DropViewPlan; use common_meta_app::schema::DropTableReq; use common_meta_app::schema::TableNameIdent; use common_meta_types::GrantObject; use common_meta_types::UserPrivilegeType; -use common_planners::DropViewPlan; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/src/interpreters/plan_schedulers/plan_scheduler_query.rs b/src/query/service/src/interpreters/plan_schedulers/plan_scheduler_query.rs index 6165b868a0654..f1e5773be22ac 100644 --- a/src/query/service/src/interpreters/plan_schedulers/plan_scheduler_query.rs +++ b/src/query/service/src/interpreters/plan_schedulers/plan_scheduler_query.rs @@ -15,7 +15,7 @@ use std::sync::Arc; use common_exception::Result; -use common_planners::PlanNode; +use common_legacy_planners::PlanNode; use tracing::debug; use crate::interpreters::fragments::Fragmenter; diff --git a/src/query/service/src/interpreters/plan_schedulers/plan_scheduler_rewriter.rs b/src/query/service/src/interpreters/plan_schedulers/plan_scheduler_rewriter.rs index 40a60229e535d..1404ad6edb2ba 100644 --- a/src/query/service/src/interpreters/plan_schedulers/plan_scheduler_rewriter.rs +++ b/src/query/service/src/interpreters/plan_schedulers/plan_scheduler_rewriter.rs @@ -13,7 +13,7 @@ // limitations under the License. use common_exception::Result; -use common_planners::PlanNode; +use common_legacy_planners::PlanNode; use crate::optimizers::Optimizers; diff --git a/src/query/service/src/optimizers/optimizer.rs b/src/query/service/src/optimizers/optimizer.rs index 2d1c4f43336fe..bbb38e1d3fc0e 100644 --- a/src/query/service/src/optimizers/optimizer.rs +++ b/src/query/service/src/optimizers/optimizer.rs @@ -15,7 +15,7 @@ use std::sync::Arc; use std::time::Instant; use common_exception::Result; -use common_planners::PlanNode; +use common_legacy_planners::PlanNode; use metrics::histogram; use tracing::debug; diff --git a/src/query/service/src/optimizers/optimizer_constant_folding.rs b/src/query/service/src/optimizers/optimizer_constant_folding.rs index aa18016a6f081..ff1e53fae2b74 100644 --- a/src/query/service/src/optimizers/optimizer_constant_folding.rs +++ b/src/query/service/src/optimizers/optimizer_constant_folding.rs @@ -19,14 +19,14 @@ use common_datavalues::prelude::*; use common_exception::ErrorCode; use common_exception::Result; use common_functions::scalars::FunctionFactory; -use common_planners::AggregatorFinalPlan; -use common_planners::AggregatorPartialPlan; -use common_planners::Expression; -use common_planners::ExpressionRewriter; -use common_planners::Expressions; -use common_planners::PlanBuilder; -use common_planners::PlanNode; -use common_planners::PlanRewriter; +use common_legacy_planners::AggregatorFinalPlan; +use common_legacy_planners::AggregatorPartialPlan; +use common_legacy_planners::Expression; +use common_legacy_planners::ExpressionRewriter; +use common_legacy_planners::Expressions; +use common_legacy_planners::PlanBuilder; +use common_legacy_planners::PlanNode; +use common_legacy_planners::PlanRewriter; use crate::optimizers::Optimizer; use crate::pipelines::processors::transforms::ExpressionExecutor; diff --git a/src/query/service/src/optimizers/optimizer_expression_transform.rs b/src/query/service/src/optimizers/optimizer_expression_transform.rs index 98f1df4dc2325..063e70c19fd32 100644 --- a/src/query/service/src/optimizers/optimizer_expression_transform.rs +++ b/src/query/service/src/optimizers/optimizer_expression_transform.rs @@ -18,7 +18,7 @@ use common_datavalues::prelude::*; use common_exception::ErrorCode; use common_exception::Result; use common_functions::scalars::FunctionFactory; -use common_planners::*; +use common_legacy_planners::*; use crate::optimizers::Optimizer; use crate::sessions::QueryContext; diff --git a/src/query/service/src/optimizers/optimizer_scatters.rs b/src/query/service/src/optimizers/optimizer_scatters.rs index 118f137b9368f..be5573586aec7 100644 --- a/src/query/service/src/optimizers/optimizer_scatters.rs +++ b/src/query/service/src/optimizers/optimizer_scatters.rs @@ -18,20 +18,20 @@ use common_datavalues::DataSchemaRef; use common_datavalues::DataValue; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::AggregatorFinalPlan; -use common_planners::AggregatorPartialPlan; -use common_planners::BroadcastPlan; -use common_planners::Expression; -use common_planners::LimitByPlan; -use common_planners::LimitPlan; -use common_planners::PlanBuilder; -use common_planners::PlanNode; -use common_planners::PlanRewriter; -use common_planners::ReadDataSourcePlan; -use common_planners::SortPlan; -use common_planners::StageKind; -use common_planners::StagePlan; -use common_planners::WindowFuncPlan; +use common_legacy_planners::AggregatorFinalPlan; +use common_legacy_planners::AggregatorPartialPlan; +use common_legacy_planners::BroadcastPlan; +use common_legacy_planners::Expression; +use common_legacy_planners::LimitByPlan; +use common_legacy_planners::LimitPlan; +use common_legacy_planners::PlanBuilder; +use common_legacy_planners::PlanNode; +use common_legacy_planners::PlanRewriter; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::SortPlan; +use common_legacy_planners::StageKind; +use common_legacy_planners::StagePlan; +use common_legacy_planners::WindowFuncPlan; use enum_extract::let_extract; use crate::clusters::ClusterHelper; diff --git a/src/query/service/src/optimizers/optimizer_statistics_exact.rs b/src/query/service/src/optimizers/optimizer_statistics_exact.rs index 466c2366085c7..20e59dcde3089 100644 --- a/src/query/service/src/optimizers/optimizer_statistics_exact.rs +++ b/src/query/service/src/optimizers/optimizer_statistics_exact.rs @@ -18,12 +18,12 @@ use common_catalog::catalog::CATALOG_DEFAULT; use common_datavalues::prelude::ToDataType; use common_datavalues::DataValue; use common_exception::Result; -use common_planners::AggregatorFinalPlan; -use common_planners::AggregatorPartialPlan; -use common_planners::Expression; -use common_planners::PlanBuilder; -use common_planners::PlanNode; -use common_planners::PlanRewriter; +use common_legacy_planners::AggregatorFinalPlan; +use common_legacy_planners::AggregatorPartialPlan; +use common_legacy_planners::Expression; +use common_legacy_planners::PlanBuilder; +use common_legacy_planners::PlanNode; +use common_legacy_planners::PlanRewriter; use crate::optimizers::Optimizer; use crate::sessions::QueryContext; diff --git a/src/query/service/src/optimizers/optimizer_top_n_push_down.rs b/src/query/service/src/optimizers/optimizer_top_n_push_down.rs index fecee1ff10386..e711d7bd2243e 100644 --- a/src/query/service/src/optimizers/optimizer_top_n_push_down.rs +++ b/src/query/service/src/optimizers/optimizer_top_n_push_down.rs @@ -19,7 +19,7 @@ use common_datavalues::prelude::ColumnWithField; use common_datavalues::DataSchemaRef; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::*; +use common_legacy_planners::*; use tracing::error; use crate::optimizers::Optimizer; diff --git a/src/query/service/src/pipelines/pipeline_builder.rs b/src/query/service/src/pipelines/pipeline_builder.rs index 45f3a171acf93..73004239cb4e6 100644 --- a/src/query/service/src/pipelines/pipeline_builder.rs +++ b/src/query/service/src/pipelines/pipeline_builder.rs @@ -19,22 +19,22 @@ use common_base::base::tokio::sync::broadcast::Receiver; use common_datavalues::DataValue; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::AggregatorFinalPlan; -use common_planners::AggregatorPartialPlan; -use common_planners::Expression; -use common_planners::ExpressionPlan; -use common_planners::FilterPlan; -use common_planners::HavingPlan; -use common_planners::LimitByPlan; -use common_planners::LimitPlan; -use common_planners::PlanNode; -use common_planners::PlanVisitor; -use common_planners::ProjectionPlan; -use common_planners::ReadDataSourcePlan; -use common_planners::RemotePlan; -use common_planners::SortPlan; -use common_planners::SubQueriesSetPlan; -use common_planners::WindowFuncPlan; +use common_legacy_planners::AggregatorFinalPlan; +use common_legacy_planners::AggregatorPartialPlan; +use common_legacy_planners::Expression; +use common_legacy_planners::ExpressionPlan; +use common_legacy_planners::FilterPlan; +use common_legacy_planners::HavingPlan; +use common_legacy_planners::LimitByPlan; +use common_legacy_planners::LimitPlan; +use common_legacy_planners::PlanNode; +use common_legacy_planners::PlanVisitor; +use common_legacy_planners::ProjectionPlan; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::RemotePlan; +use common_legacy_planners::SortPlan; +use common_legacy_planners::SubQueriesSetPlan; +use common_legacy_planners::WindowFuncPlan; use super::processors::transforms::TransformWindowFunc; use super::processors::transforms::WindowFuncCompact; diff --git a/src/query/service/src/pipelines/processors/transforms/aggregator/aggregator_params.rs b/src/query/service/src/pipelines/processors/transforms/aggregator/aggregator_params.rs index af91d87999df3..9490dcb69afc0 100644 --- a/src/query/service/src/pipelines/processors/transforms/aggregator/aggregator_params.rs +++ b/src/query/service/src/pipelines/processors/transforms/aggregator/aggregator_params.rs @@ -22,7 +22,7 @@ use common_datavalues::DataSchemaRef; use common_exception::Result; use common_functions::aggregates::get_layout_offsets; use common_functions::aggregates::AggregateFunctionRef; -use common_planners::Expression; +use common_legacy_planners::Expression; use crate::pipelines::processors::port::InputPort; use crate::pipelines::processors::port::OutputPort; diff --git a/src/query/service/src/pipelines/processors/transforms/group_by/aggregator_params.rs b/src/query/service/src/pipelines/processors/transforms/group_by/aggregator_params.rs index a13953b8bdfc4..d75c52a8f0538 100644 --- a/src/query/service/src/pipelines/processors/transforms/group_by/aggregator_params.rs +++ b/src/query/service/src/pipelines/processors/transforms/group_by/aggregator_params.rs @@ -19,7 +19,7 @@ use common_datavalues::DataSchemaRef; use common_exception::Result; use common_functions::aggregates::get_layout_offsets; use common_functions::aggregates::AggregateFunctionRef; -use common_planners::Expression; +use common_legacy_planners::Expression; pub struct AggregatorParams { pub schema: DataSchemaRef, diff --git a/src/query/service/src/pipelines/processors/transforms/transform_filter.rs b/src/query/service/src/pipelines/processors/transforms/transform_filter.rs index 0a87c1147aaa7..b08738d8a6651 100644 --- a/src/query/service/src/pipelines/processors/transforms/transform_filter.rs +++ b/src/query/service/src/pipelines/processors/transforms/transform_filter.rs @@ -19,7 +19,7 @@ use common_datavalues::DataSchemaRef; use common_datavalues::DataSchemaRefExt; use common_datavalues::DataType; use common_exception::Result; -use common_planners::Expression; +use common_legacy_planners::Expression; use crate::pipelines::processors::port::InputPort; use crate::pipelines::processors::port::OutputPort; diff --git a/src/query/service/src/pipelines/processors/transforms/transform_limit_by.rs b/src/query/service/src/pipelines/processors/transforms/transform_limit_by.rs index 4ad16c9eb1dcd..01258f10661bb 100644 --- a/src/query/service/src/pipelines/processors/transforms/transform_limit_by.rs +++ b/src/query/service/src/pipelines/processors/transforms/transform_limit_by.rs @@ -23,7 +23,7 @@ use common_datablocks::DataBlock; use common_datablocks::HashMethod; use common_datablocks::HashMethodSerializer; use common_exception::Result; -use common_planners::Expression; +use common_legacy_planners::Expression; use crate::pipelines::processors::port::InputPort; use crate::pipelines::processors::port::OutputPort; diff --git a/src/query/service/src/pipelines/processors/transforms/transform_window_func.rs b/src/query/service/src/pipelines/processors/transforms/transform_window_func.rs index e443e1a894805..2e77d38e5d7b2 100644 --- a/src/query/service/src/pipelines/processors/transforms/transform_window_func.rs +++ b/src/query/service/src/pipelines/processors/transforms/transform_window_func.rs @@ -35,7 +35,7 @@ use common_functions::scalars::assert_numeric; use common_functions::window::WindowFrame; use common_functions::window::WindowFrameBound; use common_functions::window::WindowFrameUnits; -use common_planners::Expression; +use common_legacy_planners::Expression; use enum_extract::let_extract; use segment_tree::ops::Commutative; use segment_tree::ops::Identity; diff --git a/src/query/service/src/procedures/procedure.rs b/src/query/service/src/procedures/procedure.rs index e750ab687e0b7..40d4335348f87 100644 --- a/src/query/service/src/procedures/procedure.rs +++ b/src/query/service/src/procedures/procedure.rs @@ -18,11 +18,11 @@ use common_datablocks::DataBlock; use common_datavalues::DataSchema; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::validate_function_arg; use common_pipeline_core::processors::port::OutputPort; use common_pipeline_core::Pipe; use common_pipeline_core::Pipeline; use common_pipeline_sources::processors::sources::StreamSource; -use common_planners::validate_function_arg; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; use futures::StreamExt; diff --git a/src/query/service/src/procedures/systems/search_tables.rs b/src/query/service/src/procedures/systems/search_tables.rs index 6aa37fe6c9c5c..1280a224fa9ce 100644 --- a/src/query/service/src/procedures/systems/search_tables.rs +++ b/src/query/service/src/procedures/systems/search_tables.rs @@ -18,7 +18,7 @@ use common_datablocks::DataBlock; use common_datavalues::DataSchema; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::PlanNode; +use common_legacy_planners::PlanNode; use futures::TryStreamExt; use crate::interpreters::Interpreter; diff --git a/src/query/service/src/servers/http/v1/load.rs b/src/query/service/src/servers/http/v1/load.rs index a6570920d31c9..0a1df2d06c2c0 100644 --- a/src/query/service/src/servers/http/v1/load.rs +++ b/src/query/service/src/servers/http/v1/load.rs @@ -23,8 +23,8 @@ use common_exception::Result; use common_formats::FormatFactory; use common_io::prelude::parse_escape_string; use common_io::prelude::FormatSettings; -use common_planners::InsertInputSource; -use common_planners::PlanNode; +use common_legacy_planners::InsertInputSource; +use common_legacy_planners::PlanNode; use futures::StreamExt; use poem::error::InternalServerError; use poem::error::Result as PoemResult; diff --git a/src/query/service/src/servers/http/v1/query/execute_state.rs b/src/query/service/src/servers/http/v1/query/execute_state.rs index f0d34c05f6b6e..484d3b7e0cae3 100644 --- a/src/query/service/src/servers/http/v1/query/execute_state.rs +++ b/src/query/service/src/servers/http/v1/query/execute_state.rs @@ -28,7 +28,7 @@ use common_datavalues::DataField; use common_datavalues::DataSchemaRefExt; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::PlanNode; +use common_legacy_planners::PlanNode; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; use futures::future::AbortHandle; diff --git a/src/query/service/src/servers/mysql/mysql_interactive_worker.rs b/src/query/service/src/servers/mysql/mysql_interactive_worker.rs index 845873734826d..21ffb0a912acc 100644 --- a/src/query/service/src/servers/mysql/mysql_interactive_worker.rs +++ b/src/query/service/src/servers/mysql/mysql_interactive_worker.rs @@ -23,7 +23,7 @@ use common_exception::ErrorCode; use common_exception::Result; use common_exception::ToErrorCode; use common_io::prelude::*; -use common_planners::PlanNode; +use common_legacy_planners::PlanNode; use common_streams::DataBlockStream; use common_streams::SendableDataBlockStream; use common_users::CertifiedInfo; diff --git a/src/query/service/src/sessions/query_ctx.rs b/src/query/service/src/sessions/query_ctx.rs index 5433727745639..25979d8159459 100644 --- a/src/query/service/src/sessions/query_ctx.rs +++ b/src/query/service/src/sessions/query_ctx.rs @@ -32,16 +32,16 @@ use common_exception::ErrorCode; use common_exception::Result; use common_functions::scalars::FunctionContext; use common_io::prelude::FormatSettings; +use common_legacy_planners::Expression; +use common_legacy_planners::PartInfoPtr; +use common_legacy_planners::Partitions; +use common_legacy_planners::PlanNode; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::SourceInfo; +use common_legacy_planners::StageTableInfo; +use common_legacy_planners::Statistics; use common_meta_app::schema::TableInfo; use common_meta_types::UserInfo; -use common_planners::Expression; -use common_planners::PartInfoPtr; -use common_planners::Partitions; -use common_planners::PlanNode; -use common_planners::ReadDataSourcePlan; -use common_planners::SourceInfo; -use common_planners::StageTableInfo; -use common_planners::Statistics; use common_streams::AbortStream; use common_streams::SendableDataBlockStream; use common_users::UserApiProvider; diff --git a/src/query/service/src/sessions/query_ctx_shared.rs b/src/query/service/src/sessions/query_ctx_shared.rs index 39d59bf5efefe..108f7884da46c 100644 --- a/src/query/service/src/sessions/query_ctx_shared.rs +++ b/src/query/service/src/sessions/query_ctx_shared.rs @@ -24,8 +24,8 @@ use common_base::base::Runtime; use common_contexts::DalContext; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::PlanNode; use common_meta_types::UserInfo; -use common_planners::PlanNode; use common_storage::StorageOperator; use common_users::UserApiProvider; use futures::future::AbortHandle; diff --git a/src/query/service/src/sql/executor/expression_builder.rs b/src/query/service/src/sql/executor/expression_builder.rs index f3d3cd49aeedc..1f70f65833e00 100644 --- a/src/query/service/src/sql/executor/expression_builder.rs +++ b/src/query/service/src/sql/executor/expression_builder.rs @@ -16,7 +16,7 @@ use common_datavalues::DataTypeImpl; use common_datavalues::DataValue; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::Expression; +use common_legacy_planners::Expression; use crate::sql::executor::util::format_field_name; use crate::sql::plans::AggregateFunction; diff --git a/src/query/service/src/sql/executor/format.rs b/src/query/service/src/sql/executor/format.rs index 91907970406a4..54def7155fa3f 100644 --- a/src/query/service/src/sql/executor/format.rs +++ b/src/query/service/src/sql/executor/format.rs @@ -15,7 +15,7 @@ use common_ast::ast::FormatTreeNode; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::StageKind; +use common_legacy_planners::StageKind; use itertools::Itertools; use super::AggregateFinal; diff --git a/src/query/service/src/sql/executor/physical_plan.rs b/src/query/service/src/sql/executor/physical_plan.rs index 724a0b4347697..4f72a8359f0cd 100644 --- a/src/query/service/src/sql/executor/physical_plan.rs +++ b/src/query/service/src/sql/executor/physical_plan.rs @@ -24,8 +24,8 @@ use common_datavalues::NullableType; use common_datavalues::ToDataType; use common_datavalues::Vu8; use common_exception::Result; -use common_planners::ReadDataSourcePlan; -use common_planners::StageKind; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::StageKind; use super::physical_scalar::PhysicalScalar; use super::AggregateFunctionDesc; diff --git a/src/query/service/src/sql/executor/physical_plan_builder.rs b/src/query/service/src/sql/executor/physical_plan_builder.rs index a53bfcb8fb657..c59b397a1874f 100644 --- a/src/query/service/src/sql/executor/physical_plan_builder.rs +++ b/src/query/service/src/sql/executor/physical_plan_builder.rs @@ -20,11 +20,11 @@ use common_catalog::catalog::CATALOG_DEFAULT; use common_datavalues::DataSchemaRef; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::Expression; -use common_planners::Extras; -use common_planners::PrewhereInfo; -use common_planners::Projection; -use common_planners::StageKind; +use common_legacy_planners::Expression; +use common_legacy_planners::Extras; +use common_legacy_planners::PrewhereInfo; +use common_legacy_planners::Projection; +use common_legacy_planners::StageKind; use common_storages_fuse::TableContext; use itertools::Itertools; diff --git a/src/query/service/src/sql/parsers/parser_explain.rs b/src/query/service/src/sql/parsers/parser_explain.rs index 7a5be15130e8e..cc7edb598893f 100644 --- a/src/query/service/src/sql/parsers/parser_explain.rs +++ b/src/query/service/src/sql/parsers/parser_explain.rs @@ -15,7 +15,7 @@ // Borrow from apache/arrow/rust/datafusion/src/sql/sql_parser // See notice.md -use common_planners::ExplainType; +use common_legacy_planners::ExplainType; use sqlparser::parser::ParserError; use sqlparser::tokenizer::Token; diff --git a/src/query/service/src/sql/plan_parser.rs b/src/query/service/src/sql/plan_parser.rs index fbd452f88d8fc..444a120841f66 100644 --- a/src/query/service/src/sql/plan_parser.rs +++ b/src/query/service/src/sql/plan_parser.rs @@ -16,12 +16,12 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::EmptyPlan; -use common_planners::ExplainPlan; -use common_planners::Expression; -use common_planners::PlanBuilder; -use common_planners::PlanNode; -use common_planners::SelectPlan; +use common_legacy_planners::EmptyPlan; +use common_legacy_planners::ExplainPlan; +use common_legacy_planners::Expression; +use common_legacy_planners::PlanBuilder; +use common_legacy_planners::PlanNode; +use common_legacy_planners::SelectPlan; use tracing::debug; use crate::sessions::QueryContext; diff --git a/src/query/service/src/sql/planner/binder/copy.rs b/src/query/service/src/sql/planner/binder/copy.rs index d0683421dd63f..08fd1879b12c2 100644 --- a/src/query/service/src/sql/planner/binder/copy.rs +++ b/src/query/service/src/sql/planner/binder/copy.rs @@ -24,10 +24,10 @@ use common_ast::Backtrace; use common_ast::Dialect; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::SourceInfo; +use common_legacy_planners::StageTableInfo; use common_meta_types::UserStageInfo; -use common_planners::ReadDataSourcePlan; -use common_planners::SourceInfo; -use common_planners::StageTableInfo; use common_storage::parse_uri_location; use common_storage::UriLocation; diff --git a/src/query/service/src/sql/planner/binder/ddl/account.rs b/src/query/service/src/sql/planner/binder/ddl/account.rs index dc90d76f9c534..1b93d34d5737f 100644 --- a/src/query/service/src/sql/planner/binder/ddl/account.rs +++ b/src/query/service/src/sql/planner/binder/ddl/account.rs @@ -19,16 +19,16 @@ use common_ast::ast::CreateUserStmt; use common_ast::ast::GrantStmt; use common_ast::ast::RevokeStmt; use common_exception::Result; +use common_legacy_planners::AlterUserPlan; +use common_legacy_planners::CreateUserPlan; +use common_legacy_planners::GrantPrivilegePlan; +use common_legacy_planners::GrantRolePlan; +use common_legacy_planners::RevokePrivilegePlan; +use common_legacy_planners::RevokeRolePlan; use common_meta_types::AuthInfo; use common_meta_types::GrantObject; use common_meta_types::UserOption; use common_meta_types::UserPrivilegeSet; -use common_planners::AlterUserPlan; -use common_planners::CreateUserPlan; -use common_planners::GrantPrivilegePlan; -use common_planners::GrantRolePlan; -use common_planners::RevokePrivilegePlan; -use common_planners::RevokeRolePlan; use crate::sessions::TableContext; use crate::sql::plans::Plan; diff --git a/src/query/service/src/sql/planner/binder/ddl/database.rs b/src/query/service/src/sql/planner/binder/ddl/database.rs index be79c84b19af7..16d7e5a814a87 100644 --- a/src/query/service/src/sql/planner/binder/ddl/database.rs +++ b/src/query/service/src/sql/planner/binder/ddl/database.rs @@ -30,14 +30,14 @@ use common_datavalues::DataSchemaRefExt; use common_datavalues::ToDataType; use common_datavalues::Vu8; use common_exception::Result; +use common_legacy_planners::CreateDatabasePlan; +use common_legacy_planners::DropDatabasePlan; +use common_legacy_planners::RenameDatabaseEntity; +use common_legacy_planners::RenameDatabasePlan; +use common_legacy_planners::ShowCreateDatabasePlan; +use common_legacy_planners::UndropDatabasePlan; use common_meta_app::schema::DatabaseMeta; use common_meta_app::share::ShareNameIdent; -use common_planners::CreateDatabasePlan; -use common_planners::DropDatabasePlan; -use common_planners::RenameDatabaseEntity; -use common_planners::RenameDatabasePlan; -use common_planners::ShowCreateDatabasePlan; -use common_planners::UndropDatabasePlan; use crate::sessions::TableContext; use crate::sql::binder::Binder; diff --git a/src/query/service/src/sql/planner/binder/ddl/stage.rs b/src/query/service/src/sql/planner/binder/ddl/stage.rs index c216b9a53343b..6f0e70007b1a5 100644 --- a/src/query/service/src/sql/planner/binder/ddl/stage.rs +++ b/src/query/service/src/sql/planner/binder/ddl/stage.rs @@ -17,12 +17,12 @@ use std::str::FromStr; use common_ast::ast::CreateStageStmt; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::CreateUserStagePlan; +use common_legacy_planners::ListPlan; +use common_legacy_planners::RemoveUserStagePlan; use common_meta_types::OnErrorMode; use common_meta_types::StageType; use common_meta_types::UserStageInfo; -use common_planners::CreateUserStagePlan; -use common_planners::ListPlan; -use common_planners::RemoveUserStagePlan; use common_storage::parse_uri_location; use common_storage::UriLocation; diff --git a/src/query/service/src/sql/planner/binder/ddl/table.rs b/src/query/service/src/sql/planner/binder/ddl/table.rs index 3061dcf6eab81..7715913395848 100644 --- a/src/query/service/src/sql/planner/binder/ddl/table.rs +++ b/src/query/service/src/sql/planner/binder/ddl/table.rs @@ -33,9 +33,9 @@ use common_datavalues::TypeFactory; use common_datavalues::Vu8; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::OptimizeTableAction; +use common_legacy_planners::*; use common_meta_app::schema::TableMeta; -use common_planners::OptimizeTableAction; -use common_planners::*; use tracing::debug; use crate::catalogs::DatabaseCatalog; diff --git a/src/query/service/src/sql/planner/binder/ddl/view.rs b/src/query/service/src/sql/planner/binder/ddl/view.rs index 91ea8a0755da4..a99f838dad6c0 100644 --- a/src/query/service/src/sql/planner/binder/ddl/view.rs +++ b/src/query/service/src/sql/planner/binder/ddl/view.rs @@ -16,9 +16,9 @@ use common_ast::ast::AlterViewStmt; use common_ast::ast::CreateViewStmt; use common_ast::ast::DropViewStmt; use common_exception::Result; -use common_planners::AlterViewPlan; -use common_planners::CreateViewPlan; -use common_planners::DropViewPlan; +use common_legacy_planners::AlterViewPlan; +use common_legacy_planners::CreateViewPlan; +use common_legacy_planners::DropViewPlan; use crate::sessions::TableContext; use crate::sql::binder::Binder; diff --git a/src/query/service/src/sql/planner/binder/delete.rs b/src/query/service/src/sql/planner/binder/delete.rs index a02a748e84b45..6de2b7c986bc7 100644 --- a/src/query/service/src/sql/planner/binder/delete.rs +++ b/src/query/service/src/sql/planner/binder/delete.rs @@ -18,9 +18,9 @@ use common_ast::ast::Expr; use common_ast::ast::TableReference; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::DeletePlan; -use common_planners::Expression; -use common_planners::Projection; +use common_legacy_planners::DeletePlan; +use common_legacy_planners::Expression; +use common_legacy_planners::Projection; use crate::sessions::TableContext; use crate::sql::binder::Binder; diff --git a/src/query/service/src/sql/planner/binder/kill.rs b/src/query/service/src/sql/planner/binder/kill.rs index a4bbed74f3f3b..7b9c049387912 100644 --- a/src/query/service/src/sql/planner/binder/kill.rs +++ b/src/query/service/src/sql/planner/binder/kill.rs @@ -14,7 +14,7 @@ use common_ast::ast::KillTarget; use common_exception::Result; -use common_planners::KillPlan; +use common_legacy_planners::KillPlan; use crate::sql::planner::binder::BindContext; use crate::sql::planner::binder::Binder; diff --git a/src/query/service/src/sql/planner/binder/mod.rs b/src/query/service/src/sql/planner/binder/mod.rs index d60906c2ad92b..16dede858361f 100644 --- a/src/query/service/src/sql/planner/binder/mod.rs +++ b/src/query/service/src/sql/planner/binder/mod.rs @@ -24,17 +24,17 @@ use common_ast::Dialect; use common_ast::UDFValidator; use common_datavalues::DataTypeImpl; use common_exception::Result; +use common_legacy_planners::AlterUserUDFPlan; +use common_legacy_planners::CallPlan; +use common_legacy_planners::CreateRolePlan; +use common_legacy_planners::CreateUserUDFPlan; +use common_legacy_planners::DropRolePlan; +use common_legacy_planners::DropUserPlan; +use common_legacy_planners::DropUserStagePlan; +use common_legacy_planners::DropUserUDFPlan; +use common_legacy_planners::ShowGrantsPlan; +use common_legacy_planners::UseDatabasePlan; use common_meta_types::UserDefinedFunction; -use common_planners::AlterUserUDFPlan; -use common_planners::CallPlan; -use common_planners::CreateRolePlan; -use common_planners::CreateUserUDFPlan; -use common_planners::DropRolePlan; -use common_planners::DropUserPlan; -use common_planners::DropUserStagePlan; -use common_planners::DropUserUDFPlan; -use common_planners::ShowGrantsPlan; -use common_planners::UseDatabasePlan; pub use scalar::ScalarBinder; pub use scalar_common::*; diff --git a/src/query/service/src/sql/planner/binder/setting.rs b/src/query/service/src/sql/planner/binder/setting.rs index a63700e140383..e5b1cbe78b2d9 100644 --- a/src/query/service/src/sql/planner/binder/setting.rs +++ b/src/query/service/src/sql/planner/binder/setting.rs @@ -15,8 +15,8 @@ use common_ast::ast::Identifier; use common_ast::ast::Literal; use common_exception::Result; -use common_planners::SettingPlan; -use common_planners::VarValue; +use common_legacy_planners::SettingPlan; +use common_legacy_planners::VarValue; use super::BindContext; use super::Binder; diff --git a/src/query/service/src/sql/planner/binder/table.rs b/src/query/service/src/sql/planner/binder/table.rs index f6e117d1de644..cac430cf16f1c 100644 --- a/src/query/service/src/sql/planner/binder/table.rs +++ b/src/query/service/src/sql/planner/binder/table.rs @@ -30,7 +30,7 @@ use common_catalog::catalog::CATALOG_DEFAULT; use common_datavalues::prelude::*; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::Expression; +use common_legacy_planners::Expression; use crate::sessions::TableContext; use crate::sql::binder::scalar::ScalarBinder; diff --git a/src/query/service/src/sql/planner/plans/copy_v2.rs b/src/query/service/src/sql/planner/plans/copy_v2.rs index 2e666c7795e96..2deaabe67e914 100644 --- a/src/query/service/src/sql/planner/plans/copy_v2.rs +++ b/src/query/service/src/sql/planner/plans/copy_v2.rs @@ -17,9 +17,9 @@ use std::fmt::Formatter; use std::str::FromStr; use common_datavalues::DataSchemaRef; +use common_legacy_planners::ReadDataSourcePlan; use common_meta_types::MetaId; use common_meta_types::UserStageInfo; -use common_planners::ReadDataSourcePlan; use crate::sql::plans::Plan; diff --git a/src/query/service/src/sql/planner/plans/mod.rs b/src/query/service/src/sql/planner/plans/mod.rs index e2254a4a1823f..bcce440896206 100644 --- a/src/query/service/src/sql/planner/plans/mod.rs +++ b/src/query/service/src/sql/planner/plans/mod.rs @@ -45,47 +45,47 @@ use common_datavalues::DataSchemaRef; use common_datavalues::DataSchemaRefExt; use common_datavalues::ToDataType; use common_datavalues::Vu8; -use common_planners::AlterTableClusterKeyPlan; -use common_planners::AlterUserPlan; -use common_planners::AlterUserUDFPlan; -use common_planners::AlterViewPlan; -use common_planners::CallPlan; -use common_planners::CreateDatabasePlan; -use common_planners::CreateRolePlan; -use common_planners::CreateUserPlan; -use common_planners::CreateUserStagePlan; -use common_planners::CreateUserUDFPlan; -use common_planners::CreateViewPlan; -use common_planners::DeletePlan; -use common_planners::DescribeTablePlan; -use common_planners::DropDatabasePlan; -use common_planners::DropRolePlan; -use common_planners::DropTableClusterKeyPlan; -use common_planners::DropTablePlan; -use common_planners::DropUserPlan; -use common_planners::DropUserStagePlan; -use common_planners::DropUserUDFPlan; -use common_planners::DropViewPlan; -use common_planners::ExistsTablePlan; -use common_planners::GrantPrivilegePlan; -use common_planners::GrantRolePlan; -use common_planners::KillPlan; -use common_planners::ListPlan; -use common_planners::OptimizeTablePlan; -use common_planners::ReclusterTablePlan; -use common_planners::RemoveUserStagePlan; -use common_planners::RenameDatabasePlan; -use common_planners::RenameTablePlan; -use common_planners::RevokePrivilegePlan; -use common_planners::RevokeRolePlan; -use common_planners::SettingPlan; -use common_planners::ShowCreateDatabasePlan; -use common_planners::ShowCreateTablePlan; -use common_planners::ShowGrantsPlan; -use common_planners::TruncateTablePlan; -use common_planners::UndropDatabasePlan; -use common_planners::UndropTablePlan; -use common_planners::UseDatabasePlan; +use common_legacy_planners::AlterTableClusterKeyPlan; +use common_legacy_planners::AlterUserPlan; +use common_legacy_planners::AlterUserUDFPlan; +use common_legacy_planners::AlterViewPlan; +use common_legacy_planners::CallPlan; +use common_legacy_planners::CreateDatabasePlan; +use common_legacy_planners::CreateRolePlan; +use common_legacy_planners::CreateUserPlan; +use common_legacy_planners::CreateUserStagePlan; +use common_legacy_planners::CreateUserUDFPlan; +use common_legacy_planners::CreateViewPlan; +use common_legacy_planners::DeletePlan; +use common_legacy_planners::DescribeTablePlan; +use common_legacy_planners::DropDatabasePlan; +use common_legacy_planners::DropRolePlan; +use common_legacy_planners::DropTableClusterKeyPlan; +use common_legacy_planners::DropTablePlan; +use common_legacy_planners::DropUserPlan; +use common_legacy_planners::DropUserStagePlan; +use common_legacy_planners::DropUserUDFPlan; +use common_legacy_planners::DropViewPlan; +use common_legacy_planners::ExistsTablePlan; +use common_legacy_planners::GrantPrivilegePlan; +use common_legacy_planners::GrantRolePlan; +use common_legacy_planners::KillPlan; +use common_legacy_planners::ListPlan; +use common_legacy_planners::OptimizeTablePlan; +use common_legacy_planners::ReclusterTablePlan; +use common_legacy_planners::RemoveUserStagePlan; +use common_legacy_planners::RenameDatabasePlan; +use common_legacy_planners::RenameTablePlan; +use common_legacy_planners::RevokePrivilegePlan; +use common_legacy_planners::RevokeRolePlan; +use common_legacy_planners::SettingPlan; +use common_legacy_planners::ShowCreateDatabasePlan; +use common_legacy_planners::ShowCreateTablePlan; +use common_legacy_planners::ShowGrantsPlan; +use common_legacy_planners::TruncateTablePlan; +use common_legacy_planners::UndropDatabasePlan; +use common_legacy_planners::UndropTablePlan; +use common_legacy_planners::UseDatabasePlan; pub use copy_v2::CopyPlanV2; pub use copy_v2::ValidationMode; pub use create_table_v2::CreateTablePlanV2; diff --git a/src/query/service/src/sql/planner/semantic/type_check.rs b/src/query/service/src/sql/planner/semantic/type_check.rs index a3dbf120d8694..00b8c102f2e55 100644 --- a/src/query/service/src/sql/planner/semantic/type_check.rs +++ b/src/query/service/src/sql/planner/semantic/type_check.rs @@ -51,7 +51,7 @@ use common_functions::is_builtin_function; use common_functions::scalars::CastFunction; use common_functions::scalars::FunctionFactory; use common_functions::scalars::TupleFunction; -use common_planners::validate_function_arg; +use common_legacy_planners::validate_function_arg; use super::name_resolution::NameResolutionContext; use super::normalize_identifier; diff --git a/src/query/service/src/sql/statements/analyzer_expr.rs b/src/query/service/src/sql/statements/analyzer_expr.rs index 0c35451454b83..28efc6502f36a 100644 --- a/src/query/service/src/sql/statements/analyzer_expr.rs +++ b/src/query/service/src/sql/statements/analyzer_expr.rs @@ -21,7 +21,7 @@ use common_exception::ErrorCode; use common_exception::Result; use common_functions::aggregates::AggregateFunctionFactory; use common_legacy_parser::analyzer_expr_sync::*; -use common_planners::Expression; +use common_legacy_planners::Expression; use sqlparser::ast::Expr; use sqlparser::ast::FunctionArgExpr; use sqlparser::ast::Ident; diff --git a/src/query/service/src/sql/statements/analyzer_statement.rs b/src/query/service/src/sql/statements/analyzer_statement.rs index b753c3f6337b4..cceb71fc56fff 100644 --- a/src/query/service/src/sql/statements/analyzer_statement.rs +++ b/src/query/service/src/sql/statements/analyzer_statement.rs @@ -18,10 +18,10 @@ use std::sync::Arc; use common_datavalues::DataSchemaRef; use common_exception::Result; -use common_planners::ExplainType; -use common_planners::Expression; -use common_planners::PlanNode; -use common_planners::ReadDataSourcePlan; +use common_legacy_planners::ExplainType; +use common_legacy_planners::Expression; +use common_legacy_planners::PlanNode; +use common_legacy_planners::ReadDataSourcePlan; use crate::sessions::QueryContext; use crate::sql::DfStatement; diff --git a/src/query/service/src/sql/statements/query/query_ast_ir.rs b/src/query/service/src/sql/statements/query/query_ast_ir.rs index c206b1eb2e269..5ceeac626e26e 100644 --- a/src/query/service/src/sql/statements/query/query_ast_ir.rs +++ b/src/query/service/src/sql/statements/query/query_ast_ir.rs @@ -16,7 +16,7 @@ use std::fmt::Debug; use std::fmt::Formatter; use common_exception::Result; -use common_planners::Expression; +use common_legacy_planners::Expression; // Intermediate representation for query AST(after normalize) pub struct QueryASTIR { diff --git a/src/query/service/src/sql/statements/query/query_collect_push_downs.rs b/src/query/service/src/sql/statements/query/query_collect_push_downs.rs index 36629c25c6f8c..5f2902dbdb247 100644 --- a/src/query/service/src/sql/statements/query/query_collect_push_downs.rs +++ b/src/query/service/src/sql/statements/query/query_collect_push_downs.rs @@ -16,9 +16,9 @@ use std::collections::HashSet; use common_datavalues::DataType; use common_exception::Result; -use common_planners::Expression; -use common_planners::Extras; -use common_planners::Projection; +use common_legacy_planners::Expression; +use common_legacy_planners::Extras; +use common_legacy_planners::Projection; use crate::sql::statements::query::query_ast_ir::QueryASTIRVisitor; use crate::sql::statements::query::JoinedSchema; diff --git a/src/query/service/src/sql/statements/query/query_normalizer.rs b/src/query/service/src/sql/statements/query/query_normalizer.rs index c1ae40180415e..e2b61699e7ab4 100644 --- a/src/query/service/src/sql/statements/query/query_normalizer.rs +++ b/src/query/service/src/sql/statements/query/query_normalizer.rs @@ -17,11 +17,11 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::extract_aliases; -use common_planners::find_aggregate_exprs_in_expr; -use common_planners::find_window_exprs_in_expr; -use common_planners::resolve_aliases_to_exprs; -use common_planners::Expression; +use common_legacy_planners::extract_aliases; +use common_legacy_planners::find_aggregate_exprs_in_expr; +use common_legacy_planners::find_window_exprs_in_expr; +use common_legacy_planners::resolve_aliases_to_exprs; +use common_legacy_planners::Expression; use sqlparser::ast::Expr; use sqlparser::ast::OffsetRows; use sqlparser::ast::SelectItem; diff --git a/src/query/service/src/sql/statements/query/query_qualified_rewriter.rs b/src/query/service/src/sql/statements/query/query_qualified_rewriter.rs index 00f1fe2b0d490..b7285769e5c53 100644 --- a/src/query/service/src/sql/statements/query/query_qualified_rewriter.rs +++ b/src/query/service/src/sql/statements/query/query_qualified_rewriter.rs @@ -16,7 +16,7 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::Expression; +use common_legacy_planners::Expression; use crate::sessions::QueryContext; use crate::sessions::TableContext; diff --git a/src/query/service/src/sql/statements/query/query_schema_joined.rs b/src/query/service/src/sql/statements/query/query_schema_joined.rs index 8a7171eb489b9..7126484ac952d 100644 --- a/src/query/service/src/sql/statements/query/query_schema_joined.rs +++ b/src/query/service/src/sql/statements/query/query_schema_joined.rs @@ -21,7 +21,7 @@ use std::sync::Arc; use common_datavalues::prelude::*; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::Extras; +use common_legacy_planners::Extras; use crate::sql::statements::QueryAnalyzeState; use crate::storages::Table; diff --git a/src/query/service/src/sql/statements/statement_delete.rs b/src/query/service/src/sql/statements/statement_delete.rs index a312ee0a45900..a188f3178f7dd 100644 --- a/src/query/service/src/sql/statements/statement_delete.rs +++ b/src/query/service/src/sql/statements/statement_delete.rs @@ -18,10 +18,10 @@ use std::sync::Arc; use common_datavalues::DataSchema; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::DeletePlan; -use common_planners::Expression; -use common_planners::PlanNode; -use common_planners::Projection; +use common_legacy_planners::DeletePlan; +use common_legacy_planners::Expression; +use common_legacy_planners::PlanNode; +use common_legacy_planners::Projection; use sqlparser::ast::Expr; use sqlparser::ast::ObjectName; diff --git a/src/query/service/src/sql/statements/statement_explain.rs b/src/query/service/src/sql/statements/statement_explain.rs index 45774aa23e9bd..6b4598a28fd00 100644 --- a/src/query/service/src/sql/statements/statement_explain.rs +++ b/src/query/service/src/sql/statements/statement_explain.rs @@ -16,7 +16,7 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::ExplainType; +use common_legacy_planners::ExplainType; use crate::sessions::QueryContext; use crate::sessions::TableContext; diff --git a/src/query/service/src/sql/statements/statement_insert.rs b/src/query/service/src/sql/statements/statement_insert.rs index 0fe342aaeb7ff..10addb42ddf63 100644 --- a/src/query/service/src/sql/statements/statement_insert.rs +++ b/src/query/service/src/sql/statements/statement_insert.rs @@ -23,10 +23,10 @@ use common_exception::Result; use common_formats::FormatFactory; use common_io::prelude::BufferReader; use common_io::prelude::NestedCheckpointReader; -use common_planners::InsertInputSource; -use common_planners::InsertPlan; -use common_planners::InsertValueBlock; -use common_planners::PlanNode; +use common_legacy_planners::InsertInputSource; +use common_legacy_planners::InsertPlan; +use common_legacy_planners::InsertValueBlock; +use common_legacy_planners::PlanNode; use common_streams::NDJsonSourceBuilder; use common_streams::Source; use sqlparser::ast::Expr; diff --git a/src/query/service/src/sql/statements/statement_select.rs b/src/query/service/src/sql/statements/statement_select.rs index 70913bec65e32..64753e5cd9081 100644 --- a/src/query/service/src/sql/statements/statement_select.rs +++ b/src/query/service/src/sql/statements/statement_select.rs @@ -18,11 +18,11 @@ use common_datablocks::DataBlock; use common_datavalues::DataSchemaRefExt; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::expand_aggregate_arg_exprs; -use common_planners::find_aggregate_exprs; -use common_planners::find_aggregate_exprs_in_expr; -use common_planners::rebase_expr; -use common_planners::Expression; +use common_legacy_planners::expand_aggregate_arg_exprs; +use common_legacy_planners::find_aggregate_exprs; +use common_legacy_planners::find_aggregate_exprs_in_expr; +use common_legacy_planners::rebase_expr; +use common_legacy_planners::Expression; use sqlparser::ast::Expr; use sqlparser::ast::Offset; use sqlparser::ast::OrderByExpr; diff --git a/src/query/service/src/sql/statements/value_source.rs b/src/query/service/src/sql/statements/value_source.rs index 5c81b949ba79a..eced95041df94 100644 --- a/src/query/service/src/sql/statements/value_source.rs +++ b/src/query/service/src/sql/statements/value_source.rs @@ -20,7 +20,7 @@ use common_datavalues::prelude::*; use common_exception::ErrorCode; use common_exception::Result; use common_io::prelude::*; -use common_planners::Expression; +use common_legacy_planners::Expression; use sqlparser::ast::Expr; use sqlparser::dialect::Dialect; use sqlparser::dialect::GenericDialect; diff --git a/src/query/service/src/storages/result/block_buffer.rs b/src/query/service/src/storages/result/block_buffer.rs index 7a5dc8886aca7..357939a40f378 100644 --- a/src/query/service/src/storages/result/block_buffer.rs +++ b/src/query/service/src/storages/result/block_buffer.rs @@ -19,8 +19,8 @@ use common_base::base::tokio::sync::Mutex; use common_base::base::tokio::sync::Notify; use common_datablocks::DataBlock; use common_exception::Result; -use common_planners::PartInfoPtr; -use common_planners::Projection; +use common_legacy_planners::PartInfoPtr; +use common_legacy_planners::Projection; use crate::sessions::QueryContext; use crate::sessions::TableContext; diff --git a/src/query/service/src/storages/result/download.rs b/src/query/service/src/storages/result/download.rs index e74bff449e74d..929dbee197b5a 100644 --- a/src/query/service/src/storages/result/download.rs +++ b/src/query/service/src/storages/result/download.rs @@ -17,9 +17,9 @@ use std::sync::Arc; use async_stream::stream; use common_exception::Result; use common_formats::output_format::OutputFormatType; -use common_planners::Extras; -use common_planners::ReadDataSourcePlan; -use common_planners::SourceInfo; +use common_legacy_planners::Extras; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::SourceInfo; use futures::StreamExt; use crate::sessions::QueryContext; diff --git a/src/query/service/src/storages/result/result_table.rs b/src/query/service/src/storages/result/result_table.rs index 176e444b066e1..de8aaa5d6968b 100644 --- a/src/query/service/src/storages/result/result_table.rs +++ b/src/query/service/src/storages/result/result_table.rs @@ -19,14 +19,14 @@ use common_datavalues::DataSchemaRef; use common_exception::ErrorCode; use common_exception::Result; use common_fuse_meta::meta::SegmentInfo; +use common_legacy_planners::Extras; +use common_legacy_planners::Partitions; +use common_legacy_planners::Projection; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::Statistics; use common_meta_app::schema::TableInfo; use common_meta_app::schema::TableMeta; use common_meta_types::UserIdentity; -use common_planners::Extras; -use common_planners::Partitions; -use common_planners::Projection; -use common_planners::ReadDataSourcePlan; -use common_planners::Statistics; use serde::Deserialize; use serde::Serialize; diff --git a/src/query/service/src/storages/result/result_table_sink.rs b/src/query/service/src/storages/result/result_table_sink.rs index b4704c4b3c078..87e510ce19d50 100644 --- a/src/query/service/src/storages/result/result_table_sink.rs +++ b/src/query/service/src/storages/result/result_table_sink.rs @@ -22,8 +22,8 @@ use common_exception::ErrorCode; use common_exception::Result; use common_fuse_meta::meta::SegmentInfo; use common_fuse_meta::meta::Statistics as FuseMetaStatistics; -use common_planners::PartInfoPtr; -use common_planners::Projection; +use common_legacy_planners::PartInfoPtr; +use common_legacy_planners::Projection; use opendal::Operator; use crate::pipelines::processors::port::InputPort; diff --git a/src/query/service/src/storages/result/result_table_source.rs b/src/query/service/src/storages/result/result_table_source.rs index 262f7166b07c8..44dc8edc2fe96 100644 --- a/src/query/service/src/storages/result/result_table_source.rs +++ b/src/query/service/src/storages/result/result_table_source.rs @@ -20,7 +20,7 @@ use common_base::base::ProgressValues; use common_datablocks::DataBlock; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::PartInfoPtr; +use common_legacy_planners::PartInfoPtr; use crate::pipelines::processors::port::OutputPort; use crate::pipelines::processors::processor::Event; diff --git a/src/query/service/src/storages/result/writer.rs b/src/query/service/src/storages/result/writer.rs index 38f368cbc80e9..ae4f7e2368e42 100644 --- a/src/query/service/src/storages/result/writer.rs +++ b/src/query/service/src/storages/result/writer.rs @@ -19,7 +19,7 @@ use common_datablocks::DataBlock; use common_exception::Result; use common_fuse_meta::meta::SegmentInfo; use common_fuse_meta::meta::Statistics as FuseMetaStatistics; -use common_planners::PartInfoPtr; +use common_legacy_planners::PartInfoPtr; use common_streams::SendableDataBlockStream; use futures::StreamExt; use opendal::Operator; diff --git a/src/query/service/src/storages/stage/stage_source.rs b/src/query/service/src/storages/stage/stage_source.rs index 1091d9917e824..5659e4dd8cb48 100644 --- a/src/query/service/src/storages/stage/stage_source.rs +++ b/src/query/service/src/storages/stage/stage_source.rs @@ -21,10 +21,10 @@ use common_exception::Result; use common_formats::FormatFactory; use common_formats::InputFormat; use common_io::prelude::FormatSettings; +use common_legacy_planners::StageTableInfo; use common_meta_types::StageFileFormatType; use common_meta_types::StageType; use common_meta_types::UserStageInfo; -use common_planners::StageTableInfo; use common_storage::init_operator; use opendal::Operator; use parking_lot::Mutex; diff --git a/src/query/service/src/storages/stage/stage_table.rs b/src/query/service/src/storages/stage/stage_table.rs index 3af357fec82de..89be40a596575 100644 --- a/src/query/service/src/storages/stage/stage_table.rs +++ b/src/query/service/src/storages/stage/stage_table.rs @@ -21,15 +21,15 @@ use common_datablocks::DataBlock; use common_exception::ErrorCode; use common_exception::Result; use common_formats::output_format::OutputFormatType; +use common_legacy_planners::Extras; +use common_legacy_planners::Partitions; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::StageTableInfo; +use common_legacy_planners::Statistics; +use common_legacy_planners::TruncateTablePlan; use common_meta_app::schema::TableInfo; use common_pipeline_core::processors::port::InputPort; use common_pipeline_core::SinkPipeBuilder; -use common_planners::Extras; -use common_planners::Partitions; -use common_planners::ReadDataSourcePlan; -use common_planners::StageTableInfo; -use common_planners::Statistics; -use common_planners::TruncateTablePlan; use parking_lot::Mutex; use tracing::info; diff --git a/src/query/service/src/storages/storage_table_read_plan.rs b/src/query/service/src/storages/storage_table_read_plan.rs index 57ea907d3d2c6..8f22d5ad348a3 100644 --- a/src/query/service/src/storages/storage_table_read_plan.rs +++ b/src/query/service/src/storages/storage_table_read_plan.rs @@ -16,10 +16,10 @@ use std::collections::BTreeMap; use std::sync::Arc; use common_exception::Result; -use common_planners::Extras; -use common_planners::Projection; -use common_planners::ReadDataSourcePlan; -use common_planners::SourceInfo; +use common_legacy_planners::Extras; +use common_legacy_planners::Projection; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::SourceInfo; use crate::sessions::QueryContext; use crate::storages::Table; diff --git a/src/query/service/src/storages/storage_table_read_wrap.rs b/src/query/service/src/storages/storage_table_read_wrap.rs index a3d1230c37caa..25d01b36dacef 100644 --- a/src/query/service/src/storages/storage_table_read_wrap.rs +++ b/src/query/service/src/storages/storage_table_read_wrap.rs @@ -15,7 +15,7 @@ use std::sync::Arc; use common_exception::Result; -use common_planners::ReadDataSourcePlan; +use common_legacy_planners::ReadDataSourcePlan; use common_streams::SendableDataBlockStream; use crate::interpreters::ProcessorExecutorStream; diff --git a/src/query/service/src/table_functions/async_crash_me.rs b/src/query/service/src/table_functions/async_crash_me.rs index 65bb810d77ac9..8873200bc3502 100644 --- a/src/query/service/src/table_functions/async_crash_me.rs +++ b/src/query/service/src/table_functions/async_crash_me.rs @@ -24,14 +24,14 @@ use common_datavalues::chrono::TimeZone; use common_datavalues::chrono::Utc; use common_datavalues::prelude::*; use common_exception::Result; +use common_legacy_planners::Expression; +use common_legacy_planners::Extras; +use common_legacy_planners::Partitions; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::Statistics; use common_meta_app::schema::TableIdent; use common_meta_app::schema::TableInfo; use common_meta_app::schema::TableMeta; -use common_planners::Expression; -use common_planners::Extras; -use common_planners::Partitions; -use common_planners::ReadDataSourcePlan; -use common_planners::Statistics; use futures::Stream; use crate::pipelines::processors::port::OutputPort; diff --git a/src/query/service/src/table_functions/memory_block_part.rs b/src/query/service/src/table_functions/memory_block_part.rs index be167b25992cc..cbafce7bcc467 100644 --- a/src/query/service/src/table_functions/memory_block_part.rs +++ b/src/query/service/src/table_functions/memory_block_part.rs @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -use common_planners::Partitions; +use common_legacy_planners::Partitions; use crate::table_functions::numbers_part::NumbersPartInfo; diff --git a/src/query/service/src/table_functions/numbers_part.rs b/src/query/service/src/table_functions/numbers_part.rs index 0c31c3eca3026..97a1cd0988ae9 100644 --- a/src/query/service/src/table_functions/numbers_part.rs +++ b/src/query/service/src/table_functions/numbers_part.rs @@ -17,8 +17,8 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::PartInfo; -use common_planners::PartInfoPtr; +use common_legacy_planners::PartInfo; +use common_legacy_planners::PartInfoPtr; #[derive(serde::Serialize, serde::Deserialize, PartialEq, Eq)] pub struct NumbersPartInfo { diff --git a/src/query/service/src/table_functions/numbers_table.rs b/src/query/service/src/table_functions/numbers_table.rs index c174cac21253b..2b987cce735c8 100644 --- a/src/query/service/src/table_functions/numbers_table.rs +++ b/src/query/service/src/table_functions/numbers_table.rs @@ -23,15 +23,15 @@ use common_datavalues::chrono::Utc; use common_datavalues::prelude::*; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::Expression; +use common_legacy_planners::Extras; +use common_legacy_planners::PartInfoPtr; +use common_legacy_planners::Partitions; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::Statistics; use common_meta_app::schema::TableIdent; use common_meta_app::schema::TableInfo; use common_meta_app::schema::TableMeta; -use common_planners::Expression; -use common_planners::Extras; -use common_planners::PartInfoPtr; -use common_planners::Partitions; -use common_planners::ReadDataSourcePlan; -use common_planners::Statistics; use crate::pipelines::processors::port::OutputPort; use crate::pipelines::processors::processor::ProcessorPtr; diff --git a/src/query/service/src/table_functions/sync_crash_me.rs b/src/query/service/src/table_functions/sync_crash_me.rs index 3747afc5b85c0..77caa0bbeb11d 100644 --- a/src/query/service/src/table_functions/sync_crash_me.rs +++ b/src/query/service/src/table_functions/sync_crash_me.rs @@ -24,14 +24,14 @@ use common_datavalues::chrono::TimeZone; use common_datavalues::chrono::Utc; use common_datavalues::prelude::*; use common_exception::Result; +use common_legacy_planners::Expression; +use common_legacy_planners::Extras; +use common_legacy_planners::Partitions; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::Statistics; use common_meta_app::schema::TableIdent; use common_meta_app::schema::TableInfo; use common_meta_app::schema::TableMeta; -use common_planners::Expression; -use common_planners::Extras; -use common_planners::Partitions; -use common_planners::ReadDataSourcePlan; -use common_planners::Statistics; use futures::Stream; use crate::pipelines::processors::port::OutputPort; diff --git a/src/query/service/src/table_functions/table_function_factory.rs b/src/query/service/src/table_functions/table_function_factory.rs index 4cd24fa376b0f..b126edc25b5ae 100644 --- a/src/query/service/src/table_functions/table_function_factory.rs +++ b/src/query/service/src/table_functions/table_function_factory.rs @@ -17,8 +17,8 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::Expression; use common_meta_types::MetaId; -use common_planners::Expression; use parking_lot::RwLock; use crate::catalogs::SYS_TBL_FUC_ID_END; diff --git a/src/query/service/tests/it/interpreters/async_insert_queue.rs b/src/query/service/tests/it/interpreters/async_insert_queue.rs index eea2e0302827c..2772edcba2f08 100644 --- a/src/query/service/tests/it/interpreters/async_insert_queue.rs +++ b/src/query/service/tests/it/interpreters/async_insert_queue.rs @@ -22,8 +22,8 @@ use common_base::base::GlobalIORuntime; use common_base::base::TrySpawn; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::InsertPlan; -use common_planners::PlanNode::Insert; +use common_legacy_planners::InsertPlan; +use common_legacy_planners::PlanNode::Insert; use databend_query::interpreters::*; use databend_query::sessions::QueryContext; use databend_query::sessions::TableContext; diff --git a/src/query/service/tests/it/storages/fuse/operations/navigate.rs b/src/query/service/tests/it/storages/fuse/operations/navigate.rs index b9e2b972b8746..e244c1b3dd48e 100644 --- a/src/query/service/tests/it/storages/fuse/operations/navigate.rs +++ b/src/query/service/tests/it/storages/fuse/operations/navigate.rs @@ -20,7 +20,7 @@ use common_base::base::tokio; use common_datablocks::DataBlock; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::TruncateTablePlan; +use common_legacy_planners::TruncateTablePlan; use common_storages_fuse::io::SnapshotHistoryReader; use databend_query::pipelines::Pipeline; use databend_query::storages::fuse::io::MetaReaders; diff --git a/src/query/service/tests/it/storages/fuse/operations/read_plan.rs b/src/query/service/tests/it/storages/fuse/operations/read_plan.rs index e82e4ec5bb2d4..b90755b2d4784 100644 --- a/src/query/service/tests/it/storages/fuse/operations/read_plan.rs +++ b/src/query/service/tests/it/storages/fuse/operations/read_plan.rs @@ -23,8 +23,8 @@ use common_exception::Result; use common_fuse_meta::meta::BlockMeta; use common_fuse_meta::meta::ColumnMeta; use common_fuse_meta::meta::ColumnStatistics; -use common_planners::Extras; -use common_planners::Projection; +use common_legacy_planners::Extras; +use common_legacy_planners::Projection; use common_storages_fuse::ColumnLeaves; use databend_query::interpreters::CreateTableInterpreterV2; use databend_query::interpreters::Interpreter; diff --git a/src/query/service/tests/it/storages/fuse/pruning.rs b/src/query/service/tests/it/storages/fuse/pruning.rs index 616c02066684d..16b0d5d5e5274 100644 --- a/src/query/service/tests/it/storages/fuse/pruning.rs +++ b/src/query/service/tests/it/storages/fuse/pruning.rs @@ -20,13 +20,13 @@ use common_datavalues::prelude::*; use common_exception::Result; use common_fuse_meta::meta::BlockMeta; use common_fuse_meta::meta::TableSnapshot; +use common_legacy_planners::add; +use common_legacy_planners::col; +use common_legacy_planners::lit; +use common_legacy_planners::sub; +use common_legacy_planners::Expression; +use common_legacy_planners::Extras; use common_meta_app::schema::TableMeta; -use common_planners::add; -use common_planners::col; -use common_planners::lit; -use common_planners::sub; -use common_planners::Expression; -use common_planners::Extras; use databend_query::interpreters::CreateTableInterpreterV2; use databend_query::interpreters::Interpreter; use databend_query::sessions::QueryContext; diff --git a/src/query/service/tests/it/storages/fuse/statistics.rs b/src/query/service/tests/it/storages/fuse/statistics.rs index f2614fa13a134..e5dfacb4b3997 100644 --- a/src/query/service/tests/it/storages/fuse/statistics.rs +++ b/src/query/service/tests/it/storages/fuse/statistics.rs @@ -21,10 +21,10 @@ use common_datablocks::DataBlock; use common_datavalues::prelude::*; use common_fuse_meta::meta::ClusterStatistics; use common_fuse_meta::meta::ColumnStatistics; +use common_legacy_planners::add; +use common_legacy_planners::col; +use common_legacy_planners::lit; use common_pipeline_transforms::processors::ExpressionExecutor; -use common_planners::add; -use common_planners::col; -use common_planners::lit; use databend_query::storages::fuse::io::BlockCompactor; use databend_query::storages::fuse::io::BlockWriter; use databend_query::storages::fuse::io::TableMetaLocationGenerator; diff --git a/src/query/service/tests/it/storages/fuse/table.rs b/src/query/service/tests/it/storages/fuse/table.rs index 76b140d4571b3..39e2edb55ef8c 100644 --- a/src/query/service/tests/it/storages/fuse/table.rs +++ b/src/query/service/tests/it/storages/fuse/table.rs @@ -16,13 +16,13 @@ use std::default::Default; use common_base::base::tokio; use common_exception::Result; +use common_legacy_planners::AlterTableClusterKeyPlan; +use common_legacy_planners::DropTableClusterKeyPlan; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::SourceInfo; +use common_legacy_planners::TruncateTablePlan; use common_meta_app::schema::TableInfo; use common_meta_app::schema::TableMeta; -use common_planners::AlterTableClusterKeyPlan; -use common_planners::DropTableClusterKeyPlan; -use common_planners::ReadDataSourcePlan; -use common_planners::SourceInfo; -use common_planners::TruncateTablePlan; use databend_query::interpreters::AlterTableClusterKeyInterpreter; use databend_query::interpreters::CreateTableInterpreterV2; use databend_query::interpreters::DropTableClusterKeyInterpreter; diff --git a/src/query/service/tests/it/storages/fuse/table_functions/clustering_information_table.rs b/src/query/service/tests/it/storages/fuse/table_functions/clustering_information_table.rs index c2385a2143cc5..3002767cf3cec 100644 --- a/src/query/service/tests/it/storages/fuse/table_functions/clustering_information_table.rs +++ b/src/query/service/tests/it/storages/fuse/table_functions/clustering_information_table.rs @@ -17,7 +17,7 @@ use common_datablocks::DataBlock; use common_datavalues::prelude::*; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::*; +use common_legacy_planners::*; use databend_query::interpreters::CreateTableInterpreterV2; use databend_query::interpreters::Interpreter; use tokio_stream::StreamExt; diff --git a/src/query/service/tests/it/storages/fuse/table_functions/fuse_snapshot_table.rs b/src/query/service/tests/it/storages/fuse/table_functions/fuse_snapshot_table.rs index 95bdb1948edba..79c69fff056fc 100644 --- a/src/query/service/tests/it/storages/fuse/table_functions/fuse_snapshot_table.rs +++ b/src/query/service/tests/it/storages/fuse/table_functions/fuse_snapshot_table.rs @@ -17,7 +17,7 @@ use common_datablocks::DataBlock; use common_datavalues::prelude::*; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::*; +use common_legacy_planners::*; use databend_query::interpreters::CreateTableInterpreterV2; use databend_query::interpreters::Interpreter; use tokio_stream::StreamExt; diff --git a/src/query/service/tests/it/storages/fuse/table_test_fixture.rs b/src/query/service/tests/it/storages/fuse/table_test_fixture.rs index 9c6bf9ede0a2b..db34fdfbc57e3 100644 --- a/src/query/service/tests/it/storages/fuse/table_test_fixture.rs +++ b/src/query/service/tests/it/storages/fuse/table_test_fixture.rs @@ -20,14 +20,14 @@ use common_datablocks::assert_blocks_sorted_eq_with_name; use common_datablocks::DataBlock; use common_datavalues::prelude::*; use common_exception::Result; +use common_legacy_planners::CreateDatabasePlan; +use common_legacy_planners::Expression; +use common_legacy_planners::Extras; use common_meta_app::schema::DatabaseMeta; use common_meta_app::schema::TableMeta; use common_pipeline_core::processors::port::OutputPort; use common_pipeline_core::Pipeline; use common_pipeline_core::SourcePipeBuilder; -use common_planners::CreateDatabasePlan; -use common_planners::Expression; -use common_planners::Extras; use common_storage::StorageFsConfig; use common_storage::StorageParams; use common_streams::SendableDataBlockStream; diff --git a/src/query/service/tests/it/storages/index/bloom_filter.rs b/src/query/service/tests/it/storages/index/bloom_filter.rs index 9f8779dab7143..7dbae98911a2d 100644 --- a/src/query/service/tests/it/storages/index/bloom_filter.rs +++ b/src/query/service/tests/it/storages/index/bloom_filter.rs @@ -17,7 +17,7 @@ use common_base::base::tokio; use common_datablocks::DataBlock; use common_datavalues::prelude::*; use common_exception::Result; -use common_planners::*; +use common_legacy_planners::*; use databend_query::sessions::QueryContext; use databend_query::storages::index::BloomFilter; use databend_query::storages::index::BloomFilterExprEvalResult; diff --git a/src/query/service/tests/it/storages/index/range_filter.rs b/src/query/service/tests/it/storages/index/range_filter.rs index 2df63e4d3ab6c..4e034c93aa545 100644 --- a/src/query/service/tests/it/storages/index/range_filter.rs +++ b/src/query/service/tests/it/storages/index/range_filter.rs @@ -19,7 +19,7 @@ use common_datavalues::prelude::*; use common_exception::Result; use common_fuse_meta::meta::ColumnStatistics; use common_fuse_meta::meta::StatisticsOfColumns; -use common_planners::*; +use common_legacy_planners::*; use databend_query::storages::index::range_filter::build_verifiable_expr; use databend_query::storages::index::range_filter::left_bound_for_like_pattern; use databend_query::storages::index::range_filter::right_bound_for_like_pattern; diff --git a/src/query/service/tests/it/storages/memory.rs b/src/query/service/tests/it/storages/memory.rs index c51c8d02a1bf2..ea08982488f7f 100644 --- a/src/query/service/tests/it/storages/memory.rs +++ b/src/query/service/tests/it/storages/memory.rs @@ -18,9 +18,9 @@ use common_datablocks::assert_blocks_sorted_eq; use common_datablocks::DataBlock; use common_datavalues::prelude::*; use common_exception::Result; +use common_legacy_planners::*; use common_meta_app::schema::TableInfo; use common_meta_app::schema::TableMeta; -use common_planners::*; use databend_query::sessions::TableContext; use databend_query::sql::plans::create_table_v2::TableOptions; use databend_query::storages::memory::MemoryTable; diff --git a/src/query/service/tests/it/storages/null.rs b/src/query/service/tests/it/storages/null.rs index b4af6323b8f71..7554f514e6ee8 100644 --- a/src/query/service/tests/it/storages/null.rs +++ b/src/query/service/tests/it/storages/null.rs @@ -15,9 +15,9 @@ use common_base::base::tokio; use common_datavalues::prelude::*; use common_exception::Result; +use common_legacy_planners::*; use common_meta_app::schema::TableInfo; use common_meta_app::schema::TableMeta; -use common_planners::*; use databend_query::sql::plans::create_table_v2::TableOptions; use databend_query::storages::null::NullTable; use databend_query::storages::TableStreamReadWrap; diff --git a/src/query/service/tests/it/storages/result/result_table.rs b/src/query/service/tests/it/storages/result/result_table.rs index f9091eda4561a..fee9b2227dee2 100644 --- a/src/query/service/tests/it/storages/result/result_table.rs +++ b/src/query/service/tests/it/storages/result/result_table.rs @@ -23,9 +23,9 @@ use common_datavalues::DataField; use common_datavalues::DataSchema; use common_datavalues::ToDataType; use common_exception::Result; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::SourceInfo; use common_meta_types::UserIdentity; -use common_planners::ReadDataSourcePlan; -use common_planners::SourceInfo; use databend_query::sessions::TableContext; use databend_query::storages::result::ResultQueryInfo; use databend_query::storages::result::ResultTable; diff --git a/src/query/service/tests/it/table_functions/numbers_table.rs b/src/query/service/tests/it/table_functions/numbers_table.rs index f4105a3e1fb11..25f4f5ecdb5d4 100644 --- a/src/query/service/tests/it/table_functions/numbers_table.rs +++ b/src/query/service/tests/it/table_functions/numbers_table.rs @@ -15,7 +15,7 @@ use common_base::base::tokio; use common_datavalues::prelude::*; use common_exception::Result; -use common_planners::*; +use common_legacy_planners::*; use databend_query::interpreters::InterpreterFactory; use databend_query::sessions::SessionManager; use databend_query::sessions::SessionType; diff --git a/src/query/storages/fuse/Cargo.toml b/src/query/storages/fuse/Cargo.toml index aaaab52509d35..92e8174b29067 100644 --- a/src/query/storages/fuse/Cargo.toml +++ b/src/query/storages/fuse/Cargo.toml @@ -22,12 +22,12 @@ common-exception = { path = "../../../common/exception" } common-functions = { path = "../../functions" } common-fuse-meta = { path = "../fuse-meta" } common-legacy-parser = { path = "../../legacy-parser" } +common-legacy-planners = { path = "../../legacy-planners" } common-meta-app = { path = "../../../meta/app" } common-meta-types = { path = "../../../meta/types" } common-pipeline-core = { path = "../../pipeline/core" } common-pipeline-sources = { path = "../../pipeline/sources" } common-pipeline-transforms = { path = "../../pipeline/transforms" } -common-planners = { path = "../../planners" } common-storages-index = { path = "../index" } common-storages-util = { path = "../util" } common-streams = { path = "../../streams" } diff --git a/src/query/storages/fuse/src/fuse_part.rs b/src/query/storages/fuse/src/fuse_part.rs index d422ca49e5530..b8e08553e70fe 100644 --- a/src/query/storages/fuse/src/fuse_part.rs +++ b/src/query/storages/fuse/src/fuse_part.rs @@ -22,9 +22,9 @@ use common_arrow::arrow::datatypes::Schema as ArrowSchema; use common_exception::ErrorCode; use common_exception::Result; use common_fuse_meta::meta::Compression; -use common_planners::PartInfo; -use common_planners::PartInfoPtr; -use common_planners::Projection; +use common_legacy_planners::PartInfo; +use common_legacy_planners::PartInfoPtr; +use common_legacy_planners::Projection; #[derive(serde::Serialize, serde::Deserialize, PartialEq, Eq)] pub struct ColumnMeta { diff --git a/src/query/storages/fuse/src/fuse_table.rs b/src/query/storages/fuse/src/fuse_table.rs index e0b696ede4b36..ee89897cbe84f 100644 --- a/src/query/storages/fuse/src/fuse_table.rs +++ b/src/query/storages/fuse/src/fuse_table.rs @@ -27,14 +27,14 @@ use common_fuse_meta::meta::Statistics as FuseStatistics; use common_fuse_meta::meta::TableSnapshot; use common_fuse_meta::meta::Versioned; use common_legacy_parser::ExpressionParser; +use common_legacy_planners::DeletePlan; +use common_legacy_planners::Expression; +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_planners::DeletePlan; -use common_planners::Expression; -use common_planners::Extras; -use common_planners::Partitions; -use common_planners::ReadDataSourcePlan; -use common_planners::Statistics; -use common_planners::TruncateTablePlan; use common_storages_util::storage_context::StorageContext; use common_storages_util::table_storage_prefix::table_storage_prefix; use uuid::Uuid; diff --git a/src/query/storages/fuse/src/io/read/block_reader.rs b/src/query/storages/fuse/src/io/read/block_reader.rs index d29003b1e8584..17b0cafa9193e 100644 --- a/src/query/storages/fuse/src/io/read/block_reader.rs +++ b/src/query/storages/fuse/src/io/read/block_reader.rs @@ -34,8 +34,8 @@ use common_exception::ErrorCode; use common_exception::Result; use common_fuse_meta::meta::BlockMeta; use common_fuse_meta::meta::Compression; -use common_planners::PartInfoPtr; -use common_planners::Projection; +use common_legacy_planners::PartInfoPtr; +use common_legacy_planners::Projection; use futures::AsyncReadExt; use futures::StreamExt; use futures::TryStreamExt; @@ -386,11 +386,11 @@ impl BlockReader { match meta_compression { Compression::Lz4 => { let err_msg = r#"Deprecated compression algorithm [Lz4] detected. - + The Legacy compression algorithm [Lz4] is no longer supported. - To migrate data from old format, please consider re-create the table, + To migrate data from old format, please consider re-create the table, by using an old compatible version [v0.8.25-nightly … v0.7.12-nightly]. - + - Bring up the compatible version of databend-query - re-create the table Suppose the name of table is T diff --git a/src/query/storages/fuse/src/operations/append.rs b/src/query/storages/fuse/src/operations/append.rs index 50dfe9e6d1e60..db9b55b16bfbb 100644 --- a/src/query/storages/fuse/src/operations/append.rs +++ b/src/query/storages/fuse/src/operations/append.rs @@ -19,6 +19,7 @@ use common_catalog::table_context::TableContext; use common_datablocks::SortColumnDescription; use common_datavalues::DataSchemaRefExt; use common_exception::Result; +use common_legacy_planners::Expression; use common_pipeline_core::processors::port::InputPort; use common_pipeline_core::Pipeline; use common_pipeline_core::SinkPipeBuilder; @@ -26,7 +27,6 @@ use common_pipeline_transforms::processors::transforms::ExpressionTransform; use common_pipeline_transforms::processors::transforms::TransformCompact; use common_pipeline_transforms::processors::transforms::TransformSortPartial; use common_pipeline_transforms::processors::ExpressionExecutor; -use common_planners::Expression; use crate::io::BlockCompactor; use crate::operations::FuseTableSink; diff --git a/src/query/storages/fuse/src/operations/compact.rs b/src/query/storages/fuse/src/operations/compact.rs index 0ca5f2878bcd1..b78b93601ec0b 100644 --- a/src/query/storages/fuse/src/operations/compact.rs +++ b/src/query/storages/fuse/src/operations/compact.rs @@ -15,12 +15,12 @@ use std::sync::Arc; use common_exception::Result; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::SourceInfo; use common_pipeline_core::processors::port::InputPort; use common_pipeline_core::Pipeline; use common_pipeline_core::SinkPipeBuilder; use common_pipeline_transforms::processors::transforms::TransformCompact; -use common_planners::ReadDataSourcePlan; -use common_planners::SourceInfo; use super::FuseTableSink; use crate::operations::CompactMutator; diff --git a/src/query/storages/fuse/src/operations/delete.rs b/src/query/storages/fuse/src/operations/delete.rs index d1d1dfce85977..040e96beb9a82 100644 --- a/src/query/storages/fuse/src/operations/delete.rs +++ b/src/query/storages/fuse/src/operations/delete.rs @@ -19,10 +19,10 @@ use common_catalog::table_context::TableContext; use common_datavalues::DataSchemaRefExt; use common_exception::Result; use common_fuse_meta::meta::TableSnapshot; +use common_legacy_planners::DeletePlan; +use common_legacy_planners::Expression; +use common_legacy_planners::Extras; use common_pipeline_transforms::processors::ExpressionExecutor; -use common_planners::DeletePlan; -use common_planners::Expression; -use common_planners::Extras; use tracing::debug; use crate::operations::mutation::delete_from_block; diff --git a/src/query/storages/fuse/src/operations/mutation/block_filter.rs b/src/query/storages/fuse/src/operations/mutation/block_filter.rs index 97d49f41df364..8504c874116fb 100644 --- a/src/query/storages/fuse/src/operations/mutation/block_filter.rs +++ b/src/query/storages/fuse/src/operations/mutation/block_filter.rs @@ -22,8 +22,8 @@ use common_datavalues::DataSchemaRefExt; use common_datavalues::Series; use common_exception::Result; use common_fuse_meta::meta::BlockMeta; -use common_planners::Expression; -use common_planners::Projection; +use common_legacy_planners::Expression; +use common_legacy_planners::Projection; use crate::operations::mutation::deletion_mutator::Deletion; use crate::pipelines::processors::transforms::ExpressionExecutor; diff --git a/src/query/storages/fuse/src/operations/operation_log.rs b/src/query/storages/fuse/src/operations/operation_log.rs index e94fde3da2f4a..30e38ab9a5064 100644 --- a/src/query/storages/fuse/src/operations/operation_log.rs +++ b/src/query/storages/fuse/src/operations/operation_log.rs @@ -34,7 +34,7 @@ pub struct AppendOperationLogEntry { impl AppendOperationLogEntry { pub fn schema() -> DataSchemaRef { - common_planners::SINK_SCHEMA.clone() + common_legacy_planners::SINK_SCHEMA.clone() } pub fn new(segment_location: String, segment_info: Arc) -> Self { diff --git a/src/query/storages/fuse/src/operations/read.rs b/src/query/storages/fuse/src/operations/read.rs index 0f3200c722fb3..e8ac5b038cd88 100644 --- a/src/query/storages/fuse/src/operations/read.rs +++ b/src/query/storages/fuse/src/operations/read.rs @@ -24,6 +24,11 @@ use common_datavalues::DataSchemaRef; use common_datavalues::DataSchemaRefExt; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::Extras; +use common_legacy_planners::PartInfoPtr; +use common_legacy_planners::PrewhereInfo; +use common_legacy_planners::Projection; +use common_legacy_planners::ReadDataSourcePlan; use common_pipeline_core::processors::port::OutputPort; use common_pipeline_core::processors::processor::Event; use common_pipeline_core::processors::processor::ProcessorPtr; @@ -31,11 +36,6 @@ use common_pipeline_core::processors::Processor; use common_pipeline_core::Pipeline; use common_pipeline_core::SourcePipeBuilder; use common_pipeline_transforms::processors::ExpressionExecutor; -use common_planners::Extras; -use common_planners::PartInfoPtr; -use common_planners::PrewhereInfo; -use common_planners::Projection; -use common_planners::ReadDataSourcePlan; use crate::io::BlockReader; use crate::operations::read::State::Generated; diff --git a/src/query/storages/fuse/src/operations/read_partitions.rs b/src/query/storages/fuse/src/operations/read_partitions.rs index 4abbcb14f4c18..88ca12281e243 100644 --- a/src/query/storages/fuse/src/operations/read_partitions.rs +++ b/src/query/storages/fuse/src/operations/read_partitions.rs @@ -19,11 +19,11 @@ use common_catalog::table_context::TableContext; use common_exception::Result; use common_fuse_meta::meta::BlockMeta; use common_fuse_meta::meta::TableSnapshot; -use common_planners::Extras; -use common_planners::PartInfoPtr; -use common_planners::Partitions; -use common_planners::Projection; -use common_planners::Statistics; +use common_legacy_planners::Extras; +use common_legacy_planners::PartInfoPtr; +use common_legacy_planners::Partitions; +use common_legacy_planners::Projection; +use common_legacy_planners::Statistics; use crate::fuse_part::ColumnLeaves; use crate::fuse_part::ColumnMeta; diff --git a/src/query/storages/fuse/src/operations/recluster.rs b/src/query/storages/fuse/src/operations/recluster.rs index b2ed8271c782c..d75b2a8c40a32 100644 --- a/src/query/storages/fuse/src/operations/recluster.rs +++ b/src/query/storages/fuse/src/operations/recluster.rs @@ -19,6 +19,9 @@ use common_catalog::table::Table; use common_catalog::table_context::TableContext; use common_datablocks::SortColumnDescription; use common_exception::Result; +use common_legacy_planners::Extras; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::SourceInfo; use common_pipeline_core::processors::port::InputPort; use common_pipeline_core::Pipeline; use common_pipeline_core::SinkPipeBuilder; @@ -26,9 +29,6 @@ use common_pipeline_transforms::processors::transforms::SortMergeCompactor; use common_pipeline_transforms::processors::transforms::TransformCompact; use common_pipeline_transforms::processors::transforms::TransformSortMerge; use common_pipeline_transforms::processors::transforms::TransformSortPartial; -use common_planners::Extras; -use common_planners::ReadDataSourcePlan; -use common_planners::SourceInfo; use crate::operations::FuseTableSink; use crate::operations::ReclusterMutator; diff --git a/src/query/storages/fuse/src/pruning/bloom_pruner.rs b/src/query/storages/fuse/src/pruning/bloom_pruner.rs index f9db0187fc870..57453c90e41ab 100644 --- a/src/query/storages/fuse/src/pruning/bloom_pruner.rs +++ b/src/query/storages/fuse/src/pruning/bloom_pruner.rs @@ -19,9 +19,9 @@ use common_catalog::table_context::TableContext; use common_datavalues::DataSchemaRef; use common_exception::Result; use common_fuse_meta::meta::Location; -use common_planners::Expression; -use common_planners::ExpressionVisitor; -use common_planners::Recursion; +use common_legacy_planners::Expression; +use common_legacy_planners::ExpressionVisitor; +use common_legacy_planners::Recursion; use common_storages_index::BloomFilterIndexer; use opendal::Operator; diff --git a/src/query/storages/fuse/src/pruning/pruning_executor.rs b/src/query/storages/fuse/src/pruning/pruning_executor.rs index 56478a759ecb6..688f38713bfc0 100644 --- a/src/query/storages/fuse/src/pruning/pruning_executor.rs +++ b/src/query/storages/fuse/src/pruning/pruning_executor.rs @@ -23,7 +23,7 @@ use common_exception::Result; use common_fuse_meta::meta::BlockMeta; use common_fuse_meta::meta::Location; use common_fuse_meta::meta::TableSnapshot; -use common_planners::Extras; +use common_legacy_planners::Extras; use futures::future; use futures::StreamExt; use futures::TryStreamExt; diff --git a/src/query/storages/fuse/src/pruning/range_pruner.rs b/src/query/storages/fuse/src/pruning/range_pruner.rs index e43b106e541be..242770fcd9b6a 100644 --- a/src/query/storages/fuse/src/pruning/range_pruner.rs +++ b/src/query/storages/fuse/src/pruning/range_pruner.rs @@ -18,7 +18,7 @@ use common_catalog::table_context::TableContext; use common_datavalues::DataSchemaRef; use common_exception::Result; use common_fuse_meta::meta::StatisticsOfColumns; -use common_planners::Expression; +use common_legacy_planners::Expression; use common_storages_index::RangeFilter; pub trait RangeFilterPruner { diff --git a/src/query/storages/fuse/src/pruning/topn_pruner.rs b/src/query/storages/fuse/src/pruning/topn_pruner.rs index 4e7ec1de479c6..0c126b720fef2 100644 --- a/src/query/storages/fuse/src/pruning/topn_pruner.rs +++ b/src/query/storages/fuse/src/pruning/topn_pruner.rs @@ -17,7 +17,7 @@ use common_exception::ErrorCode; use common_exception::Result; use common_fuse_meta::meta::BlockMeta; use common_fuse_meta::meta::ColumnStatistics; -use common_planners::Expression; +use common_legacy_planners::Expression; pub(crate) struct TopNPrunner { schema: DataSchemaRef, diff --git a/src/query/storages/fuse/src/table_functions/clustering_informations/clustering_information.rs b/src/query/storages/fuse/src/table_functions/clustering_informations/clustering_information.rs index 27d96ab106b16..cb9e9fe7053da 100644 --- a/src/query/storages/fuse/src/table_functions/clustering_informations/clustering_information.rs +++ b/src/query/storages/fuse/src/table_functions/clustering_informations/clustering_information.rs @@ -22,7 +22,7 @@ use common_datavalues::prelude::*; use common_exception::ErrorCode; use common_exception::Result; use common_fuse_meta::meta::BlockMeta; -use common_planners::Expression; +use common_legacy_planners::Expression; use serde_json::json; use crate::io::MetaReaders; diff --git a/src/query/storages/fuse/src/table_functions/clustering_informations/clustering_information_table.rs b/src/query/storages/fuse/src/table_functions/clustering_informations/clustering_information_table.rs index 2663847009e51..7cf89870a2b98 100644 --- a/src/query/storages/fuse/src/table_functions/clustering_informations/clustering_information_table.rs +++ b/src/query/storages/fuse/src/table_functions/clustering_informations/clustering_information_table.rs @@ -18,14 +18,14 @@ use std::sync::Arc; use common_catalog::catalog::CATALOG_DEFAULT; use common_datablocks::DataBlock; use common_exception::Result; +use common_legacy_planners::Expression; +use common_legacy_planners::Extras; +use common_legacy_planners::Partitions; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::Statistics; use common_meta_app::schema::TableIdent; use common_meta_app::schema::TableInfo; use common_meta_app::schema::TableMeta; -use common_planners::Expression; -use common_planners::Extras; -use common_planners::Partitions; -use common_planners::ReadDataSourcePlan; -use common_planners::Statistics; use super::clustering_information::ClusteringInformation; use super::table_args::get_cluster_keys; diff --git a/src/query/storages/fuse/src/table_functions/clustering_informations/table_args.rs b/src/query/storages/fuse/src/table_functions/clustering_informations/table_args.rs index d0d37708fb054..ece3279753e04 100644 --- a/src/query/storages/fuse/src/table_functions/clustering_informations/table_args.rs +++ b/src/query/storages/fuse/src/table_functions/clustering_informations/table_args.rs @@ -15,8 +15,8 @@ use common_exception::ErrorCode; use common_exception::Result; use common_legacy_parser::ExpressionParser; -use common_planners::validate_expression; -use common_planners::Expression; +use common_legacy_planners::validate_expression; +use common_legacy_planners::Expression; // use crate::sql::PlanParser; use crate::table_functions::string_value; diff --git a/src/query/storages/fuse/src/table_functions/fuse_segments/fuse_segment_table.rs b/src/query/storages/fuse/src/table_functions/fuse_segments/fuse_segment_table.rs index a8e09d5eb4368..60c586b37590a 100644 --- a/src/query/storages/fuse/src/table_functions/fuse_segments/fuse_segment_table.rs +++ b/src/query/storages/fuse/src/table_functions/fuse_segments/fuse_segment_table.rs @@ -18,14 +18,14 @@ use std::sync::Arc; use common_catalog::catalog::CATALOG_DEFAULT; use common_datablocks::DataBlock; use common_exception::Result; +use common_legacy_planners::Expression; +use common_legacy_planners::Extras; +use common_legacy_planners::Partitions; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::Statistics; use common_meta_app::schema::TableIdent; use common_meta_app::schema::TableInfo; use common_meta_app::schema::TableMeta; -use common_planners::Expression; -use common_planners::Extras; -use common_planners::Partitions; -use common_planners::ReadDataSourcePlan; -use common_planners::Statistics; use super::fuse_segment::FuseSegment; use super::table_args::parse_func_history_args; diff --git a/src/query/storages/fuse/src/table_functions/fuse_snapshots/fuse_snapshot_table.rs b/src/query/storages/fuse/src/table_functions/fuse_snapshots/fuse_snapshot_table.rs index ddf8ff7440334..7679efa6903bb 100644 --- a/src/query/storages/fuse/src/table_functions/fuse_snapshots/fuse_snapshot_table.rs +++ b/src/query/storages/fuse/src/table_functions/fuse_snapshots/fuse_snapshot_table.rs @@ -17,15 +17,15 @@ use std::sync::Arc; use common_catalog::catalog::CATALOG_DEFAULT; use common_exception::Result; +use common_legacy_planners::Expression; +use common_legacy_planners::Extras; +use common_legacy_planners::Partitions; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::Statistics; use common_meta_app::schema::TableIdent; use common_meta_app::schema::TableInfo; use common_meta_app::schema::TableMeta; use common_pipeline_sources::processors::sources::StreamSourceNoSkipEmpty; -use common_planners::Expression; -use common_planners::Extras; -use common_planners::Partitions; -use common_planners::ReadDataSourcePlan; -use common_planners::Statistics; use super::fuse_snapshot::FuseSnapshot; use super::table_args::parse_func_history_args; diff --git a/src/query/storages/fuse/src/table_functions/table_args.rs b/src/query/storages/fuse/src/table_functions/table_args.rs index 2e051f2aa770a..d6f45ded06100 100644 --- a/src/query/storages/fuse/src/table_functions/table_args.rs +++ b/src/query/storages/fuse/src/table_functions/table_args.rs @@ -15,7 +15,7 @@ use common_datavalues::DataValue; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::Expression; +use common_legacy_planners::Expression; pub fn string_value(expr: &Expression) -> Result { if let Expression::Literal { value, .. } = expr { diff --git a/src/query/storages/hive/Cargo.toml b/src/query/storages/hive/Cargo.toml index 061cd1b88538b..e5b70a42908fe 100644 --- a/src/query/storages/hive/Cargo.toml +++ b/src/query/storages/hive/Cargo.toml @@ -20,11 +20,11 @@ common-datavalues = { path = "../../datavalues" } common-exception = { path = "../../../common/exception" } common-fuse-meta = { path = "../fuse-meta" } common-hive-meta-store = { path = "../hive-meta-store" } +common-legacy-planners = { path = "../../legacy-planners" } common-meta-app = { path = "../../../meta/app" } common-meta-types = { path = "../../../meta/types" } common-pipeline-core = { path = "../../pipeline/core" } common-pipeline-sources = { path = "../../pipeline/sources" } -common-planners = { path = "../../planners" } common-storages-index = { path = "../index" } common-storages-util = { path = "../util" } diff --git a/src/query/storages/hive/src/hive_file_splitter.rs b/src/query/storages/hive/src/hive_file_splitter.rs index fe402c7c5c3a6..d6210f44ca94d 100644 --- a/src/query/storages/hive/src/hive_file_splitter.rs +++ b/src/query/storages/hive/src/hive_file_splitter.rs @@ -15,7 +15,7 @@ use std::ops::Range; use std::sync::Arc; -use common_planners::PartInfo; +use common_legacy_planners::PartInfo; use crate::HiveFileInfo; use crate::HivePartInfo; diff --git a/src/query/storages/hive/src/hive_parquet_block_reader.rs b/src/query/storages/hive/src/hive_parquet_block_reader.rs index e6ecfdb8ac43c..88e2f655eee6e 100644 --- a/src/query/storages/hive/src/hive_parquet_block_reader.rs +++ b/src/query/storages/hive/src/hive_parquet_block_reader.rs @@ -30,7 +30,7 @@ use common_datablocks::DataBlock; use common_datavalues::DataSchemaRef; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::PartInfoPtr; +use common_legacy_planners::PartInfoPtr; use common_storages_util::file_meta_data_reader::FileMetaDataReader; use common_storages_util::retry; use common_storages_util::retry::Retryable; diff --git a/src/query/storages/hive/src/hive_partition.rs b/src/query/storages/hive/src/hive_partition.rs index 087e23c3b5b28..c387363f64c69 100644 --- a/src/query/storages/hive/src/hive_partition.rs +++ b/src/query/storages/hive/src/hive_partition.rs @@ -19,8 +19,8 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::PartInfo; -use common_planners::PartInfoPtr; +use common_legacy_planners::PartInfo; +use common_legacy_planners::PartInfoPtr; #[derive(serde::Serialize, serde::Deserialize, PartialEq, Eq, Debug, Clone)] pub struct HivePartInfo { diff --git a/src/query/storages/hive/src/hive_partition_pruner.rs b/src/query/storages/hive/src/hive_partition_pruner.rs index 8ff70fc9a103b..06b7915e6a1c7 100644 --- a/src/query/storages/hive/src/hive_partition_pruner.rs +++ b/src/query/storages/hive/src/hive_partition_pruner.rs @@ -24,7 +24,7 @@ use common_exception::ErrorCode; use common_exception::Result; use common_fuse_meta::meta::ColumnStatistics; use common_fuse_meta::meta::StatisticsOfColumns; -use common_planners::Expression; +use common_legacy_planners::Expression; use common_storages_index::range_filter::RangeFilter; pub struct HivePartitionPruner { diff --git a/src/query/storages/hive/src/hive_table.rs b/src/query/storages/hive/src/hive_table.rs index afe024bf8753c..61ca8a7fc4d08 100644 --- a/src/query/storages/hive/src/hive_table.rs +++ b/src/query/storages/hive/src/hive_table.rs @@ -27,6 +27,13 @@ use common_datavalues::DataSchema; use common_datavalues::DataSchemaRef; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::Expression; +use common_legacy_planners::Extras; +use common_legacy_planners::Partitions; +use common_legacy_planners::Projection; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::Statistics; +use common_legacy_planners::TruncateTablePlan; use common_meta_app::schema::TableInfo; use common_pipeline_core::processors::port::OutputPort; use common_pipeline_core::processors::processor::ProcessorPtr; @@ -34,13 +41,6 @@ use common_pipeline_core::Pipeline; use common_pipeline_core::SourcePipeBuilder; use common_pipeline_sources::processors::sources::sync_source::SyncSource; use common_pipeline_sources::processors::sources::sync_source::SyncSourcer; -use common_planners::Expression; -use common_planners::Extras; -use common_planners::Partitions; -use common_planners::Projection; -use common_planners::ReadDataSourcePlan; -use common_planners::Statistics; -use common_planners::TruncateTablePlan; use futures::TryStreamExt; use opendal::ObjectMode; use opendal::Operator; diff --git a/src/query/storages/hive/src/hive_table_source.rs b/src/query/storages/hive/src/hive_table_source.rs index d9f0d1ec2102f..b5cd34c9a9663 100644 --- a/src/query/storages/hive/src/hive_table_source.rs +++ b/src/query/storages/hive/src/hive_table_source.rs @@ -21,11 +21,11 @@ use common_catalog::table_context::TableContext; use common_datablocks::DataBlock; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::PartInfoPtr; use common_pipeline_core::processors::port::OutputPort; use common_pipeline_core::processors::processor::Event; use common_pipeline_core::processors::processor::ProcessorPtr; use common_pipeline_core::processors::Processor; -use common_planners::PartInfoPtr; use crate::hive_parquet_block_reader::DataBlockDeserializer; use crate::hive_parquet_block_reader::HiveParquetBlockReader; diff --git a/src/query/storages/index/Cargo.toml b/src/query/storages/index/Cargo.toml index 9b908684858fe..2ca7f0774fb13 100644 --- a/src/query/storages/index/Cargo.toml +++ b/src/query/storages/index/Cargo.toml @@ -18,8 +18,8 @@ common-datavalues = { path = "../../datavalues" } common-exception = { path = "../../../common/exception" } common-functions = { path = "../../functions" } common-fuse-meta = { path = "../fuse-meta" } +common-legacy-planners = { path = "../../legacy-planners" } common-pipeline-transforms = { path = "../../pipeline/transforms" } -common-planners = { path = "../../planners" } bincode = { version = "2.0.0-rc.1", features = ["serde", "std", "alloc"] } bit-vec = { version = "0.6.3", features = ["serde_std"] } diff --git a/src/query/storages/index/src/bloom_filter.rs b/src/query/storages/index/src/bloom_filter.rs index bd5496d71817e..3e24ec1256371 100644 --- a/src/query/storages/index/src/bloom_filter.rs +++ b/src/query/storages/index/src/bloom_filter.rs @@ -22,8 +22,8 @@ use common_datablocks::DataBlock; use common_datavalues::prelude::*; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::Expression; use common_pipeline_transforms::processors::transforms::transform_expression_executor::ExpressionExecutor; -use common_planners::Expression; use tracing::debug; use crate::IndexSchemaVersion; diff --git a/src/query/storages/index/src/range_filter.rs b/src/query/storages/index/src/range_filter.rs index 79fc998608843..a3cc4a036bf68 100644 --- a/src/query/storages/index/src/range_filter.rs +++ b/src/query/storages/index/src/range_filter.rs @@ -26,12 +26,12 @@ use common_functions::scalars::check_pattern_type; use common_functions::scalars::FunctionFactory; use common_functions::scalars::PatternType; use common_fuse_meta::meta::StatisticsOfColumns; +use common_legacy_planners::lit; +use common_legacy_planners::Expression; +use common_legacy_planners::ExpressionMonotonicityVisitor; +use common_legacy_planners::Expressions; +use common_legacy_planners::RequireColumnsVisitor; use common_pipeline_transforms::processors::transforms::ExpressionExecutor; -use common_planners::lit; -use common_planners::Expression; -use common_planners::ExpressionMonotonicityVisitor; -use common_planners::Expressions; -use common_planners::RequireColumnsVisitor; #[derive(Clone)] pub struct RangeFilter { diff --git a/src/query/storages/preludes/Cargo.toml b/src/query/storages/preludes/Cargo.toml index 2d6db1994ba54..42db7f067db74 100644 --- a/src/query/storages/preludes/Cargo.toml +++ b/src/query/storages/preludes/Cargo.toml @@ -22,6 +22,7 @@ common-datavalues = { path = "../../datavalues" } common-exception = { path = "../../../common/exception" } common-functions = { path = "../../functions" } common-grpc = { path = "../../../common/grpc" } +common-legacy-planners = { path = "../../legacy-planners" } common-meta-app = { path = "../../../meta/app" } common-meta-types = { path = "../../../meta/types" } common-metrics = { path = "../../../common/metrics" } @@ -29,7 +30,6 @@ common-pipeline-core = { path = "../../pipeline/core" } common-pipeline-sinks = { path = "../../pipeline/sinks" } common-pipeline-sources = { path = "../../pipeline/sources" } common-pipeline-transforms = { path = "../../pipeline/transforms" } -common-planners = { path = "../../planners" } common-storage = { path = "../../../common/storage" } common-storages-util = { path = "../util" } common-streams = { path = "../../streams" } diff --git a/src/query/storages/preludes/src/memory/memory_part.rs b/src/query/storages/preludes/src/memory/memory_part.rs index 27e15941e8166..4e3e66698d6c0 100644 --- a/src/query/storages/preludes/src/memory/memory_part.rs +++ b/src/query/storages/preludes/src/memory/memory_part.rs @@ -17,8 +17,8 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::PartInfo; -use common_planners::PartInfoPtr; +use common_legacy_planners::PartInfo; +use common_legacy_planners::PartInfoPtr; #[derive(serde::Serialize, serde::Deserialize, PartialEq, Eq)] pub struct MemoryPartInfo { diff --git a/src/query/storages/preludes/src/memory/memory_table.rs b/src/query/storages/preludes/src/memory/memory_table.rs index 518e521b39bbb..3d32595890611 100644 --- a/src/query/storages/preludes/src/memory/memory_table.rs +++ b/src/query/storages/preludes/src/memory/memory_table.rs @@ -25,13 +25,13 @@ use common_datavalues::StructColumn; use common_datavalues::TypeID; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::Extras; +use common_legacy_planners::Partitions; +use common_legacy_planners::Projection; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::Statistics; +use common_legacy_planners::TruncateTablePlan; use common_meta_app::schema::TableInfo; -use common_planners::Extras; -use common_planners::Partitions; -use common_planners::Projection; -use common_planners::ReadDataSourcePlan; -use common_planners::Statistics; -use common_planners::TruncateTablePlan; use parking_lot::Mutex; use parking_lot::RwLock; diff --git a/src/query/storages/preludes/src/null/null_table.rs b/src/query/storages/preludes/src/null/null_table.rs index b88af99b00f92..f2fb6f5633a88 100644 --- a/src/query/storages/preludes/src/null/null_table.rs +++ b/src/query/storages/preludes/src/null/null_table.rs @@ -18,12 +18,12 @@ use std::sync::Arc; use common_datablocks::DataBlock; use common_datavalues::DataSchemaRef; use common_exception::Result; +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_planners::Extras; -use common_planners::Partitions; -use common_planners::ReadDataSourcePlan; -use common_planners::Statistics; -use common_planners::TruncateTablePlan; use crate::pipelines::processors::port::InputPort; use crate::pipelines::processors::port::OutputPort; diff --git a/src/query/storages/preludes/src/random/random_parts.rs b/src/query/storages/preludes/src/random/random_parts.rs index 9bb6a974d6d05..94c7d9288aeaf 100644 --- a/src/query/storages/preludes/src/random/random_parts.rs +++ b/src/query/storages/preludes/src/random/random_parts.rs @@ -17,8 +17,8 @@ use std::sync::Arc; use common_exception::ErrorCode; use common_exception::Result; -use common_planners::PartInfo; -use common_planners::PartInfoPtr; +use common_legacy_planners::PartInfo; +use common_legacy_planners::PartInfoPtr; #[derive(serde::Serialize, serde::Deserialize, PartialEq, Eq)] pub struct RandomPartInfo { diff --git a/src/query/storages/preludes/src/random/random_table.rs b/src/query/storages/preludes/src/random/random_table.rs index 3a998bb745f04..397f162b9162a 100644 --- a/src/query/storages/preludes/src/random/random_table.rs +++ b/src/query/storages/preludes/src/random/random_table.rs @@ -19,12 +19,12 @@ use common_datablocks::DataBlock; use common_datavalues::DataSchemaRef; use common_datavalues::DataType; use common_exception::Result; +use common_legacy_planners::Extras; +use common_legacy_planners::Partitions; +use common_legacy_planners::Projection; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::Statistics; use common_meta_app::schema::TableInfo; -use common_planners::Extras; -use common_planners::Partitions; -use common_planners::Projection; -use common_planners::ReadDataSourcePlan; -use common_planners::Statistics; use super::RandomPartInfo; use crate::pipelines::processors::port::OutputPort; diff --git a/src/query/storages/preludes/src/system/clustering_history_table.rs b/src/query/storages/preludes/src/system/clustering_history_table.rs index 38da4dec903a2..374e73618f6ed 100644 --- a/src/query/storages/preludes/src/system/clustering_history_table.rs +++ b/src/query/storages/preludes/src/system/clustering_history_table.rs @@ -19,14 +19,14 @@ use std::sync::Arc; use common_datablocks::DataBlock; use common_datavalues::prelude::*; use common_exception::Result; +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::TableIdent; use common_meta_app::schema::TableInfo; use common_meta_app::schema::TableMeta; -use common_planners::Extras; -use common_planners::Partitions; -use common_planners::ReadDataSourcePlan; -use common_planners::Statistics; -use common_planners::TruncateTablePlan; use common_streams::SendableDataBlockStream; use futures::StreamExt; use parking_lot::RwLock; diff --git a/src/query/storages/preludes/src/system/one_table.rs b/src/query/storages/preludes/src/system/one_table.rs index a86ce1097fb3c..f180caa4f60ab 100644 --- a/src/query/storages/preludes/src/system/one_table.rs +++ b/src/query/storages/preludes/src/system/one_table.rs @@ -17,12 +17,12 @@ use std::sync::Arc; use common_datablocks::DataBlock; use common_datavalues::prelude::*; use common_exception::Result; +use common_legacy_planners::Extras; +use common_legacy_planners::Partitions; +use common_legacy_planners::Statistics; use common_meta_app::schema::TableIdent; use common_meta_app::schema::TableInfo; use common_meta_app::schema::TableMeta; -use common_planners::Extras; -use common_planners::Partitions; -use common_planners::Statistics; use crate::sessions::TableContext; use crate::storages::system::table::SyncOneBlockSystemTable; diff --git a/src/query/storages/preludes/src/system/query_log_table.rs b/src/query/storages/preludes/src/system/query_log_table.rs index 5b50f1d395a7a..25772b1058222 100644 --- a/src/query/storages/preludes/src/system/query_log_table.rs +++ b/src/query/storages/preludes/src/system/query_log_table.rs @@ -19,14 +19,14 @@ use std::sync::Arc; use common_datablocks::DataBlock; use common_datavalues::prelude::*; use common_exception::Result; +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::TableIdent; use common_meta_app::schema::TableInfo; use common_meta_app::schema::TableMeta; -use common_planners::Extras; -use common_planners::Partitions; -use common_planners::ReadDataSourcePlan; -use common_planners::Statistics; -use common_planners::TruncateTablePlan; use common_streams::SendableDataBlockStream; use futures::StreamExt; use parking_lot::RwLock; diff --git a/src/query/storages/preludes/src/system/table.rs b/src/query/storages/preludes/src/system/table.rs index d4e6cb603f213..c801142b09bad 100644 --- a/src/query/storages/preludes/src/system/table.rs +++ b/src/query/storages/preludes/src/system/table.rs @@ -17,11 +17,11 @@ use std::sync::Arc; use common_datablocks::DataBlock; use common_exception::Result; +use common_legacy_planners::Extras; +use common_legacy_planners::Partitions; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::Statistics; use common_meta_app::schema::TableInfo; -use common_planners::Extras; -use common_planners::Partitions; -use common_planners::ReadDataSourcePlan; -use common_planners::Statistics; use crate::pipelines::processors::port::OutputPort; use crate::pipelines::processors::processor::ProcessorPtr; diff --git a/src/query/storages/preludes/src/system/tracing_table.rs b/src/query/storages/preludes/src/system/tracing_table.rs index 506a7c1a481cf..17f61c83ab64c 100644 --- a/src/query/storages/preludes/src/system/tracing_table.rs +++ b/src/query/storages/preludes/src/system/tracing_table.rs @@ -23,13 +23,13 @@ use common_datablocks::DataBlock; use common_datavalues::prelude::*; use common_exception::ErrorCode; use common_exception::Result; +use common_legacy_planners::Extras; +use common_legacy_planners::Partitions; +use common_legacy_planners::ReadDataSourcePlan; +use common_legacy_planners::Statistics; use common_meta_app::schema::TableIdent; use common_meta_app::schema::TableInfo; use common_meta_app::schema::TableMeta; -use common_planners::Extras; -use common_planners::Partitions; -use common_planners::ReadDataSourcePlan; -use common_planners::Statistics; use tracing::debug; use walkdir::WalkDir;