Skip to content

feat(cubesql): Filter push down for date_part(?upper) AND date_part(?lower) #10070

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 3 commits into from
Oct 20, 2025
Merged

feat(cubesql): Filter push down for date_part(?upper) AND date_part(?lower) #10070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d96ef83
feat(cubesql): Filter push down for date_part('year') = ?y & date_par…
ovr Oct 20, 2025
1cc2063
chore: test with different quarters
ovr Oct 20, 2025
d04c668
chore: human friendly comment about constaints
ovr Oct 20, 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
79 changes: 79 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 @@ -9462,6 +9462,85 @@ ORDER BY "source"."str0" ASC
)
}

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

async fn assert_quarter_result(quarter: i32, start_date: &str, end_date: &str) {
let query_plan = convert_select_to_query_plan(
format!(r#"
SELECT COUNT(*) AS "count",
EXTRACT(YEAR FROM "KibanaSampleDataEcommerce"."order_date") AS "yr:completedAt:ok"
FROM "public"."KibanaSampleDataEcommerce" "KibanaSampleDataEcommerce"
WHERE EXTRACT(YEAR FROM "KibanaSampleDataEcommerce"."order_date") = 2019
AND EXTRACT(QUARTER FROM "KibanaSampleDataEcommerce"."order_date") = {}
GROUP BY 2
"#, quarter),
DatabaseProtocol::PostgreSQL,
).await;

assert_eq!(
query_plan.as_logical_plan().find_cube_scan().request,
V1LoadRequestQuery {
measures: Some(vec!["KibanaSampleDataEcommerce.count".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: Some(json!(vec![start_date, end_date])),
},]),
order: Some(vec![]),
..Default::default()
}
)
}

assert_quarter_result(1, "2019-01-01", "2019-03-31").await;
assert_quarter_result(2, "2019-04-01", "2019-06-30").await;
assert_quarter_result(3, "2019-07-01", "2019-09-30").await;
assert_quarter_result(4, "2019-10-01", "2019-12-31").await;
}

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

let logical_plan = convert_select_to_query_plan(
r#"
SELECT
COUNT(*) AS "count",
EXTRACT(YEAR FROM "KibanaSampleDataEcommerce"."order_date") AS "yr:completedAt:ok"
FROM "public"."KibanaSampleDataEcommerce" "KibanaSampleDataEcommerce"
WHERE EXTRACT(YEAR FROM "KibanaSampleDataEcommerce"."order_date") = 2019 AND EXTRACT(MONTH FROM "KibanaSampleDataEcommerce"."order_date") = 2
GROUP BY 2
;"#
.to_string(),
DatabaseProtocol::PostgreSQL,
)
.await
.as_logical_plan();

assert_eq!(
logical_plan.find_cube_scan().request,
V1LoadRequestQuery {
measures: Some(vec!["KibanaSampleDataEcommerce.count".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: Some(json!(vec![
"2019-02-01".to_string(),
"2019-02-28".to_string(),
])),
},]),
order: Some(vec![]),
..Default::default()
}
)
}

