[pull] master from cube-js:master

rust/cube/cubesqlplanner/cubesqlplanner/src/cube_bridge/member_sql.rs

@@ -4,7 +4,7 @@ use super::{
     sql_utils::NativeSqlUtils,
 };
 use crate::cube_bridge::base_tools::BaseTools;
-use crate::planner::sql_evaluator::SqlCallArg;
+use crate::planner::SqlCallArg;
 use crate::utils::UniqueVector;
 use cubenativeutils::wrappers::object::{NativeFunction, NativeStruct, NativeType};
 use cubenativeutils::wrappers::serializer::{NativeDeserialize, NativeSerialize};

rust/cube/cubesqlplanner/cubesqlplanner/src/lib.rs

@@ -1,7 +1,7 @@
 pub mod cube_bridge;
 pub mod logical_plan;
+pub mod physical_plan;
 pub mod physical_plan_builder;
-pub mod plan;
 pub mod planner;
 #[cfg(test)]
 pub(crate) mod test_fixtures;

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/calc_groups_cross_join.rs

@@ -1,4 +1,4 @@
-use crate::planner::sql_evaluator::MemberSymbol;
+use crate::planner::MemberSymbol;
 
 use super::*;
 use cubenativeutils::CubeError;

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/dimension_subquery.rs

@@ -1,6 +1,6 @@
 use super::pretty_print::*;
 use super::*;
-use crate::planner::sql_evaluator::MemberSymbol;
+use crate::planner::MemberSymbol;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/full_key_aggregate.rs

@@ -1,5 +1,5 @@
 use super::*;
-use crate::planner::sql_evaluator::MemberSymbol;
+use crate::planner::MemberSymbol;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 use typed_builder::TypedBuilder;

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/helper.rs

@@ -1,6 +1,6 @@
 use itertools::Itertools;
 
-use crate::planner::sql_evaluator::MemberSymbol;
+use crate::planner::MemberSymbol;
 
 use super::*;
 use std::rc::Rc;

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/join.rs

@@ -1,6 +1,6 @@
 use super::pretty_print::*;
 use super::*;
-use crate::planner::sql_evaluator::SqlCall;
+use crate::planner::SqlCall;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 use typed_builder::TypedBuilder;

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/keys_subquery.rs

@@ -1,5 +1,5 @@
 use super::*;
-use crate::planner::sql_evaluator::MemberSymbol;
+use crate::planner::MemberSymbol;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 use typed_builder::TypedBuilder;

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/multistage/calculation.rs

@@ -1,6 +1,6 @@
 use crate::logical_plan::*;
 use crate::planner::query_properties::OrderByItem;
-use crate::planner::sql_evaluator::MemberSymbol;
+use crate::planner::MemberSymbol;
 use cubenativeutils::CubeError;
 use itertools::Itertools;
 use std::rc::Rc;

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/multistage/dimension.rs

@@ -1,7 +1,7 @@
 use crate::logical_plan::*;
+use crate::planner::collectors::has_multi_stage_members;
 use crate::planner::query_properties::OrderByItem;
-use crate::planner::sql_evaluator::collectors::has_multi_stage_members;
-use crate::planner::sql_evaluator::MemberSymbol;
+use crate::planner::MemberSymbol;
 use cubenativeutils::CubeError;
 use itertools::Itertools;
 use std::rc::Rc;

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/multistage/get_date_range.rs

@@ -1,5 +1,5 @@
 use crate::logical_plan::*;
-use crate::planner::sql_evaluator::MemberSymbol;
+use crate::planner::MemberSymbol;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/multistage/leaf_measure.rs

@@ -1,6 +1,6 @@
 use crate::logical_plan::*;
 use crate::planner::planners::multi_stage::TimeShiftState;
-use crate::planner::sql_evaluator::MemberSymbol;
+use crate::planner::MemberSymbol;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/multistage/rolling_window.rs

@@ -1,7 +1,7 @@
 use crate::logical_plan::*;
 use crate::planner::query_properties::OrderByItem;
-use crate::planner::sql_evaluator::MemberSymbol;
 use crate::planner::Granularity;
+use crate::planner::MemberSymbol;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/multistage/time_series.rs

