Skip to content

[SPARK-16837] [SQL] TimeWindow incorrectly drops slideDuration in constructors #14441

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
tmagrino wants to merge 3 commits into from
Closed

[SPARK-16837] [SQL] TimeWindow incorrectly drops slideDuration in constructors #14441

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
9835eb3
Quick fix of incorrect argument in TimeWindow constructors.
tmagrino Aug 1, 2016
e1450f8
Added a test to check that TimeWindow object apply is equivalent to the
tmagrino Aug 1, 2016
0e0136a
Cleaning up unnecessary changes.
tmagrino Aug 1, 2016
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
4 changes: 2 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/TimeWindow.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ case class TimeWindow(
slideDuration: Expression,
startTime: Expression) = {
this(timeColumn, TimeWindow.parseExpression(windowDuration),
TimeWindow.parseExpression(windowDuration), TimeWindow.parseExpression(startTime))
TimeWindow.parseExpression(slideDuration), TimeWindow.parseExpression(startTime))
}

def this(timeColumn: Expression, windowDuration: Expression, slideDuration: Expression) = {
this(timeColumn, TimeWindow.parseExpression(windowDuration),
TimeWindow.parseExpression(windowDuration), 0)
TimeWindow.parseExpression(slideDuration), 0)
}

def this(timeColumn: Expression, windowDuration: Expression) = {
Expand Down
12 changes: 12 additions & 0 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/TimeWindowSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,16 @@ class TimeWindowSuite extends SparkFunSuite with ExpressionEvalHelper with Priva
TimeWindow.invokePrivate(parseExpression(Rand(123)))
}
}

test("SPARK-16837: TimeWindow.apply equivalent to TimeWindow constructor") {
val slideLength = "1 second"
for (windowLength <- Seq("10 second", "1 minute", "2 hours")) {
val applyValue = TimeWindow(Literal(10L), windowLength, slideLength, "0 seconds")
val constructed = new TimeWindow(Literal(10L),
Literal(windowLength),
Literal(slideLength),
Literal("0 seconds"))
assert(applyValue == constructed)
}
}
}