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: use ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH instead of… 
… Int.MaxValue
  • Loading branch information
@wajda
wajda committed Jun 26, 2018
commit de044ea53bb5c5116a7b01ec7046e659a32fe6dd
9 changes: 6 additions & 3 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 @@ -31,6 +31,7 @@ import org.apache.spark.sql.catalyst.util.DateTimeUtils._
import org.apache.spark.sql.types._
import org.apache.spark.unsafe.Platform
import org.apache.spark.unsafe.array.ByteArrayMethods
import org.apache.spark.unsafe.array.ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH
import org.apache.spark.unsafe.types.{ByteArray, UTF8String}
import org.apache.spark.unsafe.types.CalendarInterval
import org.apache.spark.util.collection.OpenHashSet
Expand Down Expand Up @@ -2656,7 +2657,9 @@ object Sequence {

val len = if (start == stop) 1L else 1L + (stop.toLong - start.toLong) / step.toLong

require(len <= Int.MaxValue, s"Too long sequence: $len. Should be <= ${Int.MaxValue}")
require(
len <= MAX_ROUNDED_ARRAY_LENGTH,
s"Too long sequence: $len. Should be <= $MAX_ROUNDED_ARRAY_LENGTH")

len.toInt
}
Expand All @@ -2676,9 +2679,9 @@ object Sequence {
| "Illegal sequence boundaries: " + $start + " to " + $stop + " by " + $step);
|}
|long $longLen = $stop == $start ? 1L : 1L + ((long) $stop - $start) / $step;
|if ($longLen > Integer.MAX_VALUE) {
|if ($longLen > $MAX_ROUNDED_ARRAY_LENGTH) {
| throw new IllegalArgumentException(
| "Too long sequence: " + $longLen + ". Should be <= ${Int.MaxValue}");
| "Too long sequence: " + $longLen + ". Should be <= $MAX_ROUNDED_ARRAY_LENGTH");
|}
|int $len = (int) $longLen;
""".stripMargin
Expand Down
3 changes: 2 additions & 1 deletion ...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 @@ -25,6 +25,7 @@ import org.apache.spark.sql.Row
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.catalyst.util.DateTimeTestUtils
import org.apache.spark.sql.types._
import org.apache.spark.unsafe.array.ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH
import org.apache.spark.unsafe.types.CalendarInterval

class CollectionExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
Expand Down Expand Up @@ -490,7 +491,7 @@ class CollectionExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper

checkExceptionInExpression[IllegalArgumentException](
new Sequence(Literal(Int.MinValue), Literal(Int.MaxValue), Literal(1)),
EmptyRow, s"Too long sequence: 4294967296. Should be <= ${Int.MaxValue}")
EmptyRow, s"Too long sequence: 4294967296. Should be <= $MAX_ROUNDED_ARRAY_LENGTH")

checkExceptionInExpression[IllegalArgumentException](
new Sequence(Literal(1), Literal(2), Literal(0)), EmptyRow, "boundaries: 1 to 2 by 0")
Expand Down