From 484c9d6a86015d78b20b142adbf77faab27bbe49 Mon Sep 17 00:00:00 2001 From: Bogdan Raducanu Date: Wed, 8 Feb 2017 12:51:42 +0100 Subject: [PATCH 1/2] fix in GenerateOrdering + tests --- .../expressions/codegen/CodeGenerator.scala | 2 -- .../expressions/codegen/GenerateOrdering.scala | 14 ++++++++++++-- .../sql/execution/WholeStageCodegenSuite.scala | 12 ++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala index 04b812e79ee5..75ee7fe44cd2 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala @@ -555,7 +555,6 @@ class CodegenContext { addNewFunction(compareFunc, funcCode) s"this.$compareFunc($c1, $c2)" case schema: StructType => - INPUT_ROW = "i" val comparisons = GenerateOrdering.genComparisons(this, schema) val compareFunc = freshName("compareStruct") val funcCode: String = @@ -566,7 +565,6 @@ class CodegenContext { if (a instanceof UnsafeRow && b instanceof UnsafeRow && a.equals(b)) { return 0; } - InternalRow i = null; $comparisons return 0; } diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala index b7335f12b64b..f7fc2d54a047 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala @@ -73,7 +73,12 @@ object GenerateOrdering extends CodeGenerator[Seq[SortOrder], Ordering[InternalR */ def genComparisons(ctx: CodegenContext, ordering: Seq[SortOrder]): String = { val comparisons = ordering.map { order => + val oldCurrentVars = ctx.currentVars + ctx.INPUT_ROW = "i" + // to use INPUT_ROW we must make sure currentVars is null + ctx.currentVars = null val eval = order.child.genCode(ctx) + ctx.currentVars = oldCurrentVars val asc = order.isAscending val isNullA = ctx.freshName("isNullA") val primitiveA = ctx.freshName("primitiveA") @@ -119,7 +124,7 @@ object GenerateOrdering extends CodeGenerator[Seq[SortOrder], Ordering[InternalR """ } - ctx.splitExpressions( + val code = ctx.splitExpressions( expressions = comparisons, funcName = "compare", arguments = Seq(("InternalRow", "a"), ("InternalRow", "b")), @@ -142,6 +147,12 @@ object GenerateOrdering extends CodeGenerator[Seq[SortOrder], Ordering[InternalR """ }.mkString }) + // make sure INPUT_ROW is declared even if splitExpressions + // returns an inlined block + s""" + |InternalRow ${ctx.INPUT_ROW} = null; + |$code + """.stripMargin } protected def create(ordering: Seq[SortOrder]): BaseOrdering = { @@ -165,7 +176,6 @@ object GenerateOrdering extends CodeGenerator[Seq[SortOrder], Ordering[InternalR ${ctx.declareAddedFunctions()} public int compare(InternalRow a, InternalRow b) { - InternalRow ${ctx.INPUT_ROW} = null; // Holds current row being evaluated. $comparisons return 0; } diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/WholeStageCodegenSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/WholeStageCodegenSuite.scala index e8ea7758cf59..0c9eb9bd1642 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/execution/WholeStageCodegenSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/WholeStageCodegenSuite.scala @@ -143,4 +143,16 @@ class WholeStageCodegenSuite extends SparkPlanTest with SharedSQLContext { assert(createStackGenerator(50).find(isCodeGenerated).isDefined) assert(createStackGenerator(100).find(isCodeGenerated).isEmpty) } + + test("SPARK-XXXX codegen for comparing structs is incorrect") { + // this would raise CompileException before the fix + spark.range(10) + .selectExpr("named_struct('a', id) as col1", "named_struct('a', id+2) as col2") + .filter("col1 = col2").count() + // this would raise java.lang.IndexOutOfBoundsException before the fix + spark.range(10) + .selectExpr("named_struct('a', id, 'b', id) as col1", + "named_struct('a',id+2, 'b',id+2) as col2") + .filter("col1 = col2").count() + } } From 9a8d8537748f38a4276188b3f60f6852010e3387 Mon Sep 17 00:00:00 2001 From: Bogdan Raducanu Date: Wed, 8 Feb 2017 12:55:32 +0100 Subject: [PATCH 2/2] test rename --- .../org/apache/spark/sql/execution/WholeStageCodegenSuite.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/WholeStageCodegenSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/WholeStageCodegenSuite.scala index 0c9eb9bd1642..4d9203556d49 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/execution/WholeStageCodegenSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/WholeStageCodegenSuite.scala @@ -144,7 +144,7 @@ class WholeStageCodegenSuite extends SparkPlanTest with SharedSQLContext { assert(createStackGenerator(100).find(isCodeGenerated).isEmpty) } - test("SPARK-XXXX codegen for comparing structs is incorrect") { + test("SPARK-19512 codegen for comparing structs is incorrect") { // this would raise CompileException before the fix spark.range(10) .selectExpr("named_struct('a', id) as col1", "named_struct('a', id+2) as col2")