Optimize code.

Author: beliefer

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

@@ -187,7 +187,7 @@ abstract class LikeAllBase extends UnaryExpression with ImplicitCastInputTypes w
 
   protected def patterns: Seq[UTF8String]
 
-  protected def isNotDefined: Boolean
+  protected def isNotLikeAll: Boolean
 
   override def inputTypes: Seq[DataType] = StringType :: Nil
 
@@ -205,7 +205,7 @@ abstract class LikeAllBase extends UnaryExpression with ImplicitCastInputTypes w
     if (exprValue == null) {
       null
     } else {
-      val allMatched = if (isNotDefined) {
+      val allMatched = if (isNotLikeAll) {
         !cache.exists(p => p.matcher(exprValue.toString).matches())
       } else {
         cache.forall(p => p.matcher(exprValue.toString).matches())
@@ -226,10 +226,9 @@ abstract class LikeAllBase extends UnaryExpression with ImplicitCastInputTypes w
     val allMatched = ctx.freshName("allMatched")
     val valueIsNull = ctx.freshName("valueIsNull")
     val valueArg = ctx.freshName("valueArg")
-    val patternHasNull = ctx.addReferenceObj("hasNull", hasNull)
     val patternCache = ctx.addReferenceObj("patternCache", cache.asJava)
 
-    val matchCode = if (isNotDefined) {
+    val matchCode = if (isNotLikeAll) {
       s"$pattern.matcher($valueArg.toString()).matches()"
     } else {
       s"!$pattern.matcher($valueArg.toString()).matches()"
@@ -250,18 +249,18 @@ abstract class LikeAllBase extends UnaryExpression with ImplicitCastInputTypes w
             |    }
             |  }
             |}
-            |final boolean ${ev.isNull} = $valueIsNull || ($allMatched && $patternHasNull);
+            |final boolean ${ev.isNull} = $valueIsNull || ($allMatched && $hasNull);
             |final boolean ${ev.value} = $allMatched;
       """.stripMargin)
   }
 }
 
 case class LikeAll(child: Expression, patterns: Seq[UTF8String]) extends LikeAllBase {
-  override def isNotDefined: Boolean = false
+  override def isNotLikeAll: Boolean = false
 }
 
 case class NotLikeAll(child: Expression, patterns: Seq[UTF8String]) extends LikeAllBase {
-  override def isNotDefined: Boolean = true
+  override def isNotLikeAll: Boolean = true
 }
 
 // scalastyle:off line.contains.tab

sql/core/src/test/scala/org/apache/spark/sql/SQLQueryTestSuite.scala

@@ -563,7 +563,8 @@ class SQLQueryTestSuite extends QueryTest with SharedSparkSession with SQLHelper
     // Filter out test files with invalid extensions such as temp files created
     // by vi (.swp), Mac (.DS_Store) etc.
     val filteredFiles = files.filter(_.getName.endsWith(validFileExtensions))
-    filteredFiles ++ dirs.flatMap(listFilesRecursively)
+    (filteredFiles ++ dirs.flatMap(listFilesRecursively))
+      .filter(_.getName.equals("window_part1.sql"))
   }
 
   /** Load built-in test tables into the SparkSession. */

sql/core/src/test/scala/org/apache/spark/sql/test/DataFrameReaderWriterSuite.scala

@@ -1033,6 +1033,30 @@ class DataFrameReaderWriterSuite extends QueryTest with SharedSparkSession with
     }
   }
 
+  test("abc2") {
+    spark.sql("create table SPARK_33045(id string) using parquet")
+    val values = Range(1, 90000)
+    spark.sql(s"select concat_ws(${values.mkString(", ")})").show
+  }
+
+  test("abc1") {
+    spark.sql("create table SPARK_33045(id string) using parquet")
+    val values = Range(1, 9000)
+    spark.sql(s"select * from SPARK_33045 where id in (${values.mkString(", ")}, id)").show
+  }
+
+  test("abc") {
+    spark.sql("create table SPARK_33045(id string) using parquet")
+    val values = Range(1, 9000)
+    spark.sql(s"select * from SPARK_33045 where id like all (${values.mkString(", ")})").show
+  }
+
+  test("concat") {
+    spark.sql("create table SPARK_33045(id int) using parquet")
+    val values = Range(1, 900)
+    spark.sql(s"select concat(${values.mkString(", ")}, id) from SPARK_33045").show
+  }
+
   test("Insert overwrite table command should output correct schema: basic") {
     withTable("tbl", "tbl2") {
       withView("view1") {