remove dublicated functions

Author: waralexrom

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

@@ -34,8 +34,8 @@ impl FullKeyAggregateQueryPlanner {
         };
 
         let schema = LogicalSchema::default()
-            .set_dimensions(self.query_properties.dimension_symbols())
-            .set_time_dimensions(self.query_properties.time_dimension_symbols())
+            .set_dimensions(self.query_properties.dimensions().clone())
+            .set_time_dimensions(self.query_properties.time_dimensions().clone())
             .set_measures(measures)
             .into_rc();
         Ok(Rc::new(FullKeyAggregate {
@@ -62,9 +62,9 @@ impl FullKeyAggregateQueryPlanner {
             .rendered_as_multiplied_measures
             .clone();
         let schema = LogicalSchema::default()
-            .set_dimensions(self.query_properties.dimension_symbols())
-            .set_time_dimensions(self.query_properties.time_dimension_symbols())
-            .set_measures(self.query_properties.measure_symbols())
+            .set_dimensions(self.query_properties.dimensions().clone())
+            .set_time_dimensions(self.query_properties.time_dimensions().clone())
+            .set_measures(self.query_properties.measures().clone())
             .set_multiplied_measures(multiplied_measures)
             .into_rc();
 

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

@@ -154,8 +154,8 @@ impl MultiStageMemberQueryPlanner {
         };
 
         let schema = LogicalSchema::default()
-            .set_dimensions(self.query_properties.dimension_symbols())
-            .set_time_dimensions(self.query_properties.time_dimension_symbols())
+            .set_dimensions(self.query_properties.dimensions().clone())
+            .set_time_dimensions(self.query_properties.time_dimensions().clone())
             .set_measures(vec![self.description.member().evaluation_node().clone()])
             .into_rc();
 

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

@@ -289,8 +289,8 @@ impl MultiStageQueryPlanner {
                     .iter()
                     .map(|d| d.as_time_dimension())
                     .collect::<Result<Vec<_>, _>>()?;
-                for dim in self.query_properties.dimension_symbols() {
-                    let dim = dim.resolve_reference_chain();
+                for dim in self.query_properties.dimensions() {
+                    let dim = dim.clone().resolve_reference_chain();
                     if let Ok(time_dimension) = dim.as_time_dimension() {
                         time_dimensions.push(time_dimension);
                     }

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

@@ -103,8 +103,8 @@ impl MultipliedMeasuresQueryPlanner {
                 .map(|m| m.clone())
                 .collect_vec();
             let schema = LogicalSchema::default()
-                .set_time_dimensions(self.query_properties.time_dimension_symbols())
-                .set_dimensions(self.query_properties.dimension_symbols())
+                .set_time_dimensions(self.query_properties.time_dimensions().clone())
+                .set_dimensions(self.query_properties.dimensions().clone())
                 .set_measures(all_measures)
                 .set_multiplied_measures(
                     full_key_aggregate_measures
@@ -150,8 +150,8 @@ impl MultipliedMeasuresQueryPlanner {
             self.key_query(&primary_keys_dimensions, key_join.clone(), key_cube_name)?;
 
         let schema = LogicalSchema::default()
-            .set_dimensions(self.query_properties.dimension_symbols())
-            .set_time_dimensions(self.query_properties.time_dimension_symbols())
+            .set_dimensions(self.query_properties.dimensions().clone())
+            .set_time_dimensions(self.query_properties.time_dimensions().clone())
             .set_measures(measures.clone())
             .set_multiplied_measures(
                 self.full_key_aggregate_measures
@@ -272,8 +272,8 @@ impl MultipliedMeasuresQueryPlanner {
             .make_join_logical_plan(join, subquery_dimension_queries.clone())?;
 
         let schema = LogicalSchema::default()
-            .set_dimensions(self.query_properties.dimension_symbols())
-            .set_time_dimensions(self.query_properties.time_dimension_symbols())
+            .set_dimensions(self.query_properties.dimensions().clone())
+            .set_time_dimensions(self.query_properties.time_dimensions().clone())
             .set_measures(measures.clone())
             .set_multiplied_measures(
                 self.full_key_aggregate_measures
@@ -337,8 +337,8 @@ impl MultipliedMeasuresQueryPlanner {
         });
 
         let schema = LogicalSchema::default()
-            .set_dimensions(self.query_properties.dimension_symbols())
-            .set_time_dimensions(self.query_properties.time_dimension_symbols())
+            .set_dimensions(self.query_properties.dimensions().clone())
+            .set_time_dimensions(self.query_properties.time_dimensions().clone())
             .into_rc();
 
         let keys_query = KeysSubQuery {

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

@@ -29,9 +29,9 @@ impl SimpleQueryPlanner {
             .rendered_as_multiplied_measures
             .clone();
         let schema = LogicalSchema::default()
-            .set_dimensions(self.query_properties.dimension_symbols())
-            .set_measures(self.query_properties.measure_symbols())
-            .set_time_dimensions(self.query_properties.time_dimension_symbols())
+            .set_dimensions(self.query_properties.dimensions().clone())
+            .set_measures(self.query_properties.measures().clone())
+            .set_time_dimensions(self.query_properties.time_dimensions().clone())
             .set_multiplied_measures(multiplied_measures)
             .into_rc();
         let logical_filter = Rc::new(LogicalFilter {
@@ -58,7 +58,7 @@ impl SimpleQueryPlanner {
     pub fn source_and_subquery_dimensions(&self) -> Result<Rc<LogicalJoin>, CubeError> {
         let join = self.query_properties.simple_query_join()?;
         let subquery_dimensions = collect_sub_query_dimensions_from_symbols(
-            &self.query_properties.all_member_symbols(false),
+            &self.query_properties.all_members(false),
             &self.join_planner,
             &join,
         )?;

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

@@ -620,18 +620,6 @@ impl QueryProperties {
         &self.dimensions
     }
 
-    pub fn dimension_symbols(&self) -> Vec<Rc<MemberSymbol>> {
-        self.dimensions.clone()
-    }
-
-    pub fn time_dimension_symbols(&self) -> Vec<Rc<MemberSymbol>> {
-        self.time_dimensions.clone()
-    }
-
-    pub fn measure_symbols(&self) -> Vec<Rc<MemberSymbol>> {
-        self.measures().clone()
-    }
-
     pub fn time_dimensions(&self) -> &Vec<Rc<MemberSymbol>> {
         &self.time_dimensions
     }
@@ -715,9 +703,6 @@ impl QueryProperties {
                 .collect_vec()
         }
     }
-    pub fn all_member_symbols(&self, exclude_time_dimensions: bool) -> Vec<Rc<MemberSymbol>> {
-        self.all_members(exclude_time_dimensions)
-    }
 
     pub fn get_member_symbols(
         &self,