Skip to content

[ES|QL] Consider min/max from predicates when transform date_trunc/bucket to round_to option 2 #132143

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 13 commits into from
Aug 6, 2025
Merged

[ES|QL] Consider min/max from predicates when transform date_trunc/bucket to round_to option 2 #132143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
caa2f73
consider min/max from predicates when transform date_trunc/bucket int…
fang-xing-esql Jul 15, 2025
93c3297
Update docs/changelog/131341.yaml
fang-xing-esql Jul 15, 2025
3563dcb
more tests
fang-xing-esql Jul 23, 2025
2ed82f4
Merge branch 'main' into datetrunc-roundto-with-min-max-from-predicates
fang-xing-esql Jul 23, 2025
de99e19
refactor
fang-xing-esql Jul 23, 2025
41a493d
Merge branch 'main' into datetrunc-roundto-with-min-max-from-predicates
fang-xing-esql Jul 23, 2025
5ba54a5
add more comments
fang-xing-esql Jul 23, 2025
def5d8d
refactor tests
fang-xing-esql Jul 25, 2025
9f66fa6
Merge branch 'main' into datetrunc-roundto-with-min-max-from-predicates
fang-xing-esql Jul 25, 2025
90f0908
ReplaceDateTruncBucketWithRoundTo
fang-xing-esql Jul 30, 2025
918af70
Merge branch 'main' into datetrunc-roundto-with-min-max-from-predicat…
fang-xing-esql Jul 30, 2025
ccc30aa
Update docs/changelog/132143.yaml
fang-xing-esql Jul 30, 2025
d527044
Merge branch 'main' into datetrunc-roundto-with-min-max-from-predicat…
fang-xing-esql Jul 30, 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
5 changes: 5 additions & 0 deletions docs/changelog/131341.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 131341
summary: Consider min/max from predicates when transform date_trunc/bucket to `round_to`
area: ES|QL
type: enhancement
issues: []
6 changes: 6 additions & 0 deletions docs/changelog/132143.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 132143
summary: Consider min/max from predicates when transform date_trunc/bucket to `round_to`
option 2
area: ES|QL
type: enhancement
issues: []
105 changes: 105 additions & 0 deletions x-pack/plugin/esql/qa/testFixtures/src/main/resources/bucket.csv-spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,3 +884,108 @@ c:long | b:datetime | yr:datetime
9 | 1989-01-01T00:00:00.000Z | 1988-01-01T00:00:00.000Z
13 | 1990-01-01T00:00:00.000Z | 1989-01-01T00:00:00.000Z
;

bucketYearInAggWithGTOutOfRange#[skip:-8.13.99, reason:BUCKET renamed in 8.14]
FROM employees
| WHERE hire_date >= "2000-01-01T00:00:00Z"
| STATS COUNT(*) by bucket = BUCKET(hire_date, 1 month)
| SORT bucket;

COUNT(*):long | bucket:date
;

bucketYearInAggWithLTOutOfRange#[skip:-8.13.99, reason:BUCKET renamed in 8.14]
FROM employees
| WHERE hire_date <= "1980-01-01T00:00:00Z"
| STATS COUNT(*) by bucket = BUCKET(hire_date, 1 year)
| SORT bucket;

COUNT(*):long | bucket:date
;

bucketYearInAggWithGTLTOutOfRange#[skip:-8.13.99, reason:BUCKET renamed in 8.14]
FROM employees
| WHERE hire_date <= "1980-01-01T00:00:00Z" and hire_date >= "1970-01-01"
| STATS COUNT(*) by bucket = BUCKET(hire_date, 1 week)
| SORT bucket;

COUNT(*):long | bucket:date
;

bucketYearInAggWithEQOutOfRange#[skip:-8.13.99, reason:BUCKET renamed in 8.14]
FROM employees
| WHERE hire_date == "1980-01-01T00:00:00Z"
| STATS COUNT(*) by bucket = BUCKET(hire_date, 1 hour)
| SORT bucket;

COUNT(*):long | bucket:date
;

