update

Author: waralexrom

rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/applyed_state.rs renamed to rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/applied_state.rs

@@ -7,13 +7,13 @@ use std::fmt::Debug;
 use std::rc::Rc;
 
 #[derive(Clone)]
-pub struct MultiStageApplyedState {
+pub struct MultiStageAppliedState {
     dimensions: Vec<Rc<BaseDimension>>,
     allowed_filter_members: HashSet<String>,
     time_shifts: HashMap<String, String>,
 }
 
-impl MultiStageApplyedState {
+impl MultiStageAppliedState {
     pub fn new(
         dimensions: Vec<Rc<BaseDimension>>,
         allowed_filter_members: HashSet<String>,
@@ -71,7 +71,7 @@ impl MultiStageApplyedState {
     }
 }
 
-impl PartialEq for MultiStageApplyedState {
+impl PartialEq for MultiStageAppliedState {
     fn eq(&self, other: &Self) -> bool {
         let dims_eq = if !self.dimensions.len() == other.dimensions.len() {
             false
@@ -87,9 +87,9 @@ impl PartialEq for MultiStageApplyedState {
     }
 }
 
-impl Debug for MultiStageApplyedState {
+impl Debug for MultiStageAppliedState {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("MultiStageApplyedState")
+        f.debug_struct("MultiStageAppliedState")
             .field(
                 "dimensions",
                 &self

rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/member_query_planner.rs

@@ -72,14 +72,15 @@ impl MultiStageMemberQueryPlanner {
 
         let references = BaseMemberHelper::to_reference_map(&self.all_input_members()?);
 
-        let partition = self.member_partition(query_member.reduce_by(), query_member.group_by());
+        let partition_by =
+            self.member_partition_by(query_member.reduce_by(), query_member.group_by());
 
         let context_factory = SqlNodesFactory::new();
 
         let node_context = if query_member.measure_type() == "rank" {
-            context_factory.multi_stage_rank_node_processor(partition, references)
-        } else if !query_member.is_calculated() && partition != dimensions_aliases {
-            context_factory.multi_stage_window_node_processor(partition, references)
+            context_factory.multi_stage_rank_node_processor(partition_by, references)
+        } else if !query_member.is_calculated() && partition_by != dimensions_aliases {
+            context_factory.multi_stage_window_node_processor(partition_by, references)
         } else {
             context_factory.with_render_references_default_node_processor(references)
         };
@@ -310,7 +311,7 @@ impl MultiStageMemberQueryPlanner {
         )
     }
 
-    fn member_partition(
+    fn member_partition_by(
         &self,
         reduce_by: &Option<Vec<String>>,
         group_by: &Option<Vec<String>>,

rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/mod.rs

@@ -1,7 +1,7 @@
-mod applyed_state;
+mod applied_state;
 mod member_query_planner;
 mod query_description;
 
-pub use applyed_state::MultiStageApplyedState;
+pub use applied_state::MultiStageAppliedState;
 pub use member_query_planner::MultiStageMemberQueryPlanner;
 pub use query_description::MultiStageQueryDescription;

rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/query_description.rs

@@ -1,11 +1,11 @@
-use super::MultiStageApplyedState;
+use super::MultiStageAppliedState;
 use crate::planner::sql_evaluator::EvaluationNode;
 use std::fmt::Debug;
 use std::rc::Rc;
 
 pub struct MultiStageQueryDescription {
     member_node: Rc<EvaluationNode>,
-    state: Rc<MultiStageApplyedState>,
+    state: Rc<MultiStageAppliedState>,
     input: Vec<Rc<MultiStageQueryDescription>>,
     alias: String,
 }
@@ -27,7 +27,7 @@ impl Debug for MultiStageQueryDescription {
 impl MultiStageQueryDescription {
     pub fn new(
         member_node: Rc<EvaluationNode>,
-        state: Rc<MultiStageApplyedState>,
+        state: Rc<MultiStageAppliedState>,
         input: Vec<Rc<MultiStageQueryDescription>>,
         alias: String,
     ) -> Rc<Self> {
@@ -43,7 +43,7 @@ impl MultiStageQueryDescription {
         &self.member_node
     }
 
-    pub fn state(&self) -> Rc<MultiStageApplyedState> {
+    pub fn state(&self) -> Rc<MultiStageAppliedState> {
         self.state.clone()
     }
 
@@ -66,7 +66,7 @@ impl MultiStageQueryDescription {
     pub fn is_match_member_and_state(
         &self,
         member_node: &Rc<EvaluationNode>,
-        state: &Rc<MultiStageApplyedState>,
+        state: &Rc<MultiStageAppliedState>,
     ) -> bool {
         member_node.full_name() == self.member_name() && state == &self.state
     }

rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage_query_planner.rs

@@ -1,5 +1,5 @@
 use super::multi_stage::MultiStageMemberQueryPlanner;
-use super::multi_stage::{MultiStageApplyedState, MultiStageQueryDescription};
+use super::multi_stage::{MultiStageAppliedState, MultiStageQueryDescription};
 use crate::plan::{Expr, From, Select, Subquery};
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::collectors::has_multi_stage_members;
@@ -41,7 +41,7 @@ impl MultiStageQueryPlanner {
         }
         let mut descriptions = Vec::new();
         let all_filter_members = self.query_properties.all_filtered_members();
-        let state = MultiStageApplyedState::new(
+        let state = MultiStageAppliedState::new(
             self.query_properties.dimensions().clone(),
             all_filter_members,
         );
@@ -93,7 +93,7 @@ impl MultiStageQueryPlanner {
     fn make_queries_descriptions(
         &self,
         member: Rc<EvaluationNode>,
-        state: Rc<MultiStageApplyedState>,
+        state: Rc<MultiStageAppliedState>,
         descriptions: &mut Vec<Rc<MultiStageQueryDescription>>,
     ) -> Result<Rc<MultiStageQueryDescription>, CubeError> {
         let member_name = member.full_name();

rust/cubesqlplanner/cubesqlplanner/src/planner/query_properties.rs

@@ -108,7 +108,7 @@ impl QueryProperties {
         let all_join_hints = evaluator_compiler.join_hints()?;
         let join = query_tools.join_graph().build_join(all_join_hints)?;
         query_tools.cached_data_mut().set_join(join);
-        //FIXME may be this filter should be applyed on other place
+        //FIXME may be this filter should be applied on other place
         let time_dimensions = time_dimensions
             .into_iter()
             .filter(|dim| dim.has_granularity())

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/factory.rs

@@ -72,15 +72,15 @@ impl SqlNodesFactory {
         let measure_filter_processor = MeasureFilterSqlNode::new(auto_prefix_processor.clone());
         let final_measure_processor = FinalMeasureSqlNode::new(measure_filter_processor.clone());
 
-        let rank_processor = MultiStageWindowNode::new(
+        let window_processor = MultiStageWindowNode::new(
             evaluate_sql_processor.clone(),
             final_measure_processor.clone(),
             partition,
         );
 
         let root_processor = RootSqlNode::new(
             self.dimension_processor(auto_prefix_processor.clone()),
-            rank_processor.clone(),
+            window_processor.clone(),
             auto_prefix_processor.clone(),
             evaluate_sql_processor.clone(),
         );