address review comments

Author: kiszk

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

@@ -23,6 +23,7 @@ import java.util.{Calendar, Locale, TimeZone}
 import org.apache.spark.SparkFunSuite
 import org.apache.spark.sql.Row
 import org.apache.spark.sql.catalyst.InternalRow
+import org.apache.spark.sql.catalyst.expressions.codegen.CodegenContext
 import org.apache.spark.sql.catalyst.util.DateTimeTestUtils._
 import org.apache.spark.sql.catalyst.util.DateTimeUtils
 import org.apache.spark.sql.catalyst.util.DateTimeUtils.TimeZoneGMT
@@ -846,23 +847,10 @@ class CastSuite extends SparkFunSuite with ExpressionEvalHelper {
     checkEvaluation(cast(Literal.create(inputOuter, fromOuter), toOuter), outputOuter)
   }
 
-  test("SPARK-22570: should not create a lot of instance variables") {
-    val N = 30000
-
-    val from1 = new StructType(
-      (1 to N).map(i => StructField(s"s$i", StringType)).toArray)
-    val to1 = new StructType(
-      (1 to N).map(i => StructField(s"i$i", IntegerType)).toArray)
-    val input1 = Row.fromSeq((1 to N).map(i => i.toString))
-    val output1 = Row.fromSeq((1 to N))
-    checkEvaluation(cast(Literal.create(input1, from1), to1), output1)
-
-    val from2 = new StructType(
-      (1 to N).map(i => StructField(s"s$i", StringType)).toArray)
-    val to2 = new StructType(
-      (1 to N).map(i => StructField(s"i$i", LongType)).toArray)
-    val input2 = Row.fromSeq((1 to N).map(i => i.toString))
-    val output2 = Row.fromSeq((1 to N).map(i => i.toLong))
-    checkEvaluation(cast(Literal.create(input2, from2), to2), output2)
+  test("SPARK-22570: Cast should not create a lot of instance variables") {
+    val ctx = new CodegenContext
+    cast("1", IntegerType).genCode(ctx).code
+    cast("2", LongType).genCode(ctx).code
+    assert(ctx.mutableStates.length == 0)
   }
 }

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

@@ -179,14 +179,12 @@ class RegexpExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
     checkEvaluation(nonNullExpr, "num-num", row1)
   }
 
-  test("SPARK-22570: should not create a lot of instance variables") {
-    val N = 16000
-    val expr = RegExpReplace(Literal("100"), Literal("(\\d+)"), Literal("num"))
+  test("SPARK-22570: RegExpReplace should not create a lot of global variables") {
     val ctx = new CodegenContext
-    (1 to N).map(_ => expr.genCode(ctx).code)
+    RegExpReplace(Literal("100"), Literal("(\\d+)"), Literal("num")).genCode(ctx)
     // four global variables (lastRegex, pattern, lastReplacement, and lastReplacementInUTF8)
     // are always required
-    assert(ctx.mutableStates.length == 4 * N)
+    assert(ctx.mutableStates.length == 4)
   }
 
   test("RegexExtract") {

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/complexTypesSuite.scala

@@ -165,9 +165,9 @@ class ComplexTypesSuite extends PlanTest{
     comparePlans(Optimizer execute query, expected)
   }
 
-  test("SPARK-22570: should not create a lot of instance variables") {
+  test("SPARK-22570: CreateArray should not create a lot of global variables") {
     val ctx = new CodegenContext
-    (1 to 60000).map(i => CreateArray(Seq(Literal(s"$i"))).genCode(ctx).code)
+    CreateArray(Seq(Literal(1))).genCode(ctx).code
     assert(ctx.mutableStates.length == 0)
   }