Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
waralexrom committed Dec 4, 2024
1 parent ef08b6a commit 1d4f34f
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 38 deletions.
2 changes: 1 addition & 1 deletion rust/cubesqlplanner/cubesqlplanner/src/plan/join.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use super::{time_series, Schema, SingleAliasedSource};
use super::{Schema, SingleAliasedSource};
use crate::planner::sql_templates::PlanSqlTemplates;
use crate::planner::{BaseJoinCondition, BaseMember, VisitorContext};
use cubenativeutils::CubeError;
Expand Down
3 changes: 1 addition & 2 deletions rust/cubesqlplanner/cubesqlplanner/src/plan/time_series.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use super::{Schema, SchemaColumn, Select, Union};
use super::{Schema, SchemaColumn};
use crate::planner::sql_templates::PlanSqlTemplates;
use cubenativeutils::CubeError;
use std::rc::Rc;

pub struct TimeSeries {
pub time_dimension_name: String,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use cubenativeutils::CubeError;
use lazy_static::lazy_static;
use regex::Regex;
use std::rc::Rc;
use std::str::FromStr;

#[derive(Debug, Clone, PartialEq, Eq)]
pub enum FilterType {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use crate::planner::planners::multi_stage::MultiStageTimeShift;
use crate::planner::{BaseDimension, BaseTimeDimension};
use itertools::Itertools;
use std::cmp::PartialEq;
use std::collections::{HashMap, HashSet};
use std::collections::HashMap;
use std::fmt::Debug;
use std::rc::Rc;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::cube_bridge::measure_definition::{MeasureDefinition, TimeShiftReference};
use crate::cube_bridge::measure_definition::TimeShiftReference;
use crate::planner::sql_evaluator::EvaluationNode;
use crate::planner::BaseMember;
use crate::planner::BaseTimeDimension;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use std::collections::{HashMap, HashSet};
use std::rc::Rc;
pub struct MultiStageMemberQueryPlanner {
query_tools: Rc<QueryTools>,
query_properties: Rc<QueryProperties>,
_query_properties: Rc<QueryProperties>,
description: Rc<MultiStageQueryDescription>,
}

Expand All @@ -33,7 +33,7 @@ impl MultiStageMemberQueryPlanner {
) -> Self {
Self {
query_tools,
query_properties,
_query_properties: query_properties,
description,
}
}
Expand Down Expand Up @@ -83,7 +83,7 @@ impl MultiStageMemberQueryPlanner {
fn plan_rolling_window_query(
&self,
rolling_window_desc: &RollingWindowDescription,
multi_stage_member: &MultiStageInodeMember,
_multi_stage_member: &MultiStageInodeMember,
cte_schemas: &HashMap<String, Rc<Schema>>,
) -> Result<Rc<Cte>, CubeError> {
let inputs = self.input_cte_aliases();
Expand Down Expand Up @@ -226,7 +226,7 @@ impl MultiStageMemberQueryPlanner {

fn make_input_join(
&self,
multi_stage_member: &MultiStageInodeMember,
_multi_stage_member: &MultiStageInodeMember,
cte_schemas: &HashMap<String, Rc<Schema>>,
) -> Result<QueryPlan, CubeError> {
let inputs = self.input_cte_aliases();
Expand Down Expand Up @@ -337,31 +337,6 @@ impl MultiStageMemberQueryPlanner {
Ok(Rc::new(result))
}

fn extract_filters(
&self,
allowed_filter_members: &HashSet<String>,
filters: &Vec<FilterItem>,
) -> Vec<FilterItem> {
let mut result = Vec::new();
for item in filters.iter() {
match item {
FilterItem::Group(group) => {
let new_group = FilterItem::Group(Rc::new(FilterGroup::new(
group.operator.clone(),
self.extract_filters(allowed_filter_members, &group.items),
)));
result.push(new_group);
}
FilterItem::Item(itm) => {
if allowed_filter_members.contains(&itm.member_name()) {
result.push(FilterItem::Item(itm.clone()));
}
}
}
}
result
}

fn all_dimensions(&self) -> Vec<Rc<dyn BaseMember>> {
BaseMemberHelper::iter_as_base_member(self.description.state().dimensions())
.chain(BaseMemberHelper::iter_as_base_member(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use super::SqlNode;
use crate::cube_bridge::memeber_sql::MemberSqlArg;
use crate::planner::query_tools::QueryTools;
use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
use crate::planner::sql_evaluator::{EvaluationNode, MemberSymbolType};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
use std::rc::Rc;

pub trait MemberSymbol {
fn cube_name(&self) -> &String;
fn name(&self) -> &String;
Expand Down

0 comments on commit 1d4f34f

Please sign in to comment.