Skip to content

refactor: Rename planners to legacy-planners #7597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
52 changes: 26 additions & 26 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/query/catalog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

Expand Down
14 changes: 7 additions & 7 deletions src/query/catalog/src/table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/query/catalog/src/table_args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<Vec<Expression>>;
8 changes: 4 additions & 4 deletions src/query/catalog/src/table_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/query/legacy-parser/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion src/query/legacy-parser/src/analyzer/analyzer_expr_sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/query/legacy-parser/src/parser/expression_parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "common-planners"
name = "common-legacy-planners"
version = "0.1.0"
authors = ["Databend Authors <opensource@datafuselabs.com>"]
license = "Apache-2.0"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

use common_exception::Result;
use common_planners::*;
use common_legacy_planners::*;

use crate::test::Test;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

use common_exception::Result;
use common_planners::*;
use common_legacy_planners::*;

use crate::test::Test;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

use common_exception::Result;
use common_planners::*;
use common_legacy_planners::*;

use crate::test::Test;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<()> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<()> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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)?;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<()> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}

Expand Down
Loading