in work

Author: waralexrom

rust/cubesqlplanner/cubesqlplanner/src/logical_plan/optimizers/pre_aggregation/mod.rs

@@ -2,14 +2,14 @@ mod compiled_pre_aggregation;
 mod dimension_matcher;
 mod measure_matcher;
 mod optimizer;
-//mod original_sql_collector;
+mod original_sql_collector;
 //mod original_sql_optimizer;
 mod pre_aggregations_compiler;
 
 pub use compiled_pre_aggregation::*;
 use dimension_matcher::*;
 use measure_matcher::*;
 pub use optimizer::*;
-//pub use original_sql_collector::*;
+pub use original_sql_collector::*;
 //pub use original_sql_optimizer::*;
 pub use pre_aggregations_compiler::*;

rust/cubesqlplanner/cubesqlplanner/src/logical_plan/optimizers/pre_aggregation/original_sql_collector.rs

@@ -13,10 +13,8 @@ impl OriginalSqlCollector {
         Self { query_tools }
     }
 
-    pub fn collect(&mut self, plan: &Query) -> Result<HashMap<String, String>, CubeError> {
-        let mut cube_names_collector = CubeNamesCollector::new();
-        cube_names_collector.collect(&plan)?;
-        let cube_names = cube_names_collector.result();
+    pub fn collect(&mut self, plan: &Rc<Query>) -> Result<HashMap<String, String>, CubeError> {
+        let cube_names = collect_cube_names_from_node(&plan)?;
         let mut result = HashMap::new();
         for cube_name in cube_names.iter() {
             let pre_aggregations = self

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

@@ -3,6 +3,7 @@ use super::query_tools::QueryTools;
 use super::QueryProperties;
 use crate::cube_bridge::base_query_options::BaseQueryOptions;
 use crate::cube_bridge::pre_aggregation_obj::NativePreAggregationObj;
+use crate::logical_plan::OriginalSqlCollector;
 //use crate::logical_plan::optimizers::*;
 use crate::logical_plan::PreAggregation;
 use crate::logical_plan::PreAggregationOptimizer;
@@ -104,15 +105,15 @@ impl<IT: InnerTypes> BaseQuery<IT> {
 
         let physical_plan_builder =
             PhysicalPlanBuilder::new(self.query_tools.clone(), templates.clone());
-        /* let original_sql_pre_aggregations = if !self.request.is_pre_aggregation_query() {
+        let original_sql_pre_aggregations = if !self.request.is_pre_aggregation_query() {
             OriginalSqlCollector::new(self.query_tools.clone()).collect(&optimized_plan)?
         } else {
             HashMap::new()
-        }; */
+        };
 
         let physical_plan = physical_plan_builder.build(
             optimized_plan,
-            HashMap::new(), //original_sql_pre_aggregations,
+            original_sql_pre_aggregations,
             self.request.is_total_query(),
         )?;