@@ -1,5 +1,5 @@
 use crate::logical_plan::*;
-use crate::planner::sql_evaluator::MemberSymbol;
+use crate::planner::MemberSymbol;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 use typed_builder::TypedBuilder;

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/optimizers/common/helper.rs

@@ -2,7 +2,7 @@ use itertools::Itertools;
 
 use crate::logical_plan::*;
 use crate::planner::filter::FilterItem;
-use crate::planner::sql_evaluator::MemberSymbol;
+use crate::planner::MemberSymbol;
 use std::rc::Rc;
 
 pub struct OptimizerHelper;

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/optimizers/pre_aggregation/compiled_pre_aggregation.rs

@@ -1,5 +1,5 @@
 use crate::planner::multi_fact_join_groups::MultiFactJoinGroups;
-use crate::planner::sql_evaluator::{MemberSymbol, SqlCall};
+use crate::planner::{MemberSymbol, SqlCall};
 use std::fmt::Debug;
 use std::rc::Rc;
 

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/optimizers/pre_aggregation/dimension_matcher.rs

@@ -1,10 +1,10 @@
 use super::CompiledPreAggregation;
 use crate::planner::filter::{BaseFilter, FilterGroupOperator, FilterItem};
 use crate::planner::query_tools::QueryTools;
-use crate::planner::sql_evaluator::DimensionSymbol;
-use crate::planner::sql_evaluator::MemberSymbol;
-use crate::planner::sql_evaluator::TimeDimensionSymbol;
+use crate::planner::DimensionSymbol;
 use crate::planner::GranularityHelper;
+use crate::planner::MemberSymbol;
+use crate::planner::TimeDimensionSymbol;
 use cubenativeutils::CubeError;
 use std::collections::HashMap;
 use std::rc::Rc;

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/optimizers/pre_aggregation/measure_matcher.rs

@@ -1,5 +1,5 @@
 use super::CompiledPreAggregation;
-use crate::planner::sql_evaluator::MemberSymbol;
+use crate::planner::MemberSymbol;
 use cubenativeutils::CubeError;
 use std::collections::HashSet;
 use std::rc::Rc;

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/optimizers/pre_aggregation/optimizer.rs

@@ -8,8 +8,8 @@ use crate::planner::join_hints::JoinHints;
 use crate::planner::multi_fact_join_groups::{MeasuresJoinHints, MultiFactJoinGroups};
 use crate::planner::planners::multi_stage::TimeShiftState;
 use crate::planner::query_tools::QueryTools;
-use crate::planner::sql_evaluator::MemberSymbol;
 use crate::planner::time_dimension::QueryDateTime;
+use crate::planner::MemberSymbol;
 use cubenativeutils::CubeError;
 use std::collections::HashSet;
 use std::rc::Rc;

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/optimizers/pre_aggregation/pre_aggregations_compiler.rs

