update

Author: waralexrom

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

@@ -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;

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

@@ -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,

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

@@ -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 {

rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/applied_state.rs

@@ -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;
 

rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/member.rs

@@ -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;

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

@@ -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>,
 }
 
@@ -33,7 +33,7 @@ impl MultiStageMemberQueryPlanner {
     ) -> Self {
         Self {
             query_tools,
-            query_properties,
+            _query_properties: query_properties,
             description,
         }
     }
@@ -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();
@@ -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();
@@ -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(

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

@@ -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};

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

@@ -1,5 +1,3 @@
-use std::rc::Rc;
-
 pub trait MemberSymbol {
     fn cube_name(&self) -> &String;
     fn name(&self) -> &String;