Code review

Author: dilipbiswal

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala

@@ -1464,31 +1464,27 @@ case class ArrayContains(left: Expression, right: Expression)
     nullSafeCodeGen(ctx, ev, (arr, value) => {
       val i = ctx.freshName("i")
       val getValue = CodeGenerator.getValue(arr, right.dataType, i)
-      def checkAndSetIsNullCode(body: String) = if (nullable) {
+      val loopBodyCode = if (nullable) {
         s"""
            |if ($arr.isNullAt($i)) {
-           |    ${ev.isNull} = true;
-           |} else {
-           |  $body
+           |   ${ev.isNull} = true;
+           |} else if (${ctx.genEqual(right.dataType, value, getValue)}) {
+           |   ${ev.isNull} = false;
+           |   ${ev.value} = true;
+           |   break;
            |}
          """.stripMargin
       } else {
-        body
-      }
-      val unsetIsNullCode = if (nullable) s"${ev.isNull} = false;" else ""
-      val code = checkAndSetIsNullCode(
         s"""
            |if (${ctx.genEqual(right.dataType, value, getValue)}) {
-           |  $unsetIsNullCode
            |  ${ev.value} = true;
            |  break;
            |}
          """.stripMargin
-      )
-
+      }
       s"""
          |for (int $i = 0; $i < $arr.numElements(); $i ++) {
-         |  $code
+         |  $loopBodyCode
          |}
        """.stripMargin
     })

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CollectionExpressionsSuite.scala

@@ -384,7 +384,7 @@ class CollectionExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper
     val a4 = Literal.create(Seq(create_row(1)), ArrayType(StructType(Seq(
       StructField("a", IntegerType, true)))))
     // Explicitly mark the array type not nullable (spark-25308)
-    val a5 = Literal.create(Seq(1, 2, 3), ArrayType(IntegerType, false))
+    val a5 = Literal.create(Seq(1, 2, 3), ArrayType(IntegerType, containsNull = false))
 
     checkEvaluation(ArrayContains(a0, Literal(1)), true)
     checkEvaluation(ArrayContains(a0, Literal(0)), false)