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] Addressing review comments
  • Loading branch information
@mn-mikke
mn-mikke committed Jul 17, 2018
commit fd3a94524b3916507381fd951d65d0a90afad38e
25 changes: 11 additions & 14 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 @@ -180,9 +180,8 @@ case class ArraysZip(children: Seq[Expression]) extends Expression with ExpectsI

override def nullable: Boolean = children.exists(_.nullable)

@transient private lazy val arrayElementTypes = {
@transient private lazy val arrayElementTypes =
children.map(_.dataType.asInstanceOf[ArrayType].elementType)
}

private def genericArrayData = classOf[GenericArrayData].getName

Expand Down Expand Up @@ -356,7 +355,7 @@ case class MapEntries(child: Expression) extends UnaryExpression with ExpectsInp

override def inputTypes: Seq[AbstractDataType] = Seq(MapType)

private def childDataType: MapType = child.dataType.asInstanceOf[MapType]
@transient private lazy val childDataType: MapType = child.dataType.asInstanceOf[MapType]

override def dataType: DataType = {
ArrayType(
Expand Down Expand Up @@ -733,15 +732,14 @@ case class MapConcat(children: Seq[Expression]) extends ComplexTypeMergingExpres
since = "2.4.0")
case class MapFromEntries(child: Expression) extends UnaryExpression {

@transient private lazy val dataTypeDetails: Option[(MapType, Boolean, Boolean)] = {
child.dataType match {
case ArrayType(
StructType(Array(
StructField(_, kt, kn, _),
StructField(_, vt, vn, _))),
cn) => Some((MapType(kt, vt, vn), kn, cn))
case _ => None
}
@transient
private lazy val dataTypeDetails: Option[(MapType, Boolean, Boolean)] = child.dataType match {
case ArrayType(
StructType(Array(
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.

the indentation seems wrong here.

StructField(_, keyType, keyNullable, _),
StructField(_, valueType, valueNullable, _))),
containsNull) => Some((MapType(keyType, valueType, valueNullable), keyNullable, containsNull))
case _ => None
}

@transient private lazy val nullEntries: Boolean = dataTypeDetails.get._3
Expand Down Expand Up @@ -990,9 +988,8 @@ trait ArraySortLike extends ExpectsInputTypes {
}
}

@transient lazy val elementType: DataType = {
@transient lazy val elementType: DataType =
arrayExpression.dataType.asInstanceOf[ArrayType].elementType
}

def containsNull: Boolean = arrayExpression.dataType.asInstanceOf[ArrayType].containsNull

Expand Down