Skip to content

[SPARK-23927][SQL] Add "sequence" expression #21155

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
wajda wants to merge 6 commits into from
Closed

[SPARK-23927][SQL] Add "sequence" expression #21155

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
61068e3
SPARK-23927: Add "sequence" expression
wajda Apr 12, 2018
b1a5333
SPARK-23927: use ctx.addReferenceObj instead of TimeZone.getTimeZone
wajda Jun 22, 2018
de044ea
SPARK-23927: use ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH instead of…
wajda Jun 22, 2018
163a748
SPARK-23927: minor code style fixes
wajda Jun 22, 2018
140225d
SPARK-23927: remove redundant "|boolean ${ev.isNull} = false;"
wajda Jun 22, 2018
d6de8cb
SPARK-23927: num.zero instead of 0
wajda Jun 26, 2018
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
Prev Previous commit
Next Next commit
SPARK-23927: minor code style fixes
  • Loading branch information
@wajda
wajda committed Jun 26, 2018
commit 163a748c5fe6a27d88457f20cff63b6a5416089d
12 changes: 6 additions & 6 deletions ...alyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2650,9 +2650,9 @@ object Sequence {
private def getSequenceLength[U](start: U, stop: U, step: U)(implicit num: Integral[U]): Int = {
import num._
require(
step > num.zero && start <= stop
|| step < num.zero && start >= stop
|| step == 0 && start == stop,
(step > num.zero && start <= stop)
|| (step < num.zero && start >= stop)
|| (step == 0 && start == stop),
Copy link
Member

@ueshin ueshin Jun 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

num.zero instead of 0?

Copy link
Contributor Author

@wajda wajda Jun 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. Although I wonder what difference it makes besides the readability? Doesn't equals(0) work consistently on every numeric types in Scala? Or is it related to autoboxing somehow? It's not very clear to me in this context. Thanks.

s"Illegal sequence boundaries: $start to $stop by $step")

val len = if (start == stop) 1L else 1L + (stop.toLong - start.toLong) / step.toLong
Expand All @@ -2672,9 +2672,9 @@ object Sequence {
len: String): String = {
val longLen = ctx.freshName("longLen")
s"""
|if (!($step > 0 && $start <= $stop||
| $step < 0 && $start >= $stop||
| $step == 0 && $start == $stop)) {
|if (!(($step > 0 && $start <= $stop) ||
| ($step < 0 && $start >= $stop) ||
| ($step == 0 && $start == $stop))) {
| throw new IllegalArgumentException(
| "Illegal sequence boundaries: " + $start + " to " + $stop + " by " + $step);
|}
Expand Down
34 changes: 17 additions & 17 deletions ...src/test/scala/org/apache/spark/sql/catalyst/expressions/CollectionExpressionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ class CollectionExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper
ArrayMax(Literal.create(Seq(1.123, 0.1234, 1.121), ArrayType(DoubleType))), 1.123)
}

test("Sequence") {
test("Sequence of numbers") {
// test null handling

checkEvaluation(new Sequence(Literal(null, LongType), Literal(1L)), null)
Expand All @@ -502,21 +502,6 @@ class CollectionExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper
checkExceptionInExpression[IllegalArgumentException](
new Sequence(Literal(1), Literal(2), Literal(-1)), EmptyRow, "boundaries: 1 to 2 by -1")

checkExceptionInExpression[IllegalArgumentException](
new Sequence(
Literal(Date.valueOf("1970-01-02")),
Literal(Date.valueOf("1970-01-01")),
Literal(CalendarInterval.fromString("interval 1 day"))),
EmptyRow, "sequence boundaries: 1 to 0 by 1")

checkExceptionInExpression[IllegalArgumentException](
new Sequence(
Literal(Date.valueOf("1970-01-01")),
Literal(Date.valueOf("1970-02-01")),
Literal(CalendarInterval.fromString("interval 1 month").negate())),
EmptyRow,
s"sequence boundaries: 0 to 2678400000000 by -${28 * CalendarInterval.MICROS_PER_DAY}")

// test sequence with one element (zero step or equal start and stop)

checkEvaluation(new Sequence(Literal(1), Literal(1), Literal(-1)), Seq(1))
Expand Down Expand Up @@ -650,7 +635,7 @@ class CollectionExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper
}

test("Sequence on DST boundaries") {
val timeZone = TimeZone.getTimeZone("CET")
val timeZone = TimeZone.getTimeZone("Europe/Prague")
val dstOffset = timeZone.getDSTSavings

def noDST(t: Timestamp): Timestamp = new Timestamp(t.getTime - dstOffset)
Expand Down Expand Up @@ -721,6 +706,21 @@ class CollectionExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper
Date.valueOf("2019-06-01"),
Date.valueOf("2020-11-01"),
Date.valueOf("2022-04-01")))

checkExceptionInExpression[IllegalArgumentException](
new Sequence(
Literal(Date.valueOf("1970-01-02")),
Literal(Date.valueOf("1970-01-01")),
Literal(CalendarInterval.fromString("interval 1 day"))),
EmptyRow, "sequence boundaries: 1 to 0 by 1")

checkExceptionInExpression[IllegalArgumentException](
new Sequence(
Literal(Date.valueOf("1970-01-01")),
Literal(Date.valueOf("1970-02-01")),
Literal(CalendarInterval.fromString("interval 1 month").negate())),
EmptyRow,
s"sequence boundaries: 0 to 2678400000000 by -${28 * CalendarInterval.MICROS_PER_DAY}")
}
}

Expand Down