Skip to content

[SPARK-16042][SQL] Eliminate nullcheck code at projection for an array type #13757

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
wants to merge 1 commit into from
Closed

[SPARK-16042][SQL] Eliminate nullcheck code at projection for an array type #13757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 28 additions & 16 deletions ...in/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateUnsafeProjection.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,22 +117,22 @@ object GenerateUnsafeProjection extends CodeGenerator[Seq[Expression], UnsafePro
$rowWriter.setOffsetAndSize($index, $tmpCursor, $bufferHolder.cursor - $tmpCursor);
"""

case a @ ArrayType(et, _) =>
case a @ ArrayType(et, cn) =>
s"""
// Remember the current cursor so that we can calculate how many bytes are
// written later.
final int $tmpCursor = $bufferHolder.cursor;
${writeArrayToBuffer(ctx, input.value, et, bufferHolder)}
${writeArrayToBuffer(ctx, input.value, et, cn, bufferHolder)}
$rowWriter.setOffsetAndSize($index, $tmpCursor, $bufferHolder.cursor - $tmpCursor);
$rowWriter.alignToWords($bufferHolder.cursor - $tmpCursor);
"""

case m @ MapType(kt, vt, _) =>
case m @ MapType(kt, vt, cn) =>
s"""
// Remember the current cursor so that we can calculate how many bytes are
// written later.
final int $tmpCursor = $bufferHolder.cursor;
${writeMapToBuffer(ctx, input.value, kt, vt, bufferHolder)}
${writeMapToBuffer(ctx, input.value, kt, vt, cn, bufferHolder)}
$rowWriter.setOffsetAndSize($index, $tmpCursor, $bufferHolder.cursor - $tmpCursor);
$rowWriter.alignToWords($bufferHolder.cursor - $tmpCursor);
"""
Expand Down Expand Up @@ -173,6 +173,7 @@ object GenerateUnsafeProjection extends CodeGenerator[Seq[Expression], UnsafePro
ctx: CodegenContext,
input: String,
elementType: DataType,
containsNull: Boolean,
bufferHolder: String): String = {
val arrayWriterClass = classOf[UnsafeArrayWriter].getName
val arrayWriter = ctx.freshName("arrayWriter")
Expand Down Expand Up @@ -202,16 +203,16 @@ object GenerateUnsafeProjection extends CodeGenerator[Seq[Expression], UnsafePro
${writeStructToBuffer(ctx, element, t.map(_.dataType), bufferHolder)}
"""

case a @ ArrayType(et, _) =>
case a @ ArrayType(et, cn) =>
s"""
$arrayWriter.setOffset($index);
${writeArrayToBuffer(ctx, element, et, bufferHolder)}
${writeArrayToBuffer(ctx, element, et, cn, bufferHolder)}
"""

case m @ MapType(kt, vt, _) =>
case m @ MapType(kt, vt, cn) =>
s"""
$arrayWriter.setOffset($index);
${writeMapToBuffer(ctx, element, kt, vt, bufferHolder)}
${writeMapToBuffer(ctx, element, kt, vt, cn, bufferHolder)}
"""

case t: DecimalType =>
Expand All @@ -222,6 +223,21 @@ object GenerateUnsafeProjection extends CodeGenerator[Seq[Expression], UnsafePro
case _ => s"$arrayWriter.write($index, $element);"
}

val storeElement = if (containsNull) {
s"""
if ($input.isNullAt($index)) {
$arrayWriter.setNullAt($index);
} else {
final $jt $element = ${ctx.getValue(input, et, index)};
$writeElement
}
"""
} else {
s"""
final $jt $element = ${ctx.getValue(input, et, index)};
$writeElement
"""
}
s"""
if ($input instanceof UnsafeArrayData) {
${writeUnsafeData(ctx, s"((UnsafeArrayData) $input)", bufferHolder)}
Expand All @@ -230,12 +246,7 @@ object GenerateUnsafeProjection extends CodeGenerator[Seq[Expression], UnsafePro
$arrayWriter.initialize($bufferHolder, $numElements, $fixedElementSize);

for (int $index = 0; $index < $numElements; $index++) {
if ($input.isNullAt($index)) {
$arrayWriter.setNullAt($index);
} else {
final $jt $element = ${ctx.getValue(input, et, index)};
$writeElement
}
$storeElement
}
}
"""
Expand All @@ -247,6 +258,7 @@ object GenerateUnsafeProjection extends CodeGenerator[Seq[Expression], UnsafePro
input: String,
keyType: DataType,
valueType: DataType,
valueContainsNull: Boolean,
bufferHolder: String): String = {
val keys = ctx.freshName("keys")
val values = ctx.freshName("values")
Expand All @@ -268,11 +280,11 @@ object GenerateUnsafeProjection extends CodeGenerator[Seq[Expression], UnsafePro
// Remember the current cursor so that we can write numBytes of key array later.
final int $tmpCursor = $bufferHolder.cursor;

${writeArrayToBuffer(ctx, keys, keyType, bufferHolder)}
${writeArrayToBuffer(ctx, keys, keyType, false, bufferHolder)}
// Write the numBytes of key array into the first 4 bytes.
Platform.putInt($bufferHolder.buffer, $tmpCursor - 4, $bufferHolder.cursor - $tmpCursor);

${writeArrayToBuffer(ctx, values, valueType, bufferHolder)}
${writeArrayToBuffer(ctx, values, valueType, valueContainsNull, bufferHolder)}
}
"""
}
Expand Down
34 changes: 34 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/DataFrameComplexTypeSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,40 @@ import org.apache.spark.sql.test.SharedSQLContext
class DataFrameComplexTypeSuite extends QueryTest with SharedSQLContext {
import testImplicits._

test("primitive type on array") {
val rows = sparkContext.parallelize(Seq(1, 2), 1).toDF("v").
selectExpr("Array(v + 2, v + 3)").collect
QueryTest.sameRows(Seq(Row(Array(3, 4)), Row(Array(4, 5))), rows.toSeq)
}

test("primitive type and null on array") {
val rows = sparkContext.parallelize(Seq(1, 2), 1).toDF("v").
selectExpr("Array(v + 2, null, v + 3)").collect
QueryTest.sameRows(Seq(Row(Array(3, null, 4)), Row(Array(4, null, 5))), rows.toSeq)
}

test("array with null on array") {
val rows = sparkContext.parallelize(Seq(1, 2), 1).toDF("v").
selectExpr("Array(Array(v, v + 1)," +
"null," +
"Array(v, v - 1))").collect
QueryTest.sameRows(Seq(
Row(Array(Array(1, 2), null, Array(3, 4))),
Row(Array(Array(2, 3), null, Array(4, 5)))), rows.toSeq)
}

test("primitive type on map") {
val rows = sparkContext.parallelize(Seq(1, 2), 1).toDF("v").
selectExpr("map(v + 3, v + 4)").collect
QueryTest.sameRows(Seq(Row(Map(4 -> 5)), Row(Map(5 -> 6))), rows.toSeq)
}

test("map with null value on map") {
val rows = sparkContext.parallelize(Seq(1, 2), 1).toDF("v").
selectExpr("map(v, null)").collect
QueryTest.sameRows(Seq(Row(Map(1 -> null)), Row(Map(2 -> null))), rows.toSeq)
}

test("UDF on struct") {
val f = udf((a: String) => a)
val df = sparkContext.parallelize(Seq((1, 1))).toDF("a", "b")
Expand Down