#[tokio::test]
async fn test_tableau_filter_extract_by_year() {
init_testing_logger();
Expand Down
91 changes: 91 additions & 0 deletions rust/cubesql/cubesql/src/compile/rewrite/rules/filters.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1726,6 +1726,44 @@ impl RewriteRules for FilterRules {
"?filter_aliases",
),
),
// EXTRACT(YEAR FROM "KibanaSampleDataEcommerce"."order_date") = 2019
// AND EXTRACT(MONTH FROM "KibanaSampleDataEcommerce"."order_date") = 3
transforming_rewrite(
"extract-date-range-and-gran-equals",
filter_op(
filter_op_filters(
filter_member("?member", "FilterMemberOp:inDateRange", "?values"),
filter_replacer(
binary_expr(
self.fun_expr(
"DatePart",
vec![literal_expr("?granularity"), column_expr("?column")],
),
"=",
literal_expr("?value"),
),
"?alias_to_cube",
"?members",
"?filter_aliases",
),
),
"FilterOpOp:and",
),
filter_member("?member", "FilterMemberOp:inDateRange", "?new_values"),
self.transform_filter_extract_date_range_and_trunc_gran_equals(
"?member",
"?values",
"?granularity",
"?column",
"?value",
"?alias_to_cube",
"?members",
"?filter_aliases",
"?new_values",
),
),
// TODO: Introduce rule to unwrap TRUNC(EXTRACT(?granularity FROM ?column_expr))
//
// TRUNC(EXTRACT(YEAR FROM "KibanaSampleDataEcommerce"."order_date")) = 2019
// AND TRUNC(EXTRACT(MONTH FROM "KibanaSampleDataEcommerce"."order_date")) = 3
transforming_rewrite(
Expand Down Expand Up @@ -1765,6 +1803,7 @@ impl RewriteRules for FilterRules {
"?new_values",
),
),
// TODO: Introduce new rule to unwrap TRUNC(EXTRACT(?granularity FROM ?column_expr)) -> EXTRACT(?granularity FROM ?column_expr)
// When the filter set above is paired with other filters, it needs to be
// regrouped for the above rewrite rule to match
rewrite(
Expand Down Expand Up @@ -1829,6 +1868,7 @@ impl RewriteRules for FilterRules {
"FilterOpOp:and",
),
),
// TODO: Introduce new rule to unwrap TRUNC(EXTRACT(?granularity FROM ?column_expr)) -> EXTRACT(?granularity FROM ?column_expr)
// The filter set above may be inverted, let's account for that as well
rewrite(
"extract-date-range-and-trunc-reverse",
Expand Down Expand Up @@ -1877,6 +1917,7 @@ impl RewriteRules for FilterRules {
"FilterOpOp:and",
),
),
// TODO: Introduce new rule to unwrap TRUNC(EXTRACT(?granularity FROM ?column_expr)) -> EXTRACT(?granularity FROM ?column_expr)
rewrite(
"extract-date-range-and-trunc-reverse-nested",
filter_op(
Expand Down Expand Up @@ -3991,6 +4032,7 @@ impl FilterRules {
if start_date_year != end_date.year() {
return false;
}

// Month value must be valid
if !(1..=12).contains(&value) {
return false;
Expand All @@ -4015,8 +4057,57 @@ impl FilterRules {
return false;
}

// Preserves existing constraints, for example:
// inDataRange: order_date >= '2019-02-15' AND order_date < '2019-03-10'
// Month filter: EXTRACT(MONTH FROM order_date) = 2 (February)
let new_start_date = max(new_start_date, start_date);
let new_end_date = min(new_end_date, end_date);

vec![
new_start_date.format("%Y-%m-%d").to_string(),
new_end_date.format("%Y-%m-%d").to_string(),
]
}
"quarter" | "qtr" => {
// Check that the range only covers one year
let start_date_year = start_date.year();
if start_date_year != end_date.year() {
return false;
}

// Quarter value must be valid (1-4)
if !(1..=4).contains(&value) {
return false;
}

let quarter_start_month = (value - 1) * 3 + 1;

// Obtain the new range
let Some(new_start_date) =
NaiveDate::from_ymd_opt(start_date_year, quarter_start_month as u32, 1)
else {
return false;
};

let Some(new_end_date) = new_start_date
.checked_add_months(Months::new(3))
.and_then(|date| date.checked_sub_days(Days::new(1)))
else {
return false;
};

// Paranoid check, If the resulting range is outside of the original range, we can't merge
Copy link
Member Author

@ovr ovr Oct 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Someone can combine timestamp comparision and quarter. Let's add these check to protect such cases.

// the filters
if new_start_date > end_date || new_end_date < start_date {
return false;
}

// Preserves existing constraints, for example:
// inDataRange: order_date >= '2019-04-15' AND order_date < '2019-12-31'
// Month filter: EXTRACT(QUARTER FROM order_date) = 2
let new_start_date = max(new_start_date, start_date);
let new_end_date = min(new_end_date, end_date);

vec![
new_start_date.format("%Y-%m-%d").to_string(),
new_end_date.format("%Y-%m-%d").to_string(),
Expand Down
Loading