Skip to content

[SPARK-59460][SQL] Assign a name to the error condition _LEGACY_ERROR_TEMP_1072 #58759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ma77Ball wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −18
Open

[SPARK-59460][SQL] Assign a name to the error condition _LEGACY_ERROR_TEMP_1072 #58759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions common/utils/src/main/resources/error/error-conditions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8134,6 +8134,12 @@
},
"sqlState" : "42601"
},
"TABLES_OR_VIEWS_NOT_IN_SAME_DATABASE" : {
"message" : [
"Cannot retrieve tables or views that do not belong to the same database. Requested: <qualifiedTableNames>."
],
"sqlState" : "0A000"
},
"TABLE_LOCATION_URI_NOT_SPECIFIED" : {
"message" : [
"Table <identifier> did not specify locationUri."
Expand Down Expand Up @@ -10309,11 +10315,6 @@
"Some existing schema fields (<nonExistentColumnNames>) are not present in the new schema. We don't support dropping columns yet."
]
},
"_LEGACY_ERROR_TEMP_1072" : {
"message" : [
"Only the tables/views belong to the same database can be retrieved. Querying tables/views are <qualifiedTableNames>."
]
},
"_LEGACY_ERROR_TEMP_1079" : {
"message" : [
"Resource Type '<resourceType>' is not supported."
Expand Down
2 changes: 1 addition & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1402,7 +1402,7 @@ private[sql] object QueryCompilationErrors extends QueryErrorsBase with Compilat
def cannotRetrieveTableOrViewNotInSameDatabaseError(
qualifiedTableNames: Seq[QualifiedTableName]): Throwable = {
new AnalysisException(
errorClass = "_LEGACY_ERROR_TEMP_1072",
errorClass = "TABLES_OR_VIEWS_NOT_IN_SAME_DATABASE",
messageParameters = Map("qualifiedTableNames" -> qualifiedTableNames.toString()))
}

Expand Down
34 changes: 22 additions & 12 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalogSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,20 +820,30 @@ abstract class SessionCatalogSuite extends AnalysisTest with Eventually {

test("get tables by name when tables belong to different databases") {
withBasicCatalog { catalog =>
intercept[AnalysisException](catalog.getTablesByName(
Seq(
TableIdentifier("tbl1", Some("db1")),
TableIdentifier("tbl2", Some("db2"))
)
))
checkError(
exception = intercept[AnalysisException](catalog.getTablesByName(
Seq(
TableIdentifier("tbl1", Some("db1")),
TableIdentifier("tbl2", Some("db2"))
)
)),
condition = "TABLES_OR_VIEWS_NOT_IN_SAME_DATABASE",
parameters = Map(
"qualifiedTableNames" ->
"List(spark_catalog.db1.tbl1, spark_catalog.db2.tbl2)"))
// Get table without explicitly specifying database
catalog.setCurrentDatabase("db2")
intercept[AnalysisException](catalog.getTablesByName(
Seq(
TableIdentifier("tbl1", Some("db1")),
TableIdentifier("tbl2")
)
))
checkError(
exception = intercept[AnalysisException](catalog.getTablesByName(
Seq(
TableIdentifier("tbl1", Some("db1")),
TableIdentifier("tbl2")
)
)),
condition = "TABLES_OR_VIEWS_NOT_IN_SAME_DATABASE",
parameters = Map(
"qualifiedTableNames" ->
"List(spark_catalog.db1.tbl1, spark_catalog.db2.tbl2)"))
}
}

Expand Down