bucketWithRename#[skip:-8.13.99, reason:BUCKET renamed in 8.14]
FROM employees
| RENAME hire_date as x, x as y
| WHERE y >= "1980-01-01T00:00:00Z"
| STATS COUNT(*) by bucket = BUCKET(y, 1 hour)
| SORT bucket
| LIMIT 5
;

COUNT(*):long | bucket:datetime
1 | 1985-02-18T00:00:00.000Z
1 | 1985-02-24T00:00:00.000Z
1 | 1985-05-13T00:00:00.000Z
1 | 1985-07-09T00:00:00.000Z
1 | 1985-09-17T00:00:00.000Z
;

bucketWithEval#[skip:-8.13.99, reason:BUCKET renamed in 8.14]
FROM employees
| EVAL x = hire_date
| WHERE x >= "1980-01-01T00:00:00Z" and hire_date <= "1990-01-01T00:00:00Z"
| STATS COUNT(*) by bucket = BUCKET(x, 1 hour)
| SORT bucket
| LIMIT 5
;

COUNT(*):long | bucket:datetime
1 | 1985-02-18T00:00:00.000Z
1 | 1985-02-24T00:00:00.000Z
1 | 1985-05-13T00:00:00.000Z
1 | 1985-07-09T00:00:00.000Z
1 | 1985-09-17T00:00:00.000Z
;

bucketWithEvalExpression#[skip:-8.13.99, reason:BUCKET renamed in 8.14]
FROM employees
| EVAL x = hire_date + 1 year
| WHERE x >= "1980-01-01T00:00:00Z"
| STATS COUNT(*) by bucket = BUCKET(x, 1 hour)
| SORT bucket
| LIMIT 5
;

COUNT(*):long | bucket:datetime
1 | 1986-02-18T00:00:00.000Z
1 | 1986-02-24T00:00:00.000Z
1 | 1986-05-13T00:00:00.000Z
1 | 1986-07-09T00:00:00.000Z
1 | 1986-09-17T00:00:00.000Z
;

bucketWithRenameEvalExpression#[skip:-8.13.99, reason:BUCKET renamed in 8.14]
FROM employees
| EVAL x = hire_date + 1 year
| RENAME x as y
| WHERE y >= "1980-01-01T00:00:00Z"
| STATS COUNT(*) by bucket = BUCKET(y, 1 hour)
| SORT bucket
| LIMIT 5
;

COUNT(*):long | bucket:datetime
1 | 1986-02-18T00:00:00.000Z
1 | 1986-02-24T00:00:00.000Z
1 | 1986-05-13T00:00:00.000Z
1 | 1986-07-09T00:00:00.000Z
1 | 1986-09-17T00:00:00.000Z
;
254 changes: 254 additions & 0 deletions x-pack/plugin/esql/qa/testFixtures/src/main/resources/date.csv-spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1581,4 +1581,258 @@ x:date | y:date

;

evalDateTruncMonthIntervalWithGTEInRange
FROM employees
| SORT hire_date
| WHERE hire_date >= "1990-01-01"
| EVAL x = date_trunc(1 month, hire_date)
| KEEP emp_no, hire_date, x
| LIMIT 5;

emp_no:integer | hire_date:date | x:date
10082 | 1990-01-03T00:00:00.000Z | 1990-01-01T00:00:00.000Z
10096 | 1990-01-14T00:00:00.000Z | 1990-01-01T00:00:00.000Z
10011 | 1990-01-22T00:00:00.000Z | 1990-01-01T00:00:00.000Z
10056 | 1990-02-01T00:00:00.000Z | 1990-02-01T00:00:00.000Z
10086 | 1990-02-16T00:00:00.000Z | 1990-02-01T00:00:00.000Z
;

evalDateTruncHoursIntervalWithLTEInRange
FROM employees
| SORT hire_date desc
| WHERE hire_date <= "1990-01-01"
| EVAL x = date_trunc(240 hours, hire_date)
| KEEP emp_no, hire_date, x
| LIMIT 5;

emp_no:integer | hire_date:date | x:date
10023 | 1989-12-17T00:00:00.000Z | 1989-12-17T00:00:00.000Z
10041 | 1989-11-12T00:00:00.000Z | 1989-11-07T00:00:00.000Z
10069 | 1989-11-05T00:00:00.000Z | 1989-10-28T00:00:00.000Z
10092 | 1989-09-22T00:00:00.000Z | 1989-09-18T00:00:00.000Z
10038 | 1989-09-20T00:00:00.000Z | 1989-09-18T00:00:00.000Z
;

evalDateTruncWeeklyIntervalWithLTGTInRange
from employees
| SORT hire_date
| WHERE hire_date > "1986-01-01" and hire_date < "1988-01-01"
| EVAL x = date_trunc(1 week, hire_date)
| KEEP emp_no, hire_date, x
| LIMIT 5;

emp_no:integer | hire_date:date | x:date
10053 | 1986-02-04T00:00:00.000Z | 1986-02-03T00:00:00.000Z
10066 | 1986-02-26T00:00:00.000Z | 1986-02-24T00:00:00.000Z
10090 | 1986-03-14T00:00:00.000Z | 1986-03-10T00:00:00.000Z
10079 | 1986-03-27T00:00:00.000Z | 1986-03-24T00:00:00.000Z
10001 | 1986-06-26T00:00:00.000Z | 1986-06-23T00:00:00.000Z
;

evalDateTruncQuarterlyIntervalWithGTInRange
from employees
| SORT hire_date
| WHERE hire_date > "1980-01-01"
| EVAL x = date_trunc(3 month, hire_date)
| KEEP emp_no, hire_date, x
| LIMIT 5;

emp_no:integer | hire_date:date | x:date
10009 | 1985-02-18T00:00:00.000Z | 1985-01-01T00:00:00.000Z
10048 | 1985-02-24T00:00:00.000Z | 1985-01-01T00:00:00.000Z
10098 | 1985-05-13T00:00:00.000Z | 1985-04-01T00:00:00.000Z
10076 | 1985-07-09T00:00:00.000Z | 1985-07-01T00:00:00.000Z
10061 | 1985-09-17T00:00:00.000Z | 1985-07-01T00:00:00.000Z
;

dateTruncGroupingYearIntervalWithLTInRange
from employees
| WHERE hire_date < "2025-01-01"
| EVAL y = date_trunc(1 year, hire_date)
| stats c = count(emp_no) by y
| SORT y
| KEEP y, c
| LIMIT 5;

y:date | c:long
1985-01-01T00:00:00.000Z | 11
1986-01-01T00:00:00.000Z | 11
1987-01-01T00:00:00.000Z | 15
1988-01-01T00:00:00.000Z | 9
1989-01-01T00:00:00.000Z | 13
;

dateTruncGroupingYearIntervalWithLTOutOfRange
from employees
| WHERE hire_date < "1980-01-01"
| EVAL y = date_trunc(1 year, hire_date)
| stats c = count(emp_no) by y
| SORT y
| KEEP y, c
| LIMIT 5;

y:date | c:long
;

dateTruncGroupingYearIntervalWithGTOutOfRange
from employees
| WHERE hire_date > "2000-01-01"
| EVAL y = date_trunc(1 year, hire_date)
| stats c = count(emp_no) by y
| SORT y
| KEEP y, c
| LIMIT 5;

y:date | c:long
;

dateTruncGroupingMonthIntervalWithLTGTInRange
from employees
| WHERE hire_date > "1987-01-01" and hire_date < "1988-01-01"
| EVAL y = date_trunc(1 month, hire_date)
| stats c = count(emp_no) by y
| SORT y
| KEEP y, c
| LIMIT 5;

y:date | c:long
1987-03-01T00:00:00.000Z | 5
1987-04-01T00:00:00.000Z | 3
1987-05-01T00:00:00.000Z | 1
1987-07-01T00:00:00.000Z | 1
1987-08-01T00:00:00.000Z | 2
;

dateTruncGroupingDayIntervalWithEQInRange
from employees
| WHERE hire_date == "1988-02-10"
| EVAL y = date_trunc(1 day, hire_date)
| stats c = count(emp_no) by y
| SORT y
| KEEP y, c
| LIMIT 5;

y:date | c:long
1988-02-10T00:00:00.000Z | 1
;

dateTruncGroupingDayIntervalWithEQOutOfRange
from employees
| WHERE hire_date == "2025-01-01"
| EVAL y = date_trunc(1 day, hire_date)
| stats c = count(emp_no) by y
| SORT y
| KEEP y, c
| LIMIT 5;

y:date | c:long
;

dateTruncWithEval
from employees
| EVAL x = hire_date
| WHERE x > "1987-01-01" and hire_date < "1988-01-01"
| EVAL y = date_trunc(1 month, x)
| STATS c = count(emp_no) by y
| SORT y
| KEEP y, c
| LIMIT 5;

y:date | c:long
1987-03-01T00:00:00.000Z | 5
1987-04-01T00:00:00.000Z | 3
1987-05-01T00:00:00.000Z | 1
1987-07-01T00:00:00.000Z | 1
1987-08-01T00:00:00.000Z | 2
;

dateTruncWithEvalExpression
from employees
| EVAL x = hire_date + 1 year
| WHERE x > "1987-01-01" and x < "1988-01-01"
| EVAL y = date_trunc(1 month, x)
| STATS c = count(emp_no) by y
| SORT y
| KEEP y, c
| LIMIT 5;

y:date | c:long
1987-02-01T00:00:00.000Z | 2
1987-03-01T00:00:00.000Z | 2
1987-06-01T00:00:00.000Z | 1
1987-07-01T00:00:00.000Z | 1
1987-08-01T00:00:00.000Z | 2
;

dateTruncWithRename
FROM employees
| RENAME hire_date as x
| WHERE x > "1987-01-01" and x < "1988-01-01"
| EVAL y = date_trunc(1 month, x)
| STATS c = count(emp_no) by y
| SORT y
| KEEP y, c
| LIMIT 5;

y:date | c:long
1987-03-01T00:00:00.000Z | 5
1987-04-01T00:00:00.000Z | 3
1987-05-01T00:00:00.000Z | 1
1987-07-01T00:00:00.000Z | 1
1987-08-01T00:00:00.000Z | 2
;

dateTruncWithRenameChain
FROM employees
| RENAME hire_date as a, a as x
| WHERE x > "1987-01-01" and x < "1988-01-01"
| EVAL y = date_trunc(1 month, x)
| STATS c = count(emp_no) by y
| SORT y
| KEEP y, c
| LIMIT 5;

y:date | c:long
1987-03-01T00:00:00.000Z | 5
1987-04-01T00:00:00.000Z | 3
1987-05-01T00:00:00.000Z | 1
1987-07-01T00:00:00.000Z | 1
1987-08-01T00:00:00.000Z | 2
;

dateTruncWithRenameBack
FROM employees
| RENAME hire_date as x, x as hire_date
| WHERE hire_date > "1987-01-01" and hire_date < "1988-01-01"
| EVAL y = date_trunc(1 month, hire_date)
| STATS c = count(emp_no) by y
| SORT y
| KEEP y, c
| LIMIT 5;

y:date | c:long
1987-03-01T00:00:00.000Z | 5
1987-04-01T00:00:00.000Z | 3
1987-05-01T00:00:00.000Z | 1
1987-07-01T00:00:00.000Z | 1
1987-08-01T00:00:00.000Z | 2
;

dateTruncWithEvalRename
FROM employees
| EVAL a = hire_date
| RENAME hire_date as b
| WHERE a > "1987-01-01" and a < "1988-01-01"
| EVAL y = date_trunc(1 month, b)
| STATS c = count(emp_no) by y
| SORT y
| KEEP y, c
| LIMIT 5;

y:date | c:long
1987-03-01T00:00:00.000Z | 5
1987-04-01T00:00:00.000Z | 3
1987-05-01T00:00:00.000Z | 1
1987-07-01T00:00:00.000Z | 1
1987-08-01T00:00:00.000Z | 2
;
Loading