in work

Author: waralexrom

rust/cubesqlplanner/cubesqlplanner/src/physical_plan_builder/builder.rs

@@ -22,33 +22,6 @@ use std::rc::Rc;
 const TOTAL_COUNT: &str = "total_count";
 const ORIGINAL_QUERY: &str = "original_query";
 
-#[derive(Clone, Debug, Default)]
-struct PhysicalPlanBuilderContext {
-    pub alias_prefix: Option<String>,
-    pub render_measure_as_state: bool, //Render measure as state, for example hll state for count_approx
-    pub render_measure_for_ungrouped: bool,
-    pub time_shifts: TimeShiftState,
-    pub original_sql_pre_aggregations: HashMap<String, String>,
-}
-
-impl PhysicalPlanBuilderContext {
-    pub fn make_sql_nodes_factory(&self) -> Result<SqlNodesFactory, CubeError> {
-        let mut factory = SqlNodesFactory::new();
-
-        let (time_shifts, calendar_time_shifts) = self.time_shifts.extract_time_shifts()?;
-        let common_time_shifts = TimeShiftState {
-            dimensions_shifts: time_shifts,
-        };
-
-        factory.set_time_shifts(common_time_shifts);
-        factory.set_calendar_time_shifts(calendar_time_shifts);
-        factory.set_count_approx_as_state(self.render_measure_as_state);
-        factory.set_ungrouped_measure(self.render_measure_for_ungrouped);
-        factory.set_original_sql_pre_aggregations(self.original_sql_pre_aggregations.clone());
-        Ok(factory)
-    }
-}
-
 pub struct PhysicalPlanBuilder {
     query_tools: Rc<QueryTools>,
     plan_sql_templates: PlanSqlTemplates,

rust/cubesqlplanner/cubesqlplanner/src/physical_plan_builder/context.rs

@@ -21,13 +21,20 @@ pub(super) struct PushDownBuilderContext {
 }
 
 impl PushDownBuilderContext {
-    pub fn make_sql_nodes_factory(&self) -> SqlNodesFactory {
+    pub fn make_sql_nodes_factory(&self) -> Result<SqlNodesFactory, CubeError> {
         let mut factory = SqlNodesFactory::new();
-        factory.set_time_shifts(self.time_shifts.clone());
+
+        let (time_shifts, calendar_time_shifts) = self.time_shifts.extract_time_shifts()?;
+        let common_time_shifts = TimeShiftState {
+            dimensions_shifts: time_shifts,
+        };
+
+        factory.set_time_shifts(common_time_shifts);
+        factory.set_calendar_time_shifts(calendar_time_shifts);
         factory.set_count_approx_as_state(self.render_measure_as_state);
         factory.set_ungrouped_measure(self.render_measure_for_ungrouped);
         factory.set_original_sql_pre_aggregations(self.original_sql_pre_aggregations.clone());
-        factory
+        Ok(factory)
     }
 
     pub fn add_multi_stage_schema(&mut self, name: String, schema: Rc<Schema>) {

rust/cubesqlplanner/cubesqlplanner/src/physical_plan_builder/processors/aggregate_multiplied_subquery.rs

@@ -44,7 +44,7 @@ impl<'a> LogicalNodeProcessor<'a, AggregateMultipliedSubquery>
         let mut join_builder =
             JoinBuilder::new_from_subselect(keys_query.clone(), keys_query_alias.clone());
 
-        let mut context_factory = context.make_sql_nodes_factory();
+        let mut context_factory = context.make_sql_nodes_factory()?;
         let primary_keys_dimensions = &aggregate_multiplied_subquery
             .keys_subquery
             .primary_keys_dimensions;

rust/cubesqlplanner/cubesqlplanner/src/physical_plan_builder/processors/keys_sub_query.rs

@@ -59,7 +59,7 @@ impl<'a> LogicalNodeProcessor<'a, KeysSubQuery> for KeysSubQueryProcessor<'a> {
 
         select_builder.set_distinct();
         select_builder.set_filter(keys_subquery.filter.all_filters());
-        let mut context_factory = context.make_sql_nodes_factory();
+        let mut context_factory = context.make_sql_nodes_factory()?;
         context_factory.set_render_references(render_references);
         let res = Rc::new(select_builder.build(context_factory));
         Ok(res)

rust/cubesqlplanner/cubesqlplanner/src/physical_plan_builder/processors/measure_subquery.rs

@@ -28,7 +28,7 @@ impl<'a> LogicalNodeProcessor<'a, MeasureSubquery> for MeasureSubqueryProcessor<
             .builder
             .process_node(measure_subquery.source.as_ref(), context)?;
 
-        let mut context_factory = context.make_sql_nodes_factory();
+        let mut context_factory = context.make_sql_nodes_factory()?;
         let references_builder = ReferencesBuilder::new(from.clone());
         let mut select_builder = SelectBuilder::new(from);
 

rust/cubesqlplanner/cubesqlplanner/src/physical_plan_builder/processors/multi_stage_get_date_range.rs

@@ -30,7 +30,7 @@ impl<'a> LogicalNodeProcessor<'a, MultiStageGetDateRange> for MultiStageGetDateR
             .process_node(get_date_range.source.as_ref(), context)?;
         let references_builder = ReferencesBuilder::new(from.clone());
         let mut select_builder = SelectBuilder::new(from);
-        let mut context_factory = context.make_sql_nodes_factory();
+        let mut context_factory = context.make_sql_nodes_factory()?;
         let args = vec![get_date_range
             .time_dimension
             .clone()

rust/cubesqlplanner/cubesqlplanner/src/physical_plan_builder/processors/multi_stage_measure_calculation.rs

@@ -80,7 +80,7 @@ impl<'a> LogicalNodeProcessor<'a, MultiStageMeasureCalculation>
             );
         }
 
-        let mut context_factory = context.make_sql_nodes_factory();
+        let mut context_factory = context.make_sql_nodes_factory()?;
         let partition_by = measure_calculation
             .partition_by
             .iter()

rust/cubesqlplanner/cubesqlplanner/src/physical_plan_builder/processors/multi_stage_rolling_window.rs

@@ -93,7 +93,7 @@ impl<'a> LogicalNodeProcessor<'a, MultiStageRollingWindow>
             on,
         );
 
-        let mut context_factory = context.make_sql_nodes_factory();
+        let mut context_factory = context.make_sql_nodes_factory()?;
         context_factory.set_rolling_window(true);
         let from = From::new_from_join(join_builder.build());
         let references_builder = ReferencesBuilder::new(from.clone());

rust/cubesqlplanner/cubesqlplanner/src/physical_plan_builder/processors/query.rs

@@ -38,7 +38,7 @@ impl<'a> LogicalNodeProcessor<'a, Query> for QueryProcessor<'a> {
         context: &PushDownBuilderContext,
     ) -> Result<Self::PhysycalNode, CubeError> {
         let query_tools = self.builder.query_tools();
-        let mut context_factory = context.make_sql_nodes_factory();
+        let mut context_factory = context.make_sql_nodes_factory()?;
         let mut render_references = HashMap::new();
         let mut context = context.clone();
         let mut ctes = vec![];