@@ -12,9 +12,9 @@ use crate::planner::multi_fact_join_groups::{MeasuresJoinHints, MultiFactJoinGro
 use crate::planner::planners::JoinPlanner;
 use crate::planner::planners::ResolvedJoinItem;
 use crate::planner::query_tools::QueryTools;
-use crate::planner::sql_evaluator::MemberSymbol;
-use crate::planner::sql_evaluator::TimeDimensionSymbol;
 use crate::planner::GranularityHelper;
+use crate::planner::MemberSymbol;
+use crate::planner::TimeDimensionSymbol;
 use cubenativeutils::CubeError;
 use itertools::Itertools;
 use std::collections::HashMap;

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/pre_aggregation.rs

@@ -1,5 +1,5 @@
 use super::*;
-use crate::{plan::QualifiedColumnName, planner::sql_evaluator::MemberSymbol};
+use crate::{physical_plan::QualifiedColumnName, planner::MemberSymbol};
 use cubenativeutils::CubeError;
 use itertools::Itertools;
 use std::{collections::HashMap, rc::Rc};

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/pretty_print.rs

@@ -1,5 +1,5 @@
 use crate::planner::filter::FilterItem;
-use crate::planner::sql_evaluator::MemberSymbol;
+use crate::planner::MemberSymbol;
 use std::rc::Rc;
 
 #[derive(Clone, Debug)]

rust/cube/cubesqlplanner/cubesqlplanner/src/logical_plan/schema.rs

@@ -2,8 +2,8 @@ use cubenativeutils::CubeError;
 use itertools::Itertools;
 
 use super::pretty_print::*;
-use crate::planner::sql_evaluator::collectors::has_multi_stage_members;
-use crate::planner::sql_evaluator::MemberSymbol;
+use crate::planner::collectors::has_multi_stage_members;
+use crate::planner::MemberSymbol;
 use std::collections::HashSet;
 use std::fmt;
 use std::rc::Rc;
@@ -142,7 +142,7 @@ impl PrettyPrint for LogicalSchema {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::planner::sql_evaluator::symbols::TimeDimensionSymbol;
+    use crate::planner::symbols::TimeDimensionSymbol;
     use crate::test_fixtures::cube_bridge::MockSchema;
     use crate::test_fixtures::test_utils::TestContext;
 

rust/cube/cubesqlplanner/cubesqlplanner/src/plan/builder/join.rs → rust/cube/cubesqlplanner/cubesqlplanner/src/physical_plan/builder/join.rs

@@ -1,5 +1,5 @@
-use crate::plan::join::JoinType;
-use crate::plan::{
+use crate::physical_plan::join::JoinType;
+use crate::physical_plan::{
     Join, JoinCondition, JoinItem, QueryPlan, Schema, Select, SingleAliasedSource, SingleSource,
 };
 use crate::planner::BaseCube;

rust/cube/cubesqlplanner/cubesqlplanner/src/plan/builder/select.rs → rust/cube/cubesqlplanner/cubesqlplanner/src/physical_plan/builder/select.rs

@@ -1,14 +1,14 @@
-use crate::plan::{
+use crate::physical_plan::{
     AliasedExpr, Cte, Expr, From, FromSource, MemberExpression, OrderBy, QualifiedColumnName,
     Schema, SchemaColumn, Select, SingleAliasedSource, SingleSource,
 };
 use crate::planner::filter::Filter;
 
-use crate::plan::expression::FunctionExpression;
+use crate::physical_plan::expression::FunctionExpression;
+use crate::physical_plan::sql_nodes::SqlNodesFactory;
+use crate::physical_plan::VisitorContext;
 use crate::planner::query_tools::QueryTools;
-use crate::planner::sql_evaluator::sql_nodes::SqlNodesFactory;
-use crate::planner::sql_evaluator::MemberSymbol;
-use crate::planner::VisitorContext;
+use crate::planner::MemberSymbol;
 use cubenativeutils::CubeError;
 use std::collections::HashMap;
 use std::rc::Rc;

rust/cube/cubesqlplanner/cubesqlplanner/src/plan/calc_groups_join.rs → rust/cube/cubesqlplanner/cubesqlplanner/src/physical_plan/calc_groups_join.rs

@@ -1,8 +1,8 @@
 use super::*;
-use crate::planner::sql_evaluator::MemberSymbol;
+use crate::physical_plan::VisitorContext;
 use crate::planner::sql_templates::structs::TemplateCalcGroup;
 use crate::planner::sql_templates::PlanSqlTemplates;
-use crate::planner::VisitorContext;
+use crate::planner::MemberSymbol;
 use cubenativeutils::CubeError;
 use itertools::Itertools;
 use std::rc::Rc;

rust/cube/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/cube_ref_evaluator.rs → rust/cube/cubesqlplanner/cubesqlplanner/src/physical_plan/cube_ref_evaluator.rs

@@ -1,7 +1,7 @@
 use super::sql_nodes::SqlNode;
 use super::SqlEvaluatorVisitor;
 use crate::planner::query_tools::QueryTools;
-use crate::planner::sql_evaluator::sql_call::CubeRef;
+use crate::planner::sql_call::CubeRef;
 use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::collections::HashMap;

rust/cube/cubesqlplanner/cubesqlplanner/src/plan/expression.rs → rust/cube/cubesqlplanner/cubesqlplanner/src/physical_plan/expression.rs

@@ -1,7 +1,6 @@
-use super::QualifiedColumnName;
-use crate::planner::sql_evaluator::MemberSymbol;
+use super::{evaluate_with_context, QualifiedColumnName, VisitorContext};
 use crate::planner::sql_templates::PlanSqlTemplates;
-use crate::planner::{evaluate_with_context, VisitorContext};
+use crate::planner::MemberSymbol;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 

rust/cube/cubesqlplanner/cubesqlplanner/src/plan/filter/base_filter.rs → rust/cube/cubesqlplanner/cubesqlplanner/src/physical_plan/filter/base_filter.rs

@@ -1,9 +1,9 @@
 use super::ToSql;
+use crate::physical_plan::sql_nodes::SqlNode;
+use crate::physical_plan::SqlEvaluatorVisitor;
 use crate::planner::filter::typed_filter::resolve_base_symbol;
 use crate::planner::filter::BaseFilter;
 use crate::planner::query_tools::QueryTools;
-use crate::planner::sql_evaluator::sql_nodes::SqlNode;
-use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
 use crate::planner::sql_templates::PlanSqlTemplates;
 use crate::planner::FiltersContext;
 use cubenativeutils::CubeError;

rust/cube/cubesqlplanner/cubesqlplanner/src/plan/filter/base_segment.rs → rust/cube/cubesqlplanner/cubesqlplanner/src/physical_plan/filter/base_segment.rs

@@ -1,8 +1,8 @@
 use super::ToSql;
+use crate::physical_plan::sql_nodes::SqlNode;
+use crate::physical_plan::SqlEvaluatorVisitor;
 use crate::planner::filter::BaseSegment;
 use crate::planner::query_tools::QueryTools;
-use crate::planner::sql_evaluator::sql_nodes::SqlNode;
-use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
 use crate::planner::sql_templates::PlanSqlTemplates;
 use crate::planner::FiltersContext;
 use cubenativeutils::CubeError;

rust/cube/cubesqlplanner/cubesqlplanner/src/plan/filter/filter.rs → rust/cube/cubesqlplanner/cubesqlplanner/src/physical_plan/filter/filter.rs

@@ -1,8 +1,8 @@
 use super::ToSql;
+use crate::physical_plan::sql_nodes::SqlNode;
+use crate::physical_plan::SqlEvaluatorVisitor;
 use crate::planner::filter::{Filter, FilterItem};
 use crate::planner::query_tools::QueryTools;
-use crate::planner::sql_evaluator::sql_nodes::SqlNode;
-use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
 use crate::planner::sql_templates::PlanSqlTemplates;
 use crate::planner::FiltersContext;
 use cubenativeutils::CubeError;

rust/cube/cubesqlplanner/cubesqlplanner/src/plan/filter/operators/measure_filter.rs → rust/cube/cubesqlplanner/cubesqlplanner/src/physical_plan/filter/operators/measure_filter.rs

@@ -1,8 +1,9 @@
+use crate::physical_plan::sql_nodes::SqlNode;
+use crate::physical_plan::SqlEvaluatorVisitor;
 use crate::planner::filter::operators::measure_filter::MeasureFilterOp;
 use crate::planner::query_tools::QueryTools;
-use crate::planner::sql_evaluator::sql_nodes::SqlNode;
-use crate::planner::sql_evaluator::{MemberSymbol, SqlEvaluatorVisitor};
 use crate::planner::sql_templates::PlanSqlTemplates;
+use crate::planner::MemberSymbol;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 

rust/cube/cubesqlplanner/cubesqlplanner/src/plan/filter/render_filter.rs → rust/cube/cubesqlplanner/cubesqlplanner/src/physical_plan/filter/render_filter.rs

@@ -1,7 +1,7 @@
 use super::ToSql;
+use crate::physical_plan::VisitorContext;
 use crate::planner::filter::{Filter, FilterItem};
 use crate::planner::sql_templates::PlanSqlTemplates;
-use crate::planner::VisitorContext;
 use cubenativeutils::CubeError;
 
 pub fn render_filter(

rust/cube/cubesqlplanner/cubesqlplanner/src/plan/filter/to_sql.rs → rust/cube/cubesqlplanner/cubesqlplanner/src/physical_plan/filter/to_sql.rs

@@ -1,6 +1,6 @@
+use crate::physical_plan::sql_nodes::SqlNode;
+use crate::physical_plan::SqlEvaluatorVisitor;
 use crate::planner::query_tools::QueryTools;
-use crate::planner::sql_evaluator::sql_nodes::SqlNode;
-use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
 use crate::planner::sql_templates::PlanSqlTemplates;
 use crate::planner::FiltersContext;
 use cubenativeutils::CubeError;

rust/cube/cubesqlplanner/cubesqlplanner/src/plan/filter/typed_filter.rs → rust/cube/cubesqlplanner/cubesqlplanner/src/physical_plan/filter/typed_filter.rs

@@ -1,10 +1,10 @@
 use super::operators::{FilterOperationSql, FilterSqlContext};
 use super::ToSql;
 use crate::cube_bridge::member_sql::FilterParamsColumn;
+use crate::physical_plan::sql_nodes::SqlNode;
+use crate::physical_plan::SqlEvaluatorVisitor;
 use crate::planner::filter::typed_filter::{resolve_base_symbol, FilterOp, TypedFilter};
 use crate::planner::query_tools::QueryTools;
-use crate::planner::sql_evaluator::sql_nodes::SqlNode;
-use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
 use crate::planner::sql_templates::PlanSqlTemplates;
 use crate::planner::FiltersContext;
 use cubenativeutils::CubeError;

rust/cube/cubesqlplanner/cubesqlplanner/src/plan/from.rs → rust/cube/cubesqlplanner/cubesqlplanner/src/physical_plan/from.rs

@@ -1,7 +1,7 @@
-use super::{CalcGroupsJoin, Join, QueryPlan, Schema, Select};
-use crate::plan::Union;
+use super::{CalcGroupsJoin, Join, QueryPlan, Schema, Select, VisitorContext};
+use crate::physical_plan::Union;
 use crate::planner::sql_templates::PlanSqlTemplates;
-use crate::planner::{BaseCube, VisitorContext};
+use crate::planner::BaseCube;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 

rust/cube/cubesqlplanner/cubesqlplanner/src/plan/join.rs → rust/cube/cubesqlplanner/cubesqlplanner/src/physical_plan/join.rs

@@ -1,7 +1,7 @@
-use super::{Expr, SingleAliasedSource};
+use super::{Expr, SingleAliasedSource, VisitorContext};
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_templates::PlanSqlTemplates;
-use crate::planner::{BaseJoinCondition, Granularity, VisitorContext};
+use crate::planner::{BaseJoinCondition, Granularity};
 use cubenativeutils::CubeError;
 use lazy_static::lazy_static;
 

rust/cube/cubesqlplanner/cubesqlplanner/src/plan/mod.rs → rust/cube/cubesqlplanner/cubesqlplanner/src/physical_plan/mod.rs

@@ -1,29 +1,38 @@
 pub mod builder;
 pub mod calc_groups_join;
 pub mod cte;
+pub mod cube_ref_evaluator;
 pub mod expression;
 pub mod filter;
 pub mod from;
 pub mod join;
 pub mod order;
 pub mod query_plan;
+pub mod references_builder;
 pub mod schema;
 pub mod select;
+pub mod sql_nodes;
+pub mod sql_visitor;
 pub mod symbols;
 pub mod time_series;
 pub mod union;
+pub mod visitor_context;
 
 pub use builder::{JoinBuilder, SelectBuilder};
 pub use calc_groups_join::*;
 pub use cte::Cte;
+pub use cube_ref_evaluator::CubeRefEvaluator;
 pub use expression::{Expr, MemberExpression};
 pub use from::{From, FromSource, SingleAliasedSource, SingleSource};
 pub use join::{
     Join, JoinCondition, JoinItem, RegularRollingWindowJoinCondition, RollingTotalJoinCondition,
 };
 pub use order::OrderBy;
 pub use query_plan::QueryPlan;
+pub use references_builder::ReferencesBuilder;
 pub use schema::{QualifiedColumnName, Schema, SchemaColumn};
 pub use select::{AliasedExpr, Select};
+pub use sql_visitor::SqlEvaluatorVisitor;
 pub use time_series::{TimeSeries, TimeSeriesDateRange};
 pub use union::Union;
+pub use visitor_context::{evaluate_sql_call_with_context, evaluate_with_context, VisitorContext};