Set truncate to Int32.max

dongjoon-hyun · dongjoon-hyun · commit c96f3560cb2a · 2025-04-30T21:26:00.000-07:00
diff --git a/Tests/SparkConnectTests/Resources/queries/binary.sql.answer b/Tests/SparkConnectTests/Resources/queries/binary.sql.answer
@@ -1,5 +1,5 @@
 +----------+
-|abc       |
+|       abc|
 +----------+
 |[61 62 63]|
 +----------+
diff --git a/Tests/SparkConnectTests/Resources/queries/date.sql.answer b/Tests/SparkConnectTests/Resources/queries/date.sql.answer
@@ -1,5 +1,5 @@
 +-----------------+
 |DATE '2025-03-15'|
 +-----------------+
-|2025-03-15       |
+|       2025-03-15|
 +-----------------+
diff --git a/Tests/SparkConnectTests/Resources/queries/describe_database.sql.answer b/Tests/SparkConnectTests/Resources/queries/describe_database.sql.answer
@@ -1,9 +1,9 @@
 +--------------+----------------------------------------+
-|info_name     |info_value                              |
+|     info_name|                              info_value|
 +--------------+----------------------------------------+
-|Catalog Name  |spark_catalog                           |
-|Namespace Name|default                                 |
-|Comment       |default database                        |
-|Location      |*|
-|Owner         |*                                     |
+|  Catalog Name|                           spark_catalog|
+|Namespace Name|                                 default|
+|       Comment|                        default database|
+|      Location|*|
+|         Owner|                                     *|
 +--------------+----------------------------------------+
diff --git a/Tests/SparkConnectTests/Resources/queries/describe_function.sql.answer b/Tests/SparkConnectTests/Resources/queries/describe_function.sql.answer
@@ -1,7 +1,7 @@
 +-------------------------------------------------------------------------------+
-|function_desc                                                                  |
+|                                                                  function_desc|
 +-------------------------------------------------------------------------------+
-|Function: abs                                                                  |
-|Class: org.apache.spark.sql.catalyst.expressions.Abs                           |
+|                                                                  Function: abs|
+|                           Class: org.apache.spark.sql.catalyst.expressions.Abs|
 |Usage: abs(expr) - Returns the absolute value of the numeric or interval value.|
 +-------------------------------------------------------------------------------+
diff --git a/Tests/SparkConnectTests/Resources/queries/describe_query.sql.answer b/Tests/SparkConnectTests/Resources/queries/describe_query.sql.answer
@@ -1,7 +1,7 @@
 +--------+---------+-------+
 |col_name|data_type|comment|
 +--------+---------+-------+
-|id      |int      |NULL   |
-|name    |string   |NULL   |
-|salary  |double   |NULL   |
+|      id|      int|   NULL|
+|    name|   string|   NULL|
+|  salary|   double|   NULL|
 +--------+---------+-------+
diff --git a/Tests/SparkConnectTests/Resources/queries/describe_table.sql.answer b/Tests/SparkConnectTests/Resources/queries/describe_table.sql.answer
@@ -1,5 +1,5 @@
 +--------+---------+-------+
 |col_name|data_type|comment|
 +--------+---------+-------+
-|col     |int      |NULL   |
+|     col|      int|   NULL|
 +--------+---------+-------+
diff --git a/Tests/SparkConnectTests/Resources/queries/explain.sql.answer b/Tests/SparkConnectTests/Resources/queries/explain.sql.answer
@@ -1,5 +1,5 @@
-+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|plan                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+|                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      plan|
++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 |== Parsed Logical Plan ==\n'Aggregate ['k], ['k, unresolvedalias('sum('v))]\n+- SubqueryAlias t\n   +- LocalRelation [k#, v#]\n\n== Analyzed Logical Plan ==\nk: int, sum(v): bigint\nAggregate [k#], [k#, sum(v#) AS sum(v)#]\n+- SubqueryAlias t\n   +- LocalRelation [k#, v#]\n\n== Optimized Logical Plan ==\nAggregate [k#], [k#, sum(v#) AS sum(v)#]\n+- LocalRelation [k#, v#]\n\n== Physical Plan ==\nAdaptiveSparkPlan isFinalPlan=false\n+- HashAggregate(keys=[k#], functions=[sum(v#)], output=[k#, sum(v)#])\n   +- Exchange hashpartitioning(k#, 200), ENSURE_REQUIREMENTS, [plan_id=]\n      +- HashAggregate(keys=[k#], functions=[partial_sum(v#)], output=[k#, sum#])\n         +- LocalTableScan [k#, v#]\n|
-+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
diff --git a/Tests/SparkConnectTests/Resources/queries/floating.sql.answer b/Tests/SparkConnectTests/Resources/queries/floating.sql.answer
@@ -1,5 +1,5 @@
 +---+----+---+----+--------+---+--------+---+
-|1.0|-2.0|3.0|-4.0|inf     |NaN|inf     |NaN|
+|1.0|-2.0|3.0|-4.0|     inf|NaN|     inf|NaN|
 +---+----+---+----+--------+---+--------+---+
 |1.0|-2.0|3.0|-4.0|Infinity|NaN|Infinity|NaN|
 +---+----+---+----+--------+---+--------+---+
diff --git a/Tests/SparkConnectTests/Resources/queries/pipesyntax.sql.answer b/Tests/SparkConnectTests/Resources/queries/pipesyntax.sql.answer
@@ -1,6 +1,6 @@
 +---+------+
 |col|result|
 +---+------+
-|0  |0     |
-|1  |2     |
+|  0|     0|
+|  1|     2|
 +---+------+
diff --git a/Tests/SparkConnectTests/Resources/queries/select.sql.answer b/Tests/SparkConnectTests/Resources/queries/select.sql.answer
@@ -1,5 +1,5 @@
 +---+
-|1  |
+|  1|
 +---+
-|1  |
+|  1|
 +---+
diff --git a/Tests/SparkConnectTests/Resources/queries/show_databases.sql.answer b/Tests/SparkConnectTests/Resources/queries/show_databases.sql.answer
@@ -1,5 +1,5 @@
 +---------+
 |namespace|
 +---------+
-|default  |
+|  default|
 +---------+
diff --git a/Tests/SparkConnectTests/Resources/queries/show_tables.sql.answer b/Tests/SparkConnectTests/Resources/queries/show_tables.sql.answer
@@ -1,5 +1,5 @@
 +---------+---------+-----------+
 |namespace|tableName|isTemporary|
 +---------+---------+-----------+
-|         |testcache|true       |
+|         |testcache|       true|
 +---------+---------+-----------+
diff --git a/Tests/SparkConnectTests/Resources/queries/struct.sql.answer b/Tests/SparkConnectTests/Resources/queries/struct.sql.answer
@@ -1,5 +1,5 @@
 +---------+--------------------+
 |struct(1)|struct(2, struct(3))|
 +---------+--------------------+
-|{1}      |{2, {3}}            |
+|      {1}|            {2, {3}}|
 +---------+--------------------+
diff --git a/Tests/SparkConnectTests/SQLTests.swift b/Tests/SparkConnectTests/SQLTests.swift
@@ -80,6 +80,7 @@ struct SQLTests {
   @Test
   func runAll() async throws {
     let spark = try await SparkSession.builder.getOrCreate()
+    let MAX = Int32.max
     for name in try! fm.contentsOfDirectory(atPath: path).sorted() {
       guard name.hasSuffix(".sql") else { continue }
       print(name)
@@ -89,7 +90,7 @@ struct SQLTests {
       }
 
       let sql = try String(contentsOf: URL(fileURLWithPath: "\(path)/\(name)"), encoding: .utf8)
-      let result = try await spark.sql(sql).showString(Int32.max, 0, false).collect()[0].get(0) as! String
+      let result = try await spark.sql(sql).showString(MAX, MAX, false).collect()[0].get(0) as! String
       let answer = cleanUp(result.trimmingCharacters(in: .whitespacesAndNewlines))
       if (regenerateGoldenFiles) {
         let path = "\(FileManager.default.currentDirectoryPath)/Tests/SparkConnectTests/Resources/queries/\(name).answer"

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 +----------+
 -|abc       |
 +|       abc|
 +----------+
 |[61 62 63]|
 +----------+