This is an automated email from the ASF dual-hosted git repository.
ruifengz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 3d3d18f14ba2 [SPARK-48301][SQL] Rename
`CREATE_FUNC_WITH_IF_NOT_EXISTS_AND_REPLACE` to
`CREATE_ROUTINE_WITH_IF_NOT_EXISTS_AND_REPLACE`
3d3d18f14ba2 is described below
commit 3d3d18f14ba29074ca3ff8b661449ad45d84369e
Author: Ruifeng Zheng <ruife...@apache.org>
AuthorDate: Thu May 16 20:58:15 2024 +0800
[SPARK-48301][SQL] Rename `CREATE_FUNC_WITH_IF_NOT_EXISTS_AND_REPLACE` to
`CREATE_ROUTINE_WITH_IF_NOT_EXISTS_AND_REPLACE`
### What changes were proposed in this pull request?
Rename `CREATE_FUNC_WITH_IF_NOT_EXISTS_AND_REPLACE` to
`CREATE_ROUTINE_WITH_IF_NOT_EXISTS_AND_REPLACE`
### Why are the changes needed?
`IF NOT EXISTS` + `REPLACE` is standard restriction, not just for functions.
Rename it to make it reusable.
### Does this PR introduce _any_ user-facing change?
no
### How was this patch tested?
updated tests
### Was this patch authored or co-authored using generative AI tooling?
no
Closes #46608 from zhengruifeng/sql_rename_if_not_exists_replace.
Lead-authored-by: Ruifeng Zheng <ruife...@apache.org>
Co-authored-by: Ruifeng Zheng <ruife...@foxmail.com>
Signed-off-by: Ruifeng Zheng <ruife...@apache.org>
---
common/utils/src/main/resources/error/error-conditions.json | 4 ++--
.../main/scala/org/apache/spark/sql/errors/QueryParsingErrors.scala | 2 +-
.../scala/org/apache/spark/sql/errors/QueryParsingErrorsSuite.scala | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/utils/src/main/resources/error/error-conditions.json
b/common/utils/src/main/resources/error/error-conditions.json
index 75067a1920f7..5d750ade7867 100644
--- a/common/utils/src/main/resources/error/error-conditions.json
+++ b/common/utils/src/main/resources/error/error-conditions.json
@@ -2675,9 +2675,9 @@
"ANALYZE TABLE(S) ... COMPUTE STATISTICS ... <ctx> must be either
NOSCAN or empty."
]
},
- "CREATE_FUNC_WITH_IF_NOT_EXISTS_AND_REPLACE" : {
+ "CREATE_ROUTINE_WITH_IF_NOT_EXISTS_AND_REPLACE" : {
"message" : [
- "CREATE FUNCTION with both IF NOT EXISTS and REPLACE is not allowed."
+ "CREATE PROCEDURE or CREATE FUNCTION with both IF NOT EXISTS and
REPLACE is not allowed."
]
},
"CREATE_TEMP_FUNC_WITH_DATABASE" : {
diff --git
a/sql/api/src/main/scala/org/apache/spark/sql/errors/QueryParsingErrors.scala
b/sql/api/src/main/scala/org/apache/spark/sql/errors/QueryParsingErrors.scala
index d07aa6741a14..5eafd4d915a4 100644
---
a/sql/api/src/main/scala/org/apache/spark/sql/errors/QueryParsingErrors.scala
+++
b/sql/api/src/main/scala/org/apache/spark/sql/errors/QueryParsingErrors.scala
@@ -576,7 +576,7 @@ private[sql] object QueryParsingErrors extends
DataTypeErrorsBase {
def createFuncWithBothIfNotExistsAndReplaceError(ctx:
CreateFunctionContext): Throwable = {
new ParseException(
- errorClass =
"INVALID_SQL_SYNTAX.CREATE_FUNC_WITH_IF_NOT_EXISTS_AND_REPLACE",
+ errorClass =
"INVALID_SQL_SYNTAX.CREATE_ROUTINE_WITH_IF_NOT_EXISTS_AND_REPLACE",
ctx)
}
diff --git
a/sql/core/src/test/scala/org/apache/spark/sql/errors/QueryParsingErrorsSuite.scala
b/sql/core/src/test/scala/org/apache/spark/sql/errors/QueryParsingErrorsSuite.scala
index 5babce0ddb8d..29ab6e994e42 100644
---
a/sql/core/src/test/scala/org/apache/spark/sql/errors/QueryParsingErrorsSuite.scala
+++
b/sql/core/src/test/scala/org/apache/spark/sql/errors/QueryParsingErrorsSuite.scala
@@ -288,7 +288,7 @@ class QueryParsingErrorsSuite extends QueryTest with
SharedSparkSession with SQL
stop = 27))
}
- test("INVALID_SQL_SYNTAX.CREATE_FUNC_WITH_IF_NOT_EXISTS_AND_REPLACE: " +
+ test("INVALID_SQL_SYNTAX.CREATE_ROUTINE_WITH_IF_NOT_EXISTS_AND_REPLACE: " +
"Create function with both if not exists and replace") {
val sqlText =
"""CREATE OR REPLACE FUNCTION IF NOT EXISTS func1 as
@@ -297,7 +297,7 @@ class QueryParsingErrorsSuite extends QueryTest with
SharedSparkSession with SQL
checkError(
exception = parseException(sqlText),
- errorClass =
"INVALID_SQL_SYNTAX.CREATE_FUNC_WITH_IF_NOT_EXISTS_AND_REPLACE",
+ errorClass =
"INVALID_SQL_SYNTAX.CREATE_ROUTINE_WITH_IF_NOT_EXISTS_AND_REPLACE",
sqlState = "42000",
context = ExpectedContext(
fragment = sqlText,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
