move test to SQLQueryTestSuite

Author: peter-toth

sql/core/src/test/resources/sql-tests/inputs/group-by.sql

@@ -179,3 +179,8 @@ SELECT count(*) FROM test_agg WHERE k = 1 or k = 2 or count(*) + 1L > 1L or max(
 
 -- Aggregate with multiple distinct decimal columns
 SELECT AVG(DISTINCT decimal_col), SUM(DISTINCT decimal_col) FROM VALUES (CAST(1 AS DECIMAL(9, 0))) t(decimal_col);
+
+-- SPARK-34581: Don't optimize out grouping expressions from aggregate expressions without aggregate function
+SELECT not(a IS NULL), count(*) AS c
+FROM testData
+GROUP BY a IS NULL

sql/core/src/test/resources/sql-tests/results/group-by.sql.out

@@ -1,5 +1,5 @@
 -- Automatically generated by SQLQueryTestSuite
--- Number of queries: 62
+-- Number of queries: 63
 
 
 -- !query
@@ -642,3 +642,14 @@ SELECT AVG(DISTINCT decimal_col), SUM(DISTINCT decimal_col) FROM VALUES (CAST(1
 struct<avg(DISTINCT decimal_col):decimal(13,4),sum(DISTINCT decimal_col):decimal(19,0)>
 -- !query output
 1.0000	1
+
+
+-- !query
+SELECT not(a IS NULL), count(*) AS c
+FROM testData
+GROUP BY a IS NULL
+-- !query schema
+struct<(NOT (a IS NULL)):boolean,c:bigint>
+-- !query output
+false	2
+true	7

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

@@ -4140,20 +4140,6 @@ class SQLQuerySuite extends QueryTest with SharedSparkSession with AdaptiveSpark
       }
     }
   }
-
-  test("SPARK-34581: Don't optimize out grouping expressions from aggregate expressions") {
-    withTempView("t") {
-      Seq[Integer](null, 1, 2, 3, null).toDF("id").createOrReplaceTempView("t")
-
-      val df = spark.sql(
-        """
-          |SELECT not(t.id IS NULL), count(*) AS c
-          |FROM t
-          |GROUP BY t.id IS NULL
-          |""".stripMargin)
-      checkAnswer(df, Row(true, 3) :: Row(false, 2) :: Nil)
-    }
-  }
 }
 
 case class Foo(bar: Option[String])