diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala index 075c1aa057901..ee98ebf5a8a50 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala @@ -2040,7 +2040,7 @@ case class ElementAt( "" } - val failOnErrorBranch = if (failOnError) { + val indexOutOfBoundBranch = if (failOnError) { s"""throw new ArrayIndexOutOfBoundsException( | "Invalid index: " + $index + ", numElements: " + $eval1.numElements() |); @@ -2052,7 +2052,7 @@ case class ElementAt( s""" |int $index = (int) $eval2; |if ($eval1.numElements() < Math.abs($index)) { - | $failOnErrorBranch + | $indexOutOfBoundBranch |} else { | if ($index == 0) { | throw new ArrayIndexOutOfBoundsException("SQL array indices start at 1"); diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypeExtractors.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypeExtractors.scala index 9cc7f169f19b1..363d388692c9f 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypeExtractors.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypeExtractors.scala @@ -281,7 +281,7 @@ case class GetArrayItem( "" } - val failOnErrorBranch = if (failOnError) { + val indexOutOfBoundBranch = if (failOnError) { s"""throw new ArrayIndexOutOfBoundsException( | "Invalid index: " + $index + ", numElements: " + $eval1.numElements() |); @@ -293,7 +293,7 @@ case class GetArrayItem( s""" final int $index = (int) $eval2; if ($index >= $eval1.numElements() || $index < 0) { - $failOnErrorBranch + $indexOutOfBoundBranch } $nullCheck else { ${ev.value} = ${CodeGenerator.getValue(eval1, dataType, index)}; } diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala index afbe95e92d0f7..16e22940495f1 100755 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala @@ -338,7 +338,7 @@ case class Elt( """.stripMargin }.mkString) - val failOnErrorBranch = if (failOnError) { + val indexOutOfBoundBranch = if (failOnError) { s""" |if (!$indexMatched) { | throw new ArrayIndexOutOfBoundsException( @@ -358,7 +358,7 @@ case class Elt( |do { | $codes |} while (false); - |$failOnErrorBranch + |$indexOutOfBoundBranch |final ${CodeGenerator.javaType(dataType)} ${ev.value} = $inputVal; |final boolean ${ev.isNull} = ${ev.value} == null; """.stripMargin)