Skip to content

fix(tesseract): Filters over proxy time dimensions #9604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(tesseract): Filters over proxy time dimensions #9604

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a820ad
fix(tesseract): Filters over proxy time dimensions
waralexrom May 22, 2025
e4de557
fmt
waralexrom May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 39 additions & 10 deletions rust/cubesqlplanner/cubesqlplanner/src/planner/filter/base_filter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ pub struct BaseFilter {
filter_type: FilterType,
filter_operator: FilterOperator,
values: Vec<Option<String>>,
is_over_date_range: bool,
use_raw_values: bool,
templates: FilterTemplates,
}
Expand All @@ -51,11 +52,27 @@ impl BaseFilter {
} else {
vec![]
};

//Check if we have proxy time dimension as input
let symbol_to_check = if let Ok(time_dimension) = member_evaluator.as_time_dimension() {
time_dimension.base_symbol().clone()
} else {
member_evaluator.clone()
};

let resolved_ref = symbol_to_check.resolve_reference_chain();
let is_over_date_range = if resolved_ref.as_time_dimension().is_ok() {
true
} else {
false
};

Ok(Rc::new(Self {
query_tools,
member_evaluator,
filter_type,
filter_operator,
is_over_date_range,
values,
templates,
use_raw_values: false,
Expand All @@ -72,6 +89,7 @@ impl BaseFilter {
query_tools: self.query_tools.clone(),
member_evaluator: self.member_evaluator.clone(),
filter_type: self.filter_type.clone(),
is_over_date_range: self.is_over_date_range,
filter_operator,
values,
templates: self.templates.clone(),
Expand Down Expand Up @@ -131,6 +149,13 @@ impl BaseFilter {
context.clone(),
plan_templates,
)?;
let member_sql = if self.is_over_date_range {
plan_templates
.base_tools()
.time_stamp_cast(member_sql.clone())?
} else {
member_sql
};
let filters_context = context.filters_context();

let res = match self.filter_operator {
Expand Down Expand Up @@ -234,7 +259,7 @@ impl BaseFilter {
if self.is_array_value() {
self.templates.in_where(
member_sql.to_string(),
self.filter_and_allocate_values(),
self.filter_and_allocate_values()?,
need_null_check,
)
} else if self.is_values_contains_null() {
Expand All @@ -254,7 +279,7 @@ impl BaseFilter {
if self.is_array_value() {
self.templates.not_in_where(
member_sql.to_string(),
self.filter_and_allocate_values(),
self.filter_and_allocate_values()?,
need_null_check,
)
} else if self.is_values_contains_null() {
Expand Down Expand Up @@ -433,7 +458,7 @@ impl BaseFilter {
let need_null_check = self.is_need_null_chek(false);
self.templates.in_where(
member_sql.to_string(),
self.filter_and_allocate_values(),
self.filter_and_allocate_values()?,
need_null_check,
)
}
Expand All @@ -446,7 +471,7 @@ impl BaseFilter {
let need_null_check = self.is_need_null_chek(true);
self.templates.not_in_where(
member_sql.to_string(),
self.filter_and_allocate_values(),
self.filter_and_allocate_values()?,
need_null_check,
)
}
Expand Down Expand Up @@ -558,7 +583,7 @@ impl BaseFilter {
start_wild: bool,
end_wild: bool,
) -> Result<String, CubeError> {
let values = self.filter_and_allocate_values();
let values = self.filter_and_allocate_values()?;
let like_parts = values
.into_iter()
.map(|v| {
Expand Down Expand Up @@ -655,8 +680,12 @@ impl BaseFilter {
QueryDateTimeHelper::format_to_date(date, self.query_tools.clone())
}

fn allocate_param(&self, param: &str) -> String {
self.query_tools.allocate_param(param)
fn allocate_param(&self, param: &str) -> Result<String, CubeError> {
if self.is_over_date_range {
self.allocate_timestamp_param(param, false)
} else {
Ok(self.query_tools.allocate_param(param))
}
}

fn allocate_timestamp_param(
Expand All @@ -682,7 +711,7 @@ impl BaseFilter {
)))
} else {
if let Some(value) = &self.values[0] {
Ok(self.allocate_param(value))
self.allocate_param(value)
} else {
Ok("NULL".to_string())
}
Expand Down Expand Up @@ -730,10 +759,10 @@ impl BaseFilter {
self.values.len() > 1
}

fn filter_and_allocate_values(&self) -> Vec<String> {
fn filter_and_allocate_values(&self) -> Result<Vec<String>, CubeError> {
self.values
.iter()
.filter_map(|v| v.as_ref().map(|v| self.allocate_param(&v)))
.collect::<Vec<_>>()
.collect::<Result<Vec<_>, _>>()
}
}
Loading