Skip to content

[SPARK-35771][SQL][FOLLOWUP] IntervalUtils.toYearMonthIntervalString should consider the case year-month type is casted as month type #32982

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
sarutak wants to merge 1 commit into from
Closed

[SPARK-35771][SQL][FOLLOWUP] IntervalUtils.toYearMonthIntervalString should consider the case year-month type is casted as month type #32982

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
5 changes: 2 additions & 3 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/IntervalUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,15 +987,14 @@ object IntervalUtils {
absMonths = -absMonths
}
val year = s"$sign${absMonths / MONTHS_PER_YEAR}"
val month = s"${absMonths % MONTHS_PER_YEAR}"
val yearAndMonth = s"$year-$month"
val yearAndMonth = s"$year-${absMonths % MONTHS_PER_YEAR}"
style match {
case ANSI_STYLE =>
val formatBuilder = new StringBuilder("INTERVAL '")
if (startField == endField) {
startField match {
case YearMonthIntervalType.YEAR => formatBuilder.append(s"$year' YEAR")
case YearMonthIntervalType.MONTH => formatBuilder.append(s"$month' MONTH")
case YearMonthIntervalType.MONTH => formatBuilder.append(s"$months' MONTH")
}
} else {
formatBuilder.append(s"$yearAndMonth' YEAR TO MONTH")
Expand Down
14 changes: 7 additions & 7 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/IntervalUtilsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,20 +625,20 @@ class IntervalUtilsSuite extends SparkFunSuite with SQLHelper {
Seq(
0 ->
("INTERVAL '0-0' YEAR TO MONTH", "INTERVAL '0' YEAR", "INTERVAL '0' MONTH"),
-11 -> ("INTERVAL '-0-11' YEAR TO MONTH", "INTERVAL '-0' YEAR", "INTERVAL '11' MONTH"),
-11 -> ("INTERVAL '-0-11' YEAR TO MONTH", "INTERVAL '-0' YEAR", "INTERVAL '-11' MONTH"),
11 -> ("INTERVAL '0-11' YEAR TO MONTH", "INTERVAL '0' YEAR", "INTERVAL '11' MONTH"),
-13 -> ("INTERVAL '-1-1' YEAR TO MONTH", "INTERVAL '-1' YEAR", "INTERVAL '1' MONTH"),
13 -> ("INTERVAL '1-1' YEAR TO MONTH", "INTERVAL '1' YEAR", "INTERVAL '1' MONTH"),
-24 -> ("INTERVAL '-2-0' YEAR TO MONTH", "INTERVAL '-2' YEAR", "INTERVAL '0' MONTH"),
24 -> ("INTERVAL '2-0' YEAR TO MONTH", "INTERVAL '2' YEAR", "INTERVAL '0' MONTH"),
-13 -> ("INTERVAL '-1-1' YEAR TO MONTH", "INTERVAL '-1' YEAR", "INTERVAL '-13' MONTH"),
13 -> ("INTERVAL '1-1' YEAR TO MONTH", "INTERVAL '1' YEAR", "INTERVAL '13' MONTH"),
-24 -> ("INTERVAL '-2-0' YEAR TO MONTH", "INTERVAL '-2' YEAR", "INTERVAL '-24' MONTH"),
24 -> ("INTERVAL '2-0' YEAR TO MONTH", "INTERVAL '2' YEAR", "INTERVAL '24' MONTH"),
Int.MinValue ->
("INTERVAL '-178956970-8' YEAR TO MONTH",
"INTERVAL '-178956970' YEAR",
"INTERVAL '8' MONTH"),
"INTERVAL '-2147483648' MONTH"),
Int.MaxValue ->
("INTERVAL '178956970-7' YEAR TO MONTH",
"INTERVAL '178956970' YEAR",
"INTERVAL '7' MONTH")
"INTERVAL '2147483647' MONTH")
).foreach { case (months, (yearToMonth, year, month)) =>
assert(toYearMonthIntervalString(months, ANSI_STYLE, YEAR, MONTH) === yearToMonth)
assert(toYearMonthIntervalString(months, ANSI_STYLE, YEAR, YEAR) === year)
Expand Down