Regenerate golden files

miland-db · Aug 12, 2024 · c807359 · c807359
1 parent 5c519c1
commit c807359
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 11 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/QueryPlan.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/QueryPlan.scala
@@ -17,6 +17,10 @@
 
 package org.apache.spark.sql.catalyst.plans
 
+import java.util.IdentityHashMap
+
+import scala.collection.mutable
+
 import org.apache.spark.sql.AnalysisException
 import org.apache.spark.sql.catalyst.SQLConfHelper
 import org.apache.spark.sql.catalyst.expressions._
@@ -28,10 +32,6 @@ import org.apache.spark.sql.internal.SQLConf
 import org.apache.spark.sql.types.{DataType, StructType}
 import org.apache.spark.util.collection.BitSet
 
-import java.util.IdentityHashMap
-
-import scala.collection.mutable
-
 /**
  * An abstraction of the Spark SQL query plan tree, which can be logical or physical. This class
  * defines some basic properties of a query plan node, as well as some new transform APIs to

diff --git a/sql/core/src/test/resources/sql-tests/analyzer-results/ansi/literals.sql.out b/sql/core/src/test/resources/sql-tests/analyzer-results/ansi/literals.sql.out
@@ -239,7 +239,7 @@ org.apache.spark.sql.catalyst.parser.ParseException
   "errorClass" : "PARSE_SYNTAX_ERROR",
   "sqlState" : "42601",
   "messageParameters" : {
-    "error" : "'.'",
+    "error" : "end of input",
     "hint" : ""
   }
 }

diff --git a/sql/core/src/test/resources/sql-tests/analyzer-results/literals.sql.out b/sql/core/src/test/resources/sql-tests/analyzer-results/literals.sql.out
@@ -239,7 +239,7 @@ org.apache.spark.sql.catalyst.parser.ParseException
   "errorClass" : "PARSE_SYNTAX_ERROR",
   "sqlState" : "42601",
   "messageParameters" : {
-    "error" : "'.'",
+    "error" : "end of input",
     "hint" : ""
   }
 }

diff --git a/sql/core/src/test/resources/sql-tests/results/ansi/keywords.sql.out b/sql/core/src/test/resources/sql-tests/results/ansi/keywords.sql.out
@@ -58,8 +58,10 @@ COMPACTIONS	false
 COMPENSATION	false
 COMPUTE	false
 CONCATENATE	false
+CONDITION	true
 CONSTRAINT	true
 CONTAINS	false
+CONTINUE	false
 COST	false
 CREATE	true
 CROSS	true
@@ -110,6 +112,7 @@ EXCHANGE	false
 EXCLUDE	false
 EXECUTE	true
 EXISTS	false
+EXIT	false
 EXPLAIN	false
 EXPORT	false
 EXTENDED	false
@@ -127,6 +130,7 @@ FOR	true
 FOREIGN	true
 FORMAT	false
 FORMATTED	false
+FOUND	true
 FROM	true
 FULL	true
 FUNCTION	false
@@ -136,6 +140,7 @@ GLOBAL	false
 GRANT	true
 GROUP	true
 GROUPING	false
+HANDLER	true
 HAVING	true
 HOUR	false
 HOURS	false
@@ -287,6 +292,7 @@ SORTED	false
 SOURCE	false
 SPECIFIC	false
 SQL	true
+SQLEXCEPTION	true
 START	false
 STATISTICS	false
 STORED	false
@@ -376,6 +382,7 @@ CHECK
 COLLATE
 COLLATION
 COLUMN
+CONDITION
 CONSTRAINT
 CREATE
 CROSS
@@ -394,10 +401,12 @@ FETCH
 FILTER
 FOR
 FOREIGN
+FOUND
 FROM
 FULL
 GRANT
 GROUP
+HANDLER
 HAVING
 IN
 INNER
@@ -425,6 +434,7 @@ SELECT
 SESSION_USER
 SOME
 SQL
+SQLEXCEPTION
 TABLE
 THEN
 TIME

diff --git a/sql/core/src/test/resources/sql-tests/results/ansi/literals.sql.out b/sql/core/src/test/resources/sql-tests/results/ansi/literals.sql.out
@@ -269,7 +269,7 @@ org.apache.spark.sql.catalyst.parser.ParseException
   "errorClass" : "PARSE_SYNTAX_ERROR",
   "sqlState" : "42601",
   "messageParameters" : {
-    "error" : "'.'",
+    "error" : "end of input",
     "hint" : ""
   }
 }

diff --git a/sql/core/src/test/resources/sql-tests/results/keywords.sql.out b/sql/core/src/test/resources/sql-tests/results/keywords.sql.out
@@ -58,8 +58,10 @@ COMPACTIONS	false
 COMPENSATION	false
 COMPUTE	false
 CONCATENATE	false
+CONDITION	true
 CONSTRAINT	false
 CONTAINS	false
+CONTINUE	false
 COST	false
 CREATE	false
 CROSS	false
@@ -110,6 +112,7 @@ EXCHANGE	false
 EXCLUDE	false
 EXECUTE	false
 EXISTS	false
+EXIT	false
 EXPLAIN	false
 EXPORT	false
 EXTENDED	false
@@ -127,6 +130,7 @@ FOR	false
 FOREIGN	false
 FORMAT	false
 FORMATTED	false
+FOUND	true
 FROM	false
 FULL	false
 FUNCTION	false
@@ -136,6 +140,7 @@ GLOBAL	false
 GRANT	false
 GROUP	false
 GROUPING	false
+HANDLER	true
 HAVING	false
 HOUR	false
 HOURS	false
@@ -287,6 +292,7 @@ SORTED	false
 SOURCE	false
 SPECIFIC	false
 SQL	false
+SQLEXCEPTION	true
 START	false
 STATISTICS	false
 STORED	false
@@ -364,4 +370,7 @@ SELECT keyword from SQL_KEYWORDS() WHERE reserved
 -- !query schema
 struct<keyword:string>
 -- !query output
-
+CONDITION
+FOUND
+HANDLER
+SQLEXCEPTION
diff --git a/sql/core/src/test/resources/sql-tests/results/literals.sql.out b/sql/core/src/test/resources/sql-tests/results/literals.sql.out
@@ -269,7 +269,7 @@ org.apache.spark.sql.catalyst.parser.ParseException
   "errorClass" : "PARSE_SYNTAX_ERROR",
   "sqlState" : "42601",
   "messageParameters" : {
-    "error" : "'.'",
+    "error" : "end of input",
     "hint" : ""
   }
 }

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/scripting/SqlScriptingExecutionNodeSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/scripting/SqlScriptingExecutionNodeSuite.scala
@@ -17,15 +17,15 @@
 
 package org.apache.spark.sql.scripting
 
+import scala.collection.mutable
+
 import org.apache.spark.SparkFunSuite
 import org.apache.spark.sql.SparkSession
 import org.apache.spark.sql.catalyst.expressions.{Alias, Literal}
 import org.apache.spark.sql.catalyst.plans.logical.{OneRowRelation, Project}
 import org.apache.spark.sql.catalyst.trees.Origin
 import org.apache.spark.sql.test.SharedSparkSession
 
-import scala.collection.mutable
-
 /**
  * Unit tests for execution nodes from SqlScriptingExecutionNode.scala.
  * Execution nodes are constructed manually and iterated through.