Skip to content

Commit e0ea17c

Browse files
committed
cargo fmt --all
1 parent c2e21f1 commit e0ea17c

File tree

7 files changed

+14
-13
lines changed

7 files changed

+14
-13
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ impl MeasureMatcher {
2424
pub fn try_match(&self, symbol: &Rc<MemberSymbol>) -> Result<bool, CubeError> {
2525
match symbol.as_ref() {
2626
MemberSymbol::Measure(measure) => {
27-
if self.pre_aggregation_measures.contains(&measure.full_name()) && (!self.only_addictive || measure.is_addictive()) {
27+
if self.pre_aggregation_measures.contains(&measure.full_name())
28+
&& (!self.only_addictive || measure.is_addictive())
29+
{
2830
return Ok(true);
2931
}
3032
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,9 @@ impl PreAggregationOptimizer {
233233
}
234234

235235
if let Some(multi_stage_item) = multi_stage_queries
236-
.iter().find(|&query| &query.name == multi_stage_name).cloned()
236+
.iter()
237+
.find(|&query| &query.name == multi_stage_name)
238+
.cloned()
237239
{
238240
match &multi_stage_item.member_type {
239241
MultiStageMemberLogicalType::LeafMeasure(multi_stage_leaf_measure) => self

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ use std::rc::Rc;
1919
const TOTAL_COUNT: &str = "total_count";
2020
const ORIGINAL_QUERY: &str = "original_query";
2121

22-
#[derive(Clone, Debug)]
23-
#[derive(Default)]
22+
#[derive(Clone, Debug, Default)]
2423
struct PhysicalPlanBuilderContext {
2524
pub alias_prefix: Option<String>,
2625
pub render_measure_as_state: bool, //Render measure as state, for example hll state for count_approx
@@ -29,7 +28,6 @@ struct PhysicalPlanBuilderContext {
2928
pub original_sql_pre_aggregations: HashMap<String, String>,
3029
}
3130

32-
3331
impl PhysicalPlanBuilderContext {
3432
pub fn make_sql_nodes_factory(&self) -> SqlNodesFactory {
3533
let mut factory = SqlNodesFactory::new();

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,8 @@ impl QueryProperties {
796796
result.multi_stage_measures.push(m.clone())
797797
} else {
798798
let join = self
799-
.compute_join_multi_fact_groups_with_measures(&vec![m.clone()])?.first()
799+
.compute_join_multi_fact_groups_with_measures(&vec![m.clone()])?
800+
.first()
800801
.expect("No join groups returned for single measure multi-fact join group")
801802
.0
802803
.clone();
@@ -843,9 +844,7 @@ impl QueryProperties {
843844
}
844845
FilterItem::Item(item) => {
845846
let item_member_name = item.member_name();
846-
if !measures
847-
.iter().any(|m| m.full_name() == item_member_name)
848-
{
847+
if !measures.iter().any(|m| m.full_name() == item_member_name) {
849848
measures.push(BaseMeasure::try_new_required(
850849
item.member_evaluator().clone(),
851850
self.query_tools.clone(),

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/sub_query_dimensions.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ impl SubQueryDimensionsCollector {
2727

2828
fn check_dim_has_measures(&self, dim: &DimensionSymbol) -> bool {
2929
for dep in dim.get_dependencies().iter() {
30-
if let MemberSymbol::Measure(_) = dep.as_ref() { return true }
30+
if let MemberSymbol::Measure(_) = dep.as_ref() {
31+
return true;
32+
}
3133
}
3234
false
3335
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ use itertools::Itertools;
33
use std::ops::{Add, AddAssign, Neg, Sub};
44
use std::str::FromStr;
55

6-
#[derive(Debug, PartialEq, Clone, Hash, Eq)]
7-
#[derive(Default)]
6+
#[derive(Debug, PartialEq, Clone, Hash, Eq, Default)]
87
pub struct SqlInterval {
98
pub year: i32,
109
pub month: i32,

rust/cubesqlplanner/cubesqlplanner/src/planner/visitor_context.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ pub struct FiltersContext {
1212
pub use_local_tz: bool,
1313
}
1414

15-
1615
pub struct VisitorContext {
1716
node_processor: Rc<dyn SqlNode>,
1817
all_filters: Option<Filter>, //To pass to FILTER_PARAMS and FILTER_GROUP

0 commit comments

Comments
 (0)