[SPARK-28420][SQL] Support the INTERVAL type in date_part()
#25981
Refactoring
- Loading branch information
commit f3cf7f01e060f75611768ef80c1ebce36561aded
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,132 +18,133 @@ | |
| package org.apache.spark.sql.catalyst.expressions.interval | ||
|
||
|
|
||
| import scala.language.implicitConversions | ||
|
|
||
| import org.apache.spark.SparkFunSuite | ||
| import org.apache.spark.sql.catalyst.expressions.{ExpressionEvalHelper, Literal} | ||
MaxGekk marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| import org.apache.spark.sql.types.Decimal | ||
| import org.apache.spark.unsafe.types.CalendarInterval | ||
|
|
||
| class IntervalExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper { | ||
| implicit def interval(s: String): Literal = { | ||
| Literal(CalendarInterval.fromString("interval " + s)) | ||
| } | ||
|
|
||
| test("millenniums") { | ||
| checkEvaluation(Millenniums("0 years"), 0) | ||
| checkEvaluation(Millenniums("9999 years"), 9) | ||
| checkEvaluation(Millenniums("1000 years"), 1) | ||
| checkEvaluation(Millenniums("-2000 years"), -2) | ||
| // Microseconds part must not be taken into account | ||
| checkEvaluation(Millenniums("999 years 400 days"), 0) | ||
| // Millennium must be taken from years and months | ||
| checkEvaluation(Millenniums("999 years 12 months"), 1) | ||
| checkEvaluation(Millenniums("1000 years -1 months"), 0) | ||
| } | ||
|
|
||
| test("centuries") { | ||
| checkEvaluation(Centuries("0 years"), 0) | ||
| checkEvaluation(Centuries("9999 years"), 99) | ||
| checkEvaluation(Centuries("1000 years"), 10) | ||
| checkEvaluation(Centuries("-2000 years"), -20) | ||
| // Microseconds part must not be taken into account | ||
| checkEvaluation(Centuries("99 years 400 days"), 0) | ||
| // Century must be taken from years and months | ||
| checkEvaluation(Centuries("99 years 12 months"), 1) | ||
| checkEvaluation(Centuries("100 years -1 months"), 0) | ||
| } | ||
|
|
||
| test("decades") { | ||
| checkEvaluation(Decades("0 years"), 0) | ||
| checkEvaluation(Decades("9999 years"), 999) | ||
| checkEvaluation(Decades("1000 years"), 100) | ||
| checkEvaluation(Decades("-2000 years"), -200) | ||
| // Microseconds part must not be taken into account | ||
| checkEvaluation(Decades("9 years 400 days"), 0) | ||
| // Decade must be taken from years and months | ||
| checkEvaluation(Decades("9 years 12 months"), 1) | ||
| checkEvaluation(Decades("10 years -1 months"), 0) | ||
| } | ||
|
|
||
| test("years") { | ||
| checkEvaluation(Years("0 years"), 0) | ||
| checkEvaluation(Years("9999 years"), 9999) | ||
| checkEvaluation(Years("1000 years"), 1000) | ||
| checkEvaluation(Years("-2000 years"), -2000) | ||
| // Microseconds part must not be taken into account | ||
| checkEvaluation(Years("9 years 400 days"), 9) | ||
| // Year must be taken from years and months | ||
| checkEvaluation(Years("9 years 12 months"), 10) | ||
| checkEvaluation(Years("10 years -1 months"), 9) | ||
| } | ||
|
|
||
| test("quarters") { | ||
| checkEvaluation(Quarters("0 months"), 1.toByte) | ||
| checkEvaluation(Quarters("1 months"), 1.toByte) | ||
| checkEvaluation(Quarters("-1 months"), 1.toByte) | ||
| checkEvaluation(Quarters("2 months"), 1.toByte) | ||
| checkEvaluation(Quarters("-2 months"), 1.toByte) | ||
| checkEvaluation(Quarters("1 years -1 months"), 4.toByte) | ||
| checkEvaluation(Quarters("-1 years 1 months"), -2.toByte) | ||
| checkEvaluation(Quarters("2 years 3 months"), 2.toByte) | ||
| checkEvaluation(Quarters("-2 years -3 months"), 0.toByte) | ||
| checkEvaluation(Quarters("9999 years"), 1.toByte) | ||
| } | ||
|
|
||
| test("months") { | ||
| checkEvaluation(Months("0 year"), 0.toByte) | ||
| for (m <- -24 to 24) { | ||
| checkEvaluation(Months(s"$m months"), (m % 12).toByte) | ||
| } | ||
| checkEvaluation(Months("1 year 10 months"), 10.toByte) | ||
| checkEvaluation(Months("-2 year -10 months"), -10.toByte) | ||
| checkEvaluation(Months("9999 years"), 0.toByte) | ||
| } | ||
|
|
||
| private val largeInterval: String = | ||
| "9999 years 11 months 31 days 11 hours 59 minutes 59 seconds" | ||
|
|
||
| test("days") { | ||
| checkEvaluation(Days("0 days"), 0L) | ||
| checkEvaluation(Days("1 days 100 seconds"), 1L) | ||
| checkEvaluation(Days("-1 days -100 seconds"), -1L) | ||
| checkEvaluation(Days("-365 days"), -365L) | ||
| checkEvaluation(Days("365 days"), 365L) | ||
| // Years and months must not be taken into account | ||
| checkEvaluation(Days("100 year 10 months 5 days"), 5L) | ||
| checkEvaluation(Days(largeInterval), 31L) | ||
| } | ||
|
|
||
| test("hours") { | ||
| checkEvaluation(Hours("0 hours"), 0.toByte) | ||
| checkEvaluation(Hours("1 hour"), 1.toByte) | ||
| checkEvaluation(Hours("-1 hour"), -1.toByte) | ||
| checkEvaluation(Hours("23 hours"), 23.toByte) | ||
| checkEvaluation(Hours("-23 hours"), -23.toByte) | ||
| // Years and months must not be taken into account | ||
| checkEvaluation(Hours("100 year 10 months 10 hours"), 10.toByte) | ||
| checkEvaluation(Hours(largeInterval), 11.toByte) | ||
| } | ||
|
|
||
| test("minutes") { | ||
| checkEvaluation(Minutes("0 minute"), 0.toByte) | ||
| checkEvaluation(Minutes("1 minute"), 1.toByte) | ||
| checkEvaluation(Minutes("-1 minute"), -1.toByte) | ||
| checkEvaluation(Minutes("59 minute"), 59.toByte) | ||
| checkEvaluation(Minutes("-59 minute"), -59.toByte) | ||
| // Years and months must not be taken into account | ||
| checkEvaluation(Minutes("100 year 10 months 10 minutes"), 10.toByte) | ||
| checkEvaluation(Minutes(largeInterval), 59.toByte) | ||
| } | ||
|
|
||
| test("seconds") { | ||
| checkEvaluation(Seconds("0 second"), Decimal(0, 8, 6)) | ||
| checkEvaluation(Seconds("1 second"), Decimal(1.0, 8, 6)) | ||
| checkEvaluation(Seconds("-1 second"), Decimal(-1.0, 8, 6)) | ||
| checkEvaluation(Seconds("1 minute 59 second"), Decimal(59.0, 8, 6)) | ||
| checkEvaluation(Seconds("-59 minutes -59 seconds"), Decimal(-59.0, 8, 6)) | ||
| // Years and months must not be taken into account | ||
| checkEvaluation(Seconds("100 year 10 months 10 seconds"), Decimal(10.0, 8, 6)) | ||
| checkEvaluation(Seconds(largeInterval), Decimal(59.0, 8, 6)) | ||
| checkEvaluation(Seconds("10 seconds 1 milliseconds 1 microseconds"), Decimal(10001001, 8, 6)) | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.