Skip to content

[SPARK-38069][SQL][SS] Improve the calculation of time window #35362

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

Closed
nyingping wants to merge 12 commits into from
Closed

[SPARK-38069][SQL][SS] Improve the calculation of time window #35362

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1df0cc8
improve structured streaming window of calculated
nyingping Jan 29, 2022
8bf8e65
improve structured streaming window of calculated
nyingping Jan 29, 2022
d8d0799
improve structured streaming window of calculated
nyingping Jan 29, 2022
530c5b8
improve structured streaming window of calculated
nyingping Jan 29, 2022
f0e0ee8
improve structured streaming window of calculated
nyingping Jan 29, 2022
91c7e45
improve structured streaming window of calculated
nyingping Jan 29, 2022
c839ac2
Merge branch 'apache:master' into main
nyingping Jan 29, 2022
118c026
Update Analyzer.scala
nyingping Jan 31, 2022
fabd761
Merge branch 'apache:master' into main
nyingping Feb 8, 2022
625b4eb
remove the `overlappingWindows` parameter of the `getwindow` function
nyingping Feb 8, 2022
333b92e
Merge remote-tracking branch 'origin/main'
nyingping Feb 8, 2022
1eaf6e5
remove the overlappingWindows parameter of the getwindow function
nyingping Feb 8, 2022
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
21 changes: 9 additions & 12 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3843,8 +3843,8 @@ object TimeWindowing extends Rule[LogicalPlan] {
* The windows are calculated as below:
* maxNumOverlapping <- ceil(windowDuration / slideDuration)
* for (i <- 0 until maxNumOverlapping)
* windowId <- ceil((timestamp - startTime) / slideDuration)
* windowStart <- windowId * slideDuration + (i - maxNumOverlapping) * slideDuration + startTime
* lastStart <- timestamp - (timestamp - startTime + slideDuration) % slideDuration
* windowStart <- lastStart - i * slideDuration
* windowEnd <- windowStart + windowDuration
* return windowStart, windowEnd
*
Expand Down Expand Up @@ -3884,14 +3884,11 @@ object TimeWindowing extends Rule[LogicalPlan] {
case _ => Metadata.empty
}

def getWindow(i: Int, overlappingWindows: Int, dataType: DataType): Expression = {
val division = (PreciseTimestampConversion(
window.timeColumn, dataType, LongType) - window.startTime) / window.slideDuration
val ceil = Ceil(division)
// if the division is equal to the ceiling, our record is the start of a window
val windowId = CaseWhen(Seq((ceil === division, ceil + 1)), Some(ceil))
val windowStart = (windowId + i - overlappingWindows) *
window.slideDuration + window.startTime
def getWindow(i: Int, dataType: DataType): Expression = {
val timestamp = PreciseTimestampConversion(window.timeColumn, dataType, LongType)
val lastStart = timestamp - (timestamp - window.startTime
+ window.slideDuration) % window.slideDuration
val windowStart = lastStart - i * window.slideDuration
val windowEnd = windowStart + window.windowDuration

CreateNamedStruct(
Expand All @@ -3906,7 +3903,7 @@ object TimeWindowing extends Rule[LogicalPlan] {
WINDOW_COL_NAME, window.dataType, metadata = metadata)()

if (window.windowDuration == window.slideDuration) {
val windowStruct = Alias(getWindow(0, 1, window.timeColumn.dataType), WINDOW_COL_NAME)(
val windowStruct = Alias(getWindow(0, window.timeColumn.dataType), WINDOW_COL_NAME)(
exprId = windowAttr.exprId, explicitMetadata = Some(metadata))

val replacedPlan = p transformExpressions {
Expand All @@ -3924,7 +3921,7 @@ object TimeWindowing extends Rule[LogicalPlan] {
math.ceil(window.windowDuration * 1.0 / window.slideDuration).toInt
val windows =
Seq.tabulate(overlappingWindows)(i =>
getWindow(i, overlappingWindows, window.timeColumn.dataType))
getWindow(i, window.timeColumn.dataType))

val projections = windows.map(_ +: child.output)

Expand Down