chore(tesseract): unify QueryProperties with MultiStageAppliedState (#10843)

Author: waralexrom

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

@@ -1,5 +1,4 @@
 mod calculation;
-mod common;
 mod dimension;
 mod get_date_range;
 mod leaf_measure;

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

@@ -1,6 +1,6 @@
 use super::query_tools::QueryTools;
 use super::top_level_planner::TopLevelPlanner;
-use super::QueryProperties;
+use super::{QueryProperties, QueryPropertiesCompiler};
 use crate::cube_bridge::base_query_options::BaseQueryOptions;
 use crate::cube_bridge::pre_aggregation_obj::NativePreAggregationObj;
 use crate::logical_plan::PreAggregationUsage;
@@ -61,7 +61,7 @@ impl<IT: InnerTypes> BaseQuery<IT> {
             options.static_data().member_to_alias.clone(),
         )?;
 
-        let request = QueryProperties::try_new(query_tools.clone(), options)?;
+        let request = QueryPropertiesCompiler::new(query_tools.clone()).build(options)?;
 
         Ok(Self {
             context,

rust/cube/cubesqlplanner/cubesqlplanner/src/planner/base_query.rs

@@ -15,6 +15,7 @@ pub mod visitor;
 pub mod params_allocator;
 pub mod planners;
 pub mod query_properties;
+pub mod query_properties_compiler;
 pub mod query_tools;
 pub mod sql_templates;
 pub mod top_level_planner;
@@ -29,6 +30,7 @@ pub use compiler::Compiler;
 pub use join_hints::JoinHints;
 pub use params_allocator::ParamsAllocator;
 pub use query_properties::{FullKeyAggregateMeasures, OrderByItem, QueryProperties};
+pub use query_properties_compiler::QueryPropertiesCompiler;
 pub use sql_call::*;
 pub use symbols::*;
 pub use time_dimension::*;

rust/cube/cubesqlplanner/cubesqlplanner/src/planner/mod.rs

@@ -59,13 +59,6 @@ pub struct MeasuresJoinHints {
 }
 
 impl MeasuresJoinHints {
-    pub fn empty() -> Self {
-        Self {
-            base_hints: JoinHints::new(),
-            measure_hints: vec![],
-        }
-    }
-
     pub fn builder(query_join_hints: &JoinHints) -> MeasuresJoinHintsBuilder {
         MeasuresJoinHintsBuilder {
             initial_hints: query_join_hints.clone(),
@@ -137,16 +130,6 @@ pub struct MultiFactJoinGroups {
 }
 
 impl MultiFactJoinGroups {
-    pub fn empty(query_tools: Rc<QueryTools>) -> Self {
-        Self {
-            query_tools,
-            measures_join_hints: MeasuresJoinHints::empty(),
-            groups: vec![],
-            dimension_paths: HashMap::new(),
-            measure_paths: HashMap::new(),
-        }
-    }
-
     pub fn try_new(
         query_tools: Rc<QueryTools>,
         measures_join_hints: MeasuresJoinHints,

rust/cube/cubesqlplanner/cubesqlplanner/src/planner/multi_fact_join_groups.rs

@@ -3,7 +3,6 @@ use crate::logical_plan::{pretty_print_rc, DimensionSubQuery};
 use crate::physical_plan::QualifiedColumnName;
 use crate::planner::collectors::collect_sub_query_dimensions;
 use crate::planner::filter::FilterItem;
-use crate::planner::join_hints::JoinHints;
 use crate::planner::query_tools::QueryTools;
 use crate::planner::QueryProperties;
 use crate::planner::{MemberExpressionExpression, MemberExpressionSymbol, MemberSymbol};
@@ -111,26 +110,17 @@ impl DimensionSubqueryPlanner {
             (vec![], vec![])
         };
 
-        let sub_query_properties = QueryProperties::try_new_from_precompiled(
-            self.query_tools.clone(),
-            vec![measure.clone()], //measures,
-            primary_keys_dimensions.clone(),
-            vec![],
-            time_dimensions_filters,
-            dimensions_filters,
-            vec![],
-            vec![],
-            vec![],
-            None,
-            None,
-            true,
-            false,
-            false,
-            false,
-            Rc::new(JoinHints::new()),
-            true,
-            self.query_properties.disable_external_pre_aggregations(),
-        )?;
+        let sub_query_properties = QueryProperties::builder()
+            .query_tools(self.query_tools.clone())
+            .measures(vec![measure.clone()])
+            .dimensions(primary_keys_dimensions.clone())
+            .time_dimensions_filters(time_dimensions_filters)
+            .dimensions_filters(dimensions_filters)
+            .ignore_cumulative(true)
+            .disable_external_pre_aggregations(
+                self.query_properties.disable_external_pre_aggregations(),
+            )
+            .build()?;
         let query_planner = QueryPlanner::new(sub_query_properties, self.query_tools.clone());
         let sub_query = query_planner.plan()?;
         let result = Rc::new(DimensionSubQuery {

rust/cube/cubesqlplanner/cubesqlplanner/src/planner/planners/dimension_subquery_planner.rs

@@ -63,7 +63,7 @@ impl FullKeyAggregateQueryPlanner {
                 offset: self.query_properties.offset(),
                 limit: self.query_properties.row_limit(),
                 ungrouped: self.query_properties.ungrouped(),
-                order_by: self.query_properties.order_by().clone(),
+                order_by: self.query_properties.order_by().to_vec(),
             }))
             .source(source)
             .build();