cargo fmt

Author: KSDaemon

rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/evaluator.rs

@@ -1,13 +1,14 @@
 use super::cube_definition::{CubeDefinition, NativeCubeDefinition};
-use super::dimension_definition::{
-    DimensionDefinition, NativeDimensionDefinition,
-};
+use super::dimension_definition::{DimensionDefinition, NativeDimensionDefinition};
 use super::measure_definition::{MeasureDefinition, NativeMeasureDefinition};
 use super::member_sql::{MemberSql, NativeMemberSql};
 use super::pre_aggregation_description::{
     NativePreAggregationDescription, PreAggregationDescription,
 };
 use super::segment_definition::{NativeSegmentDefinition, SegmentDefinition};
+use crate::cube_bridge::granularity_definition::{
+    GranularityDefinition, NativeGranularityDefinition,
+};
 use cubenativeutils::wrappers::serializer::{
     NativeDeserialize, NativeDeserializer, NativeSerialize,
 };
@@ -19,7 +20,6 @@ use serde::{Deserialize, Serialize};
 use std::any::Any;
 use std::collections::HashMap;
 use std::rc::Rc;
-use crate::cube_bridge::granularity_definition::{GranularityDefinition, NativeGranularityDefinition};
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct CubeEvaluatorStatic {
@@ -55,7 +55,10 @@ pub trait CubeEvaluator {
         cube_name: String,
         sql: Rc<dyn MemberSql>,
     ) -> Result<Vec<CallDep>, CubeError>;
-    fn resolve_granularity(&self, path: Vec<String>) -> Result<Rc<dyn GranularityDefinition>, CubeError>;
+    fn resolve_granularity(
+        &self,
+        path: Vec<String>,
+    ) -> Result<Rc<dyn GranularityDefinition>, CubeError>;
     #[nbridge(vec)]
     fn pre_aggregations_for_cube_as_array(
         &self,

rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/mod.rs

@@ -11,6 +11,7 @@ pub mod evaluator;
 pub mod filter_group;
 pub mod filter_params;
 pub mod geo_item;
+pub mod granularity_definition;
 pub mod join_definition;
 pub mod join_graph;
 pub mod join_hints;
@@ -29,4 +30,3 @@ pub mod segment_definition;
 pub mod sql_templates_render;
 pub mod sql_utils;
 pub mod struct_with_sql_member;
-pub mod granularity_definition;

rust/cubesqlplanner/cubesqlplanner/src/planner/base_time_dimension.rs

@@ -157,7 +157,7 @@ impl BaseTimeDimension {
 
         let new_granularity_obj = GranularityHelper::make_granularity_obj(
             self.query_tools.cube_evaluator().clone(),
-            &mut *evaluator_compiler,
+            &mut evaluator_compiler,
             self.query_tools.timezone(),
             &self.dimension.name(),
             &self.dimension.cube_name(),

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

@@ -52,7 +52,7 @@ impl SqlNode for TimeDimensionNode {
                             templates,
                         );
                     }
-                    
+
                     let converted_tz = if self
                         .dimensions_with_ignored_timezone
                         .contains(&ev.full_name())

rust/cubesqlplanner/cubesqlplanner/src/planner/time_dimension/granularity.rs

@@ -1,10 +1,10 @@
-use std::rc::Rc;
 use super::{GranularityHelper, QueryDateTime, SqlInterval};
+use crate::planner::sql_evaluator::SqlCall;
 use chrono_tz::Tz;
 use cubenativeutils::CubeError;
 use itertools::Itertools;
+use std::rc::Rc;
 use std::str::FromStr;
-use crate::planner::sql_evaluator::SqlCall;
 
 #[derive(Clone)]
 pub struct Granularity {
@@ -50,9 +50,9 @@ impl Granularity {
                 is_predefined_granularity: false,
                 is_natural_aligned: false,
                 calendar_sql,
-            })
+            });
         }
-        
+
         let origin = if let Some(origin) = origin {
             QueryDateTime::from_date_str(timezone, &origin)?
         } else if let Some(offset) = &granularity_offset {
@@ -97,7 +97,7 @@ impl Granularity {
     pub fn granularity_offset(&self) -> &Option<String> {
         &self.granularity_offset
     }
-    
+
     pub fn calendar_sql(&self) -> &Option<Rc<SqlCall>> {
         &self.calendar_sql
     }

rust/cubesqlplanner/cubesqlplanner/src/planner/time_dimension/granularity_helper.rs

@@ -1,4 +1,5 @@
 use crate::cube_bridge::evaluator::CubeEvaluator;
+use crate::planner::sql_evaluator::Compiler;
 use crate::planner::BaseTimeDimension;
 use crate::planner::Granularity;
 use chrono::prelude::*;
@@ -8,7 +9,6 @@ use itertools::Itertools;
 use lazy_static::lazy_static;
 use std::collections::HashMap;
 use std::rc::Rc;
-use crate::planner::sql_evaluator::Compiler;
 
 pub struct GranularityHelper {}
 
@@ -234,7 +234,9 @@ impl GranularityHelper {
             let granularity_definition = cube_evaluator.resolve_granularity(path)?;
             let gran_eval_sql = if let Some(gran_sql) = granularity_definition.sql()? {
                 Some(compiler.compile_sql_call(&cube_name, gran_sql)?)
-            } else { None };
+            } else {
+                None
+            };
 
             if gran_eval_sql.is_some() || !Self::is_predefined_granularity(&granularity) {
                 Some(Granularity::try_new_custom(
@@ -243,7 +245,7 @@ impl GranularityHelper {
                     granularity_definition.static_data().origin.clone(),
                     granularity_definition.static_data().interval.clone(),
                     granularity_definition.static_data().offset.clone(),
-                    gran_eval_sql
+                    gran_eval_sql,
                 )?)
             } else {
                 Some(Granularity::try_new_predefined(