Skip to content

[SPARK-24305][SQL][FOLLOWUP] Avoid serialization of private fields in collection expressions. #21352

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
mn-mikke wants to merge 12 commits into from
Closed

[SPARK-24305][SQL][FOLLOWUP] Avoid serialization of private fields in collection expressions. #21352

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ded67f5
[SPARK-24305][SQL][FOLLOWUP] Avoid serialization of private fields in…
mn-mikke May 17, 2018
e96962e
[SPARK-24305][SQL][FOLLOWUP] Reverting change of making the ordering …
mn-mikke May 17, 2018
f6368b5
[SPARK-24305][SQL][FOLLOWUP] Using ByteArrayMethods.MAX_ROUNDED_ARRAY…
mn-mikke May 17, 2018
2862d3e
[SPARK-24305][SQL][FOLLOWUP] Fixing failing tests.
mn-mikke May 17, 2018
a4d1e7f
Merge remote-tracking branch 'spark/master' into SPARK-24305
mn-mikke Jul 16, 2018
62c55ad
[SPARK-24305][SQL][FOLLOWUP] Using def wherever it's possible and cov…
mn-mikke Jul 16, 2018
294ac69
[SPARK-24305][SQL][FOLLOWUP] Fixing indentation
mn-mikke Jul 16, 2018
94b86a2
[SPARK-24305][SQL][FOLLOWUP] Making fields used in eval lazy-evaluated
mn-mikke Jul 17, 2018
a0abc25
Merge remote-tracking branch 'spark/master' into SPARK-24305
mn-mikke Jul 17, 2018
872ef99
[SPARK-24305][SQL][FOLLOWUP] Making fields used in eval lazy-evaluate…
mn-mikke Jul 17, 2018
fd3a945
[SPARK-24305][SQL][FOLLOWUP] Addressing review comments
mn-mikke Jul 17, 2018
922d2f0
[SPARK-24305][SQL][FOLLOWUP] A small optimization of Slice and Elemen…
mn-mikke Jul 17, 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-24305][SQL][FOLLOWUP] Using ByteArrayMethods.MAX_ROUNDED_ARRAY… 
…_LENGTH directly
  • Loading branch information
@mn-mikke
mn-mikke committed May 17, 2018
commit f6368b5c68b69f9595240bb98cd533f9d7a110e6
35 changes: 17 additions & 18 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 @@ -1130,8 +1130,6 @@ case class ElementAt(left: Expression, right: Expression) extends GetMapValueUti
""")
case class Concat(children: Seq[Expression]) extends Expression {

private def maxArrayLength: Int = ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH

private def allowedTypes: Seq[AbstractDataType] = Seq(StringType, BinaryType, ArrayType)

override def checkInputDataTypes(): TypeCheckResult = {
Expand Down Expand Up @@ -1172,9 +1170,10 @@ case class Concat(children: Seq[Expression]) extends Expression {
} else {
val arrayData = inputs.map(_.asInstanceOf[ArrayData])
val numberOfElements = arrayData.foldLeft(0L)((sum, ad) => sum + ad.numElements())
if (numberOfElements > maxArrayLength) {
if (numberOfElements > ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH) {
throw new RuntimeException(s"Unsuccessful try to concat arrays with $numberOfElements" +
s" elements due to exceeding the array size limit $maxArrayLength.")
" elements due to exceeding the array size limit " +
ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH + ".")
}
val finalData = new Array[AnyRef](numberOfElements.toInt)
var position = 0
Expand Down Expand Up @@ -1232,9 +1231,10 @@ case class Concat(children: Seq[Expression]) extends Expression {
|for (int z = 0; z < ${children.length}; z++) {
| $numElements += args[z].numElements();
|}
|if ($numElements > $maxArrayLength) {
|if ($numElements > ${ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH}) {
| throw new RuntimeException("Unsuccessful try to concat arrays with " + $numElements +
| " elements due to exceeding the array size limit $maxArrayLength.");
| " elements due to exceeding the array size limit " +
| ${ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH}.");
|}
""".stripMargin

Expand Down Expand Up @@ -1329,8 +1329,6 @@ case class Concat(children: Seq[Expression]) extends Expression {
since = "2.4.0")
case class Flatten(child: Expression) extends UnaryExpression {

private def maxArrayLength: Int = ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH

@transient
private lazy val childDataType: ArrayType = child.dataType.asInstanceOf[ArrayType]
Copy link
Contributor

@cloud-fan cloud-fan Jul 16, 2018

Choose a reason for hiding this comment

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

we should only use lazy val if it can save some heavy computation. For things like this, I think def is good enough


Expand Down Expand Up @@ -1359,9 +1357,10 @@ case class Flatten(child: Expression) extends UnaryExpression {
} else {
val arrayData = elements.map(_.asInstanceOf[ArrayData])
val numberOfElements = arrayData.foldLeft(0L)((sum, e) => sum + e.numElements())
if (numberOfElements > maxArrayLength) {
if (numberOfElements > ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH) {
throw new RuntimeException("Unsuccessful try to flatten an array of arrays with " +
s"$numberOfElements elements due to exceeding the array size limit $maxArrayLength.")
s"$numberOfElements elements due to exceeding the array size limit " +
ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH + ".")
}
val flattenedData = new Array(numberOfElements.toInt)
var position = 0
Expand Down Expand Up @@ -1408,9 +1407,10 @@ case class Flatten(child: Expression) extends UnaryExpression {
|for (int z = 0; z < $childVariableName.numElements(); z++) {
| $variableName += $childVariableName.getArray(z).numElements();
|}
|if ($variableName > $maxArrayLength) {
|if ($variableName > ${ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH}) {
| throw new RuntimeException("Unsuccessful try to flatten an array of arrays with " +
| $variableName + " elements due to exceeding the array size limit $maxArrayLength.");
| $variableName + " elements due to exceeding the array size limit " +
| ${ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH}.");
|}
""".stripMargin
(code, variableName)
Expand Down Expand Up @@ -1490,8 +1490,6 @@ case class Flatten(child: Expression) extends UnaryExpression {
case class ArrayRepeat(left: Expression, right: Expression)
extends BinaryExpression with ExpectsInputTypes {

private def maxArrayLength: Int = ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH

override def dataType: ArrayType = ArrayType(left.dataType, left.nullable)

override def inputTypes: Seq[AbstractDataType] = Seq(AnyDataType, IntegerType)
Expand All @@ -1503,9 +1501,9 @@ case class ArrayRepeat(left: Expression, right: Expression)
if (count == null) {
null
} else {
if (count.asInstanceOf[Int] > maxArrayLength) {
if (count.asInstanceOf[Int] > ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH) {
throw new RuntimeException(s"Unsuccessful try to create array with $count elements " +
s"due to exceeding the array size limit $maxArrayLength.");
s"due to exceeding the array size limit ${ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH}.");
}
val element = left.eval(input)
new GenericArrayData(Array.fill(count.asInstanceOf[Int])(element))
Expand Down Expand Up @@ -1564,9 +1562,10 @@ case class ArrayRepeat(left: Expression, right: Expression)
|if ($count > 0) {
| $numElements = $count;
|}
|if ($numElements > $maxArrayLength) {
|if ($numElements > ${ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH}) {
| throw new RuntimeException("Unsuccessful try to create array with " + $numElements +
| " elements due to exceeding the array size limit $maxArrayLength.");
| " elements due to exceeding the array size limit " +
| ${ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH}.");
|}
""".stripMargin

Expand Down