-
Notifications
You must be signed in to change notification settings - Fork 29k
[SPARK-23905][SQL] Add UDF weekday #21009
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.
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
Closed
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -426,15 +426,7 @@ case class DayOfMonth(child: Expression) extends UnaryExpression with ImplicitCa | |
| """, | ||
| since = "2.3.0") | ||
| // scalastyle:on line.size.limit | ||
| case class DayOfWeek(child: Expression) extends UnaryExpression with ImplicitCastInputTypes { | ||
|
|
||
| override def inputTypes: Seq[AbstractDataType] = Seq(DateType) | ||
|
|
||
| override def dataType: DataType = IntegerType | ||
|
|
||
| @transient private lazy val c = { | ||
| Calendar.getInstance(DateTimeUtils.getTimeZone("UTC")) | ||
| } | ||
| case class DayOfWeek(child: Expression) extends DayWeek { | ||
|
|
||
| override protected def nullSafeEval(date: Any): Any = { | ||
| c.setTimeInMillis(date.asInstanceOf[Int] * 1000L * 3600L * 24L) | ||
|
|
@@ -456,6 +448,49 @@ case class DayOfWeek(child: Expression) extends UnaryExpression with ImplicitCas | |
| } | ||
| } | ||
|
|
||
| // scalastyle:off line.size.limit | ||
| @ExpressionDescription( | ||
| usage = "_FUNC_(date) - Returns the day of the week for date/timestamp (0 = Monday, 1 = Tuesday, ..., 6 = Sunday).", | ||
| examples = """ | ||
| Examples: | ||
| > SELECT _FUNC_('2009-07-30'); | ||
| 3 | ||
| """, | ||
| since = "2.4.0") | ||
| // scalastyle:on line.size.limit | ||
| case class WeekDay(child: Expression) extends DayWeek { | ||
|
|
||
| override protected def nullSafeEval(date: Any): Any = { | ||
| c.setTimeInMillis(date.asInstanceOf[Int] * 1000L * 3600L * 24L) | ||
| (c.get(Calendar.DAY_OF_WEEK) + 5 ) % 7 | ||
| } | ||
|
|
||
| override protected def doGenCode(ctx: CodegenContext, ev: ExprCode): ExprCode = { | ||
| nullSafeCodeGen(ctx, ev, time => { | ||
| val cal = classOf[Calendar].getName | ||
| val dtu = DateTimeUtils.getClass.getName.stripSuffix("$") | ||
| val c = "calWeekDay" | ||
| ctx.addImmutableStateIfNotExists(cal, c, | ||
| v => s"""$v = $cal.getInstance($dtu.getTimeZone("UTC"));""") | ||
| s""" | ||
| $c.setTimeInMillis($time * 1000L * 3600L * 24L); | ||
| ${ev.value} = ($c.get($cal.DAY_OF_WEEK) + 5) % 7; | ||
| """ | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| abstract class DayWeek extends UnaryExpression with ImplicitCastInputTypes { | ||
|
|
||
| override def inputTypes: Seq[AbstractDataType] = Seq(DateType) | ||
|
|
||
| override def dataType: DataType = IntegerType | ||
|
|
||
| @transient protected lazy val c: Calendar = { | ||
|
||
| Calendar.getInstance(DateTimeUtils.getTimeZone("UTC")) | ||
| } | ||
| } | ||
|
|
||
| // scalastyle:off line.size.limit | ||
| @ExpressionDescription( | ||
| usage = "_FUNC_(date) - Returns the week of the year of the given date. A week is considered to start on a Monday and week 1 is the first week with >3 days.", | ||
|
|
||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like
DayOfWeekis duplicate toWeekDay, do we have plan to deprecateDayOfWeekin maybe 3.0?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
They are not duplicate.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
They are different, see:
WeekDay: 0 = Monday, 1 = Tuesday, … 6 = Sunday
DayOfWeek: 1 = Sunday, 2 = Monday, ..., 7 = Saturday