[SPARK-47911][SQL][FOLLOWUP] Enable binary format tests in ThriftServ…

…erQueryTestSuite ### What changes were proposed in this pull request? This PR enables binary format tests in ThriftServerQueryTestSuite ### Why are the changes needed? improve test coverage ### Does this PR introduce _any_ user-facing change? no ### How was this patch tested? new tests ### Was this patch authored or co-authored using generative AI tooling? no Closes #47028 from yaooqinn/SPARK-47911-F. Authored-by: Kent Yao <[email protected]> Signed-off-by: Kent Yao <[email protected]>
apache · Jun 20, 2024 · 714699b · 714699b
1 parent 955349f
commit 714699b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 17 deletions.
diff --git a/sql/core/src/test/resources/sql-tests/inputs/binary.sql b/sql/core/src/test/resources/sql-tests/inputs/binary.sql
@@ -1,4 +1,4 @@
---SET spark.sql.binaryOutputStyle=UTF8;
+--SET spark.sql.binaryOutputStyle=UTF8
 
 SELECT X'';
 SELECT X'4561736F6E2059616F20323031382D31312D31373A31333A33333A3333';

diff --git a/sql/core/src/test/resources/sql-tests/inputs/binary_base64.sql b/sql/core/src/test/resources/sql-tests/inputs/binary_base64.sql
@@ -1,3 +1,3 @@
 --IMPORT binary.sql
 
---SET spark.sql.binaryOutputStyle=BASE64;
+--SET spark.sql.binaryOutputStyle=BASE64
diff --git a/sql/core/src/test/resources/sql-tests/inputs/binary_basic.sql b/sql/core/src/test/resources/sql-tests/inputs/binary_basic.sql
@@ -1,4 +1,4 @@
 --IMPORT binary.sql
 
---SET spark.sql.binaryOutputStyle=BASIC;
+--SET spark.sql.binaryOutputStyle=BASIC
 
diff --git a/sql/core/src/test/resources/sql-tests/inputs/binary_hex.sql b/sql/core/src/test/resources/sql-tests/inputs/binary_hex.sql
@@ -1,3 +1,3 @@
 --IMPORT binary.sql
 
---SET spark.sql.binaryOutputStyle=HEX;
+--SET spark.sql.binaryOutputStyle=HEX
diff --git a/sql/core/src/test/resources/sql-tests/inputs/binary_hex_discrete.sql b/sql/core/src/test/resources/sql-tests/inputs/binary_hex_discrete.sql
@@ -1,3 +1,3 @@
 --IMPORT binary.sql
 
---SET spark.sql.binaryOutputStyle=HEX_DISCRETE;
+--SET spark.sql.binaryOutputStyle=HEX_DISCRETE
diff --git a/...er/src/test/scala/org/apache/spark/sql/hive/thriftserver/ThriftServerQueryTestSuite.scala b/...er/src/test/scala/org/apache/spark/sql/hive/thriftserver/ThriftServerQueryTestSuite.scala
@@ -103,11 +103,7 @@ class ThriftServerQueryTestSuite extends SQLQueryTestSuite with SharedThriftServ
     // SPARK-42921
     "timestampNTZ/datetime-special-ansi.sql",
     // SPARK-47264
-    "collations.sql",
-    "binary_hex.sql",
-    "binary_hex_discrete.sql",
-    "binary_basic.sql",
-    "binary_base64.sql"
+    "collations.sql"
   )
 
   override def runQueries(
@@ -135,13 +131,15 @@ class ThriftServerQueryTestSuite extends SQLQueryTestSuite with SharedThriftServ
       }
 
       // Run the SQL queries preparing them for comparison.
-      val outputs: Seq[QueryTestOutput] = queries.map { sql =>
-        val (_, output) = handleExceptions(getNormalizedResult(statement, sql))
-        // We might need to do some query canonicalization in the future.
-        ExecutionOutput(
-          sql = sql,
-          schema = Some(""),
-          output = output.mkString("\n").replaceAll("\\s+$", ""))
+      val outputs: Seq[QueryTestOutput] = withSQLConf(configSet: _*) {
+        queries.map { sql =>
+          val (_, output) = handleExceptions(getNormalizedResult(statement, sql))
+          // We might need to do some query canonicalization in the future.
+          ExecutionOutput(
+            sql = sql,
+            schema = Some(""),
+            output = output.mkString("\n").replaceAll("\\s+$", ""))
+        }
       }
 
       // Read back the golden file.