Skip to content

Commit f11e814

Browse files
waralexromwaralexrom
committed
lint
1 parent ad251c2 commit f11e814

File tree

12 files changed

+77
-34
lines changed

12 files changed

+77
-34
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,11 @@ impl PhysicalPlanBuilder {
8282
Ok(query)
8383
}
8484

85-
fn build_total_count(&self, source: Rc<Select>, context: &PhysicalPlanBuilderContext) -> Result<Rc<Select>, CubeError> {
85+
fn build_total_count(
86+
&self,
87+
source: Rc<Select>,
88+
context: &PhysicalPlanBuilderContext,
89+
) -> Result<Rc<Select>, CubeError> {
8690
let from = From::new_from_subselect(source.clone(), ORIGINAL_QUERY.to_string());
8791
let mut select_builder = SelectBuilder::new(from);
8892
select_builder.add_count_all(TOTAL_COUNT.to_string());

‎rust/cubesqlplanner/cubesqlplanner/src/plan/builder/select.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ impl SelectBuilder {
8585
alias: alias.clone(),
8686
};
8787
self.projection_columns.push(aliased_expr);
88-
self.result_schema.add_column(SchemaColumn::new(alias.clone(), None));
88+
self.result_schema
89+
.add_column(SchemaColumn::new(alias.clone(), None));
8990
}
9091
pub fn add_projection_function_expression(
9192
&mut self,

‎rust/cubesqlplanner/cubesqlplanner/src/plan/join.rs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ impl RegularRollingWindowJoinCondition {
5252
};
5353

5454
let trailing_start = if let Some(trailing_interval) = &self.trailing_interval {
55-
templates.base_tools().subtract_interval(start_date, trailing_interval.clone())?
55+
templates
56+
.base_tools()
57+
.subtract_interval(start_date, trailing_interval.clone())?
5658
} else {
5759
start_date
5860
};
@@ -70,7 +72,9 @@ impl RegularRollingWindowJoinCondition {
7072
};
7173

7274
let leading_end = if let Some(leading_interval) = &self.leading_interval {
73-
templates.base_tools().add_interval(end_date, leading_interval.clone())?
75+
templates
76+
.base_tools()
77+
.add_interval(end_date, leading_interval.clone())?
7478
} else {
7579
end_date
7680
};

‎rust/cubesqlplanner/cubesqlplanner/src/plan/time_series.rs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,12 @@ impl TimeSeries {
9696
)
9797
} else {
9898
let (from_date, to_date, raw_from_date, raw_to_date) = match &self.date_range {
99-
TimeSeriesDateRange::Filter(from_date, to_date) => {
100-
(format!("'{}'", from_date), format!("'{}'", to_date), from_date.clone(), to_date.clone())
101-
}
99+
TimeSeriesDateRange::Filter(from_date, to_date) => (
100+
format!("'{}'", from_date),
101+
format!("'{}'", to_date),
102+
from_date.clone(),
103+
to_date.clone(),
104+
),
102105
TimeSeriesDateRange::Generated(_) => {
103106
return Err(CubeError::user(
104107
"Date range is required for time series in drivers where generated time series is not supported".to_string(),

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,11 @@ impl<IT: InnerTypes> BaseQuery<IT> {
9191
} else {
9292
HashMap::new()
9393
};
94-
let physical_plan =
95-
physical_plan_builder.build(optimized_plan, original_sql_pre_aggregations, self.request.is_total_query())?;
94+
let physical_plan = physical_plan_builder.build(
95+
optimized_plan,
96+
original_sql_pre_aggregations,
97+
self.request.is_total_query(),
98+
)?;
9699

97100
let sql = physical_plan.to_sql(&templates)?;
98101
let (result_sql, params) = self.query_tools.build_sql_and_params(&sql, true)?;

‎rust/cubesqlplanner/cubesqlplanner/src/planner/filter/base_filter.rs‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -340,9 +340,17 @@ impl BaseFilter {
340340
if let Some(interval) = interval {
341341
if interval != "unbounded" {
342342
if is_sub {
343-
Ok(Some(self.query_tools.base_tools().subtract_interval(date, interval.clone())?))
343+
Ok(Some(
344+
self.query_tools
345+
.base_tools()
346+
.subtract_interval(date, interval.clone())?,
347+
))
344348
} else {
345-
Ok(Some(self.query_tools.base_tools().add_interval(date, interval.clone())?))
349+
Ok(Some(
350+
self.query_tools
351+
.base_tools()
352+
.add_interval(date, interval.clone())?,
353+
))
346354
}
347355
} else {
348356
Ok(None)
@@ -607,7 +615,11 @@ impl BaseFilter {
607615
Ok(res)
608616
}
609617

610-
fn allocate_date_params(&self, use_db_time_zone: bool, as_date_time: bool) -> Result<(String, String), CubeError> {
618+
fn allocate_date_params(
619+
&self,
620+
use_db_time_zone: bool,
621+
as_date_time: bool,
622+
) -> Result<(String, String), CubeError> {
611623
if self.values.len() >= 2 {
612624
let from = if let Some(from_str) = &self.values[0] {
613625
self.from_date_in_db_time_zone(from_str, use_db_time_zone)?
@@ -647,7 +659,11 @@ impl BaseFilter {
647659
self.query_tools.allocate_param(param)
648660
}
649661

650-
fn allocate_timestamp_param(&self, param: &str, as_date_time: bool) -> Result<String, CubeError> {
662+
fn allocate_timestamp_param(
663+
&self,
664+
param: &str,
665+
as_date_time: bool,
666+
) -> Result<String, CubeError> {
651667
if self.use_raw_values {
652668
return Ok(param.to_string());
653669
}
@@ -673,7 +689,11 @@ impl BaseFilter {
673689
}
674690
}
675691

676-
fn first_timestamp_param(&self, use_db_time_zone: bool, as_date_time: bool) -> Result<String, CubeError> {
692+
fn first_timestamp_param(
693+
&self,
694+
use_db_time_zone: bool,
695+
as_date_time: bool,
696+
) -> Result<String, CubeError> {
677697
if self.values.is_empty() {
678698
Err(CubeError::user(format!(
679699
"Expected at least one parameter but nothing found"
@@ -682,7 +702,7 @@ impl BaseFilter {
682702
if let Some(value) = &self.values[0] {
683703
self.allocate_timestamp_param(
684704
&self.from_date_in_db_time_zone(value, use_db_time_zone)?,
685-
as_date_time
705+
as_date_time,
686706
)
687707
} else {
688708
return Err(CubeError::user(format!(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ impl MultiStageMemberQueryPlanner {
7272
true,
7373
true,
7474
false,
75-
false
75+
false,
7676
)?;
7777

7878
let simple_query_planer =

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,9 @@ impl QueryProperties {
270270
order
271271
.iter()
272272
.map(|o| -> Result<_, CubeError> {
273-
let evaluator = if let Some(found) = dimensions.iter().find(|d| d.name() == &o.id) {
273+
let evaluator = if let Some(found) =
274+
dimensions.iter().find(|d| d.name() == &o.id)
275+
{
274276
found.member_evaluator().clone()
275277
} else if let Some(found) = time_dimensions.iter().find(|d| d.name() == &o.id) {
276278
found.member_evaluator().clone()
@@ -328,7 +330,7 @@ impl QueryProperties {
328330
ungrouped,
329331
multi_fact_join_groups,
330332
pre_aggregation_query,
331-
total_query
333+
total_query,
332334
}))
333335
}
334336

‎rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/auto_prefix.rs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ use crate::planner::sql_evaluator::MemberSymbol;
55
use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
66
use crate::planner::sql_templates::PlanSqlTemplates;
77
use cubenativeutils::CubeError;
8+
use lazy_static::lazy_static;
9+
use regex::Regex;
810
use std::any::Any;
911
use std::collections::HashMap;
1012
use std::rc::Rc;
11-
use lazy_static::lazy_static;
12-
use regex::Regex;
13-
1413

1514
pub struct AutoPrefixSqlNode {
1615
input: Rc<dyn SqlNode>,
@@ -59,7 +58,12 @@ impl AutoPrefixSqlNode {
5958
}
6059
}
6160

62-
pub fn auto_prefix_with_cube_name(&self, cube_name: &str, sql: &str, templates: &PlanSqlTemplates) -> Result<String, CubeError> {
61+
pub fn auto_prefix_with_cube_name(
62+
&self,
63+
cube_name: &str,
64+
sql: &str,
65+
templates: &PlanSqlTemplates,
66+
) -> Result<String, CubeError> {
6367
lazy_static! {
6468
static ref SINGLE_MEMBER_RE: Regex = Regex::new(r"^[_a-zA-Z][_a-zA-Z0-9]*$").unwrap();
6569
}
@@ -74,7 +78,6 @@ impl AutoPrefixSqlNode {
7478
};
7579
Ok(res)
7680
}
77-
7881
}
7982

8083
impl SqlNode for AutoPrefixSqlNode {

‎rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/evaluate_sql.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ impl SqlNode for EvaluateSqlNode {
2626
) -> Result<String, CubeError> {
2727
match node.as_ref() {
2828
MemberSymbol::Dimension(ev) => {
29-
let res =ev.evaluate_sql(
30-
visitor,
31-
node_processor.clone(),
32-
query_tools.clone(),
33-
templates,
34-
)?;
29+
let res = ev.evaluate_sql(
30+
visitor,
31+
node_processor.clone(),
32+
query_tools.clone(),
33+
templates,
34+
)?;
3535
Ok(res)
36-
},
36+
}
3737
MemberSymbol::TimeDimension(ev) => {
3838
let res = visitor.apply(&ev.base_symbol(), node_processor.clone(), templates)?;
3939
Ok(res)

0 commit comments

Comments
 (0)