Skip to content

Commit ef0535f

Browse files
committed
lint
1 parent 7894f8e commit ef0535f

File tree

7 files changed

+51
-40
lines changed

7 files changed

+51
-40
lines changed

rust/cubesqlplanner/cubesqlplanner/src/logical_plan/full_key_aggregate.rs

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -117,26 +117,30 @@ impl LogicalNode for FullKeyAggregate {
117117
check_inputs_len(&inputs, 1, self.node_name())?;
118118
let input_source = &inputs[0];
119119

120-
Some(match self.multiplied_measures_resolver().as_ref().unwrap() {
121-
ResolvedMultipliedMeasures::ResolveMultipliedMeasures(_) => {
122-
ResolvedMultipliedMeasures::ResolveMultipliedMeasures(
123-
input_source.clone().into_logical_node()?,
124-
)
125-
}
126-
ResolvedMultipliedMeasures::PreAggregation(_) => {
127-
ResolvedMultipliedMeasures::PreAggregation(
128-
input_source.clone().into_logical_node()?,
129-
)
130-
}
131-
})
120+
Some(
121+
match self.multiplied_measures_resolver().as_ref().unwrap() {
122+
ResolvedMultipliedMeasures::ResolveMultipliedMeasures(_) => {
123+
ResolvedMultipliedMeasures::ResolveMultipliedMeasures(
124+
input_source.clone().into_logical_node()?,
125+
)
126+
}
127+
ResolvedMultipliedMeasures::PreAggregation(_) => {
128+
ResolvedMultipliedMeasures::PreAggregation(
129+
input_source.clone().into_logical_node()?,
130+
)
131+
}
132+
},
133+
)
132134
};
133135

134-
Ok(Rc::new(Self::builder()
135-
.schema(self.schema().clone())
136-
.use_full_join_and_coalesce(self.use_full_join_and_coalesce())
137-
.multiplied_measures_resolver(multiplied_measures_resolver)
138-
.multi_stage_subquery_refs(self.multi_stage_subquery_refs().clone())
139-
.build()))
136+
Ok(Rc::new(
137+
Self::builder()
138+
.schema(self.schema().clone())
139+
.use_full_join_and_coalesce(self.use_full_join_and_coalesce())
140+
.multiplied_measures_resolver(multiplied_measures_resolver)
141+
.multi_stage_subquery_refs(self.multi_stage_subquery_refs().clone())
142+
.build(),
143+
))
140144
}
141145

142146
fn node_name(&self) -> &'static str {

rust/cubesqlplanner/cubesqlplanner/src/logical_plan/multistage/calculation.rs

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,10 @@ impl MultiStageMeasureCalculation {
8686
impl PrettyPrint for MultiStageMeasureCalculation {
8787
fn pretty_print(&self, result: &mut PrettyPrintResult, state: &PrettyPrintState) {
8888
result.println(
89-
&format!("Measure Calculation: {}", self.calculation_type().to_string()),
89+
&format!(
90+
"Measure Calculation: {}",
91+
self.calculation_type().to_string()
92+
),
9093
state,
9194
);
9295
let state = state.new_level();
@@ -145,15 +148,17 @@ impl LogicalNode for MultiStageMeasureCalculation {
145148
check_inputs_len(&inputs, 1, self.node_name())?;
146149
let source = &inputs[0];
147150

148-
Ok(Rc::new(Self::builder()
149-
.schema(self.schema().clone())
150-
.is_ungrouped(self.is_ungrouped())
151-
.calculation_type(self.calculation_type().clone())
152-
.partition_by(self.partition_by().clone())
153-
.window_function_to_use(self.window_function_to_use().clone())
154-
.order_by(self.order_by().clone())
155-
.source(source.clone().into_logical_node()?)
156-
.build()))
151+
Ok(Rc::new(
152+
Self::builder()
153+
.schema(self.schema().clone())
154+
.is_ungrouped(self.is_ungrouped())
155+
.calculation_type(self.calculation_type().clone())
156+
.partition_by(self.partition_by().clone())
157+
.window_function_to_use(self.window_function_to_use().clone())
158+
.order_by(self.order_by().clone())
159+
.source(source.clone().into_logical_node()?)
160+
.build(),
161+
))
157162
}
158163

159164
fn node_name(&self) -> &'static str {

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
use super::super::{LogicalNodeProcessor, ProcessableNode, PushDownBuilderContext};
2-
use crate::logical_plan::{
3-
FullKeyAggregate, LogicalJoin, ResolvedMultipliedMeasures,
4-
};
2+
use crate::logical_plan::{FullKeyAggregate, LogicalJoin, ResolvedMultipliedMeasures};
53
use crate::physical_plan_builder::PhysicalPlanBuilder;
64
use crate::plan::{
75
Expr, From, FromSource, JoinBuilder, JoinCondition, QualifiedColumnName, SelectBuilder,

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,14 @@ impl FullKeyAggregateQueryPlanner {
3838
.set_time_dimensions(self.query_properties.time_dimensions().clone())
3939
.set_measures(measures)
4040
.into_rc();
41-
Ok(Rc::new(FullKeyAggregate::builder()
42-
.multiplied_measures_resolver(resolved_multiplied_source)
43-
.multi_stage_subquery_refs(multi_stage_subquery_refs)
44-
.use_full_join_and_coalesce(true)
45-
.schema(schema)
46-
.build()))
41+
Ok(Rc::new(
42+
FullKeyAggregate::builder()
43+
.multiplied_measures_resolver(resolved_multiplied_source)
44+
.multi_stage_subquery_refs(multi_stage_subquery_refs)
45+
.use_full_join_and_coalesce(true)
46+
.schema(schema)
47+
.build(),
48+
))
4749
}
4850

4951
pub fn plan_logical_plan(

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/measure_symbol.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use crate::cube_bridge::measure_definition::{MeasureDefinition, RollingWindow};
55
use crate::cube_bridge::member_sql::MemberSql;
66
use crate::planner::query_tools::QueryTools;
77
use crate::planner::sql_evaluator::collectors::find_owned_by_cube_child;
8-
use crate::planner::sql_evaluator::{sql_nodes::SqlNode, Compiler, SqlCall, SqlEvaluatorVisitor};
98
use crate::planner::sql_evaluator::CubeTableSymbol;
9+
use crate::planner::sql_evaluator::{sql_nodes::SqlNode, Compiler, SqlCall, SqlEvaluatorVisitor};
1010
use crate::planner::sql_templates::PlanSqlTemplates;
1111
use crate::planner::SqlInterval;
1212
use cubenativeutils::CubeError;

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/member_symbol.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,9 @@ impl MemberSymbol {
135135
match self {
136136
MemberSymbol::Dimension(dimension_symbol) => dimension_symbol.case(),
137137
MemberSymbol::Measure(measure_symbol) => measure_symbol.case(),
138-
MemberSymbol::TimeDimension(time_dimension_symbol) => time_dimension_symbol.base_symbol().case(),
138+
MemberSymbol::TimeDimension(time_dimension_symbol) => {
139+
time_dimension_symbol.base_symbol().case()
140+
}
139141
_ => None,
140142
}
141143
}

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_templates/plan.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use super::{TemplateGroupByColumn, TemplateOrderByColumn, TemplateProjectionColumn};
2+
use crate::cube_bridge::driver_tools::DriverTools;
23
use crate::cube_bridge::sql_templates_render::SqlTemplatesRender;
34
use crate::plan::join::JoinType;
45
use crate::planner::sql_templates::structs::TemplateCalcGroup;
5-
use crate::cube_bridge::driver_tools::DriverTools;
66
use convert_case::{Boundary, Case, Casing};
77
use cubenativeutils::CubeError;
88
use minijinja::context;

0 commit comments

Comments
 (0)