Skip to content

fix(cubesql): Do not merge time dimension ranges in "or" filter into date range #9609

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

Merged
merged 1 commit into from
May 22, 2025
Merged

fix(cubesql): Do not merge time dimension ranges in "or" filter into date range #9609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
91 changes: 91 additions & 0 deletions rust/cubesql/cubesql/src/compile/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16739,4 +16739,95 @@ LIMIT {{ limit }}{% endif %}"#.to_string(),
displayable(physical_plan.as_ref()).indent()
);
}

#[tokio::test]
async fn test_date_filter_with_or_and() {
init_testing_logger();

let logical_plan = convert_select_to_query_plan(
r#"
SELECT
DATE_TRUNC('year', "order_date") AS "y",
SUM("KibanaSampleDataEcommerce"."sumPrice") AS "m1"
FROM "KibanaSampleDataEcommerce" AS "KibanaSampleDataEcommerce"
WHERE
DATE_TRUNC('year', "order_date") = '2024-01-01T00:00:00Z'::timestamptz
OR (
DATE_TRUNC('year', "order_date") = '2025-01-01T00:00:00Z'::timestamptz
AND DATE_TRUNC('month', "order_date") = '2025-01-01T00:00:00Z'::timestamptz
)
GROUP BY 1
"#
.to_string(),
DatabaseProtocol::PostgreSQL,
)
.await
.as_logical_plan();

assert_eq!(
logical_plan.find_cube_scan().request,
V1LoadRequestQuery {
measures: Some(vec!["KibanaSampleDataEcommerce.sumPrice".to_string()]),
dimensions: Some(vec![]),
segments: Some(vec![]),
time_dimensions: Some(vec![V1LoadRequestQueryTimeDimension {
dimension: "KibanaSampleDataEcommerce.order_date".to_string(),
granularity: Some("year".to_string()),
date_range: None
}]),
order: Some(vec![]),
filters: Some(vec![V1LoadRequestQueryFilterItem {
member: None,
operator: None,
values: None,
or: Some(vec![
json!(V1LoadRequestQueryFilterItem {
member: Some("KibanaSampleDataEcommerce.order_date".to_string()),
operator: Some("inDateRange".to_string()),
values: Some(vec![
"2024-01-01T00:00:00.000Z".to_string(),
"2024-12-31T23:59:59.999Z".to_string(),
]),
or: None,
and: None,
}),
json!(V1LoadRequestQueryFilterItem {
member: None,
operator: None,
values: None,
or: None,
and: Some(vec![
json!(V1LoadRequestQueryFilterItem {
member: Some(
"KibanaSampleDataEcommerce.order_date".to_string()
),
operator: Some("inDateRange".to_string()),
values: Some(vec![
"2025-01-01T00:00:00.000Z".to_string(),
"2025-12-31T23:59:59.999Z".to_string(),
]),
or: None,
and: None,
}),
json!(V1LoadRequestQueryFilterItem {
member: Some(
"KibanaSampleDataEcommerce.order_date".to_string()
),
operator: Some("inDateRange".to_string()),
values: Some(vec![
"2025-01-01T00:00:00.000Z".to_string(),
"2025-01-31T23:59:59.999Z".to_string(),
]),
or: None,
and: None,
})
]),
}),
]),
and: None
}]),
..Default::default()
}
)
}
}
2 changes: 1 addition & 1 deletion rust/cubesql/cubesql/src/compile/rewrite/converter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1783,7 +1783,7 @@ impl LanguageToLogicalPlanConverter {
query_time_dimensions,
filters,
node_by_id,
!is_in_or || !is_and_op,
is_in_or || !is_and_op,
)?;
match op.as_str() {
"and" => {
Expand Down
Loading