Skip to content

[SPARK-40910][SQL] Replace UnsupportedOperationException with SparkUnsupportedOperationException #38387

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

Closed
panbingkun wants to merge 7 commits into from
Closed

[SPARK-40910][SQL] Replace UnsupportedOperationException with SparkUnsupportedOperationException #38387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
568783b
[SPARK-40910][SQL] Replace UnsupportedOperationException with SparkUn…
panbingkun Oct 25, 2022
57dbbbb
Merge branch 'master' into replace_UnsupportedOperationException
panbingkun Oct 26, 2022
5b4a3a0
[SPARK-40910][SQL] Replace UnsupportedOperationException with SparkUn…
panbingkun Oct 26, 2022
a53338e
[SPARK-40910][SQL] Replace UnsupportedOperationException with SparkUn…
panbingkun Oct 26, 2022
7ec8fd8
[SPARK-40910][SQL] Replace UnsupportedOperationException with SparkUn…
panbingkun Oct 26, 2022
cff7050
[SPARK-40910][SQL] Replace UnsupportedOperationException with SparkUn…
panbingkun Oct 26, 2022
bda7402
[SPARK-40910][SQL] Replace UnsupportedOperationException with SparkUn…
panbingkun Oct 27, 2022
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
5 changes: 5 additions & 0 deletions core/src/main/resources/error/error-classes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,6 +949,11 @@
"Literal for '<value>' of <type>."
]
},
"MULTIPLE_BUCKET_TRANSFORMS" : {
"message" : [
"Multiple bucket TRANSFORMs."
]
},
"NATURAL_CROSS_JOIN" : {
"message" : [
"NATURAL CROSS JOIN."
Expand Down
4 changes: 3 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/connector/catalog/CatalogV2Implicits.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ private[sql] object CatalogV2Implicits {
identityCols += col

case BucketTransform(numBuckets, col, sortCol) =>
if (bucketSpec.nonEmpty) throw QueryExecutionErrors.multipleBucketTransformsError
if (bucketSpec.nonEmpty) {
throw QueryExecutionErrors.unsupportedMultipleBucketTransformsError
}
if (sortCol.isEmpty) {
bucketSpec = Some(BucketSpec(numBuckets, col.map(_.fieldNames.mkString(".")), Nil))
} else {
Expand Down
4 changes: 2 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryExecutionErrors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2623,9 +2623,9 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
"format" -> format))
}

def multipleBucketTransformsError(): SparkUnsupportedOperationException = {
def unsupportedMultipleBucketTransformsError(): SparkUnsupportedOperationException = {
new SparkUnsupportedOperationException(
errorClass = "_LEGACY_ERROR_TEMP_2279",
errorClass = "UNSUPPORTED_FEATURE.MULTIPLE_BUCKET_TRANSFORMS",
messageParameters = Map.empty)
}

Expand Down
27 changes: 13 additions & 14 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/command/PlanResolutionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import org.mockito.ArgumentMatchers.any
import org.mockito.Mockito.{mock, when}
import org.mockito.invocation.InvocationOnMock

import org.apache.spark.SparkUnsupportedOperationException
import org.apache.spark.sql.{AnalysisException, SaveMode}
import org.apache.spark.sql.catalyst.{AliasIdentifier, TableIdentifier}
import org.apache.spark.sql.catalyst.analysis.{AnalysisContext, AnalysisTest, Analyzer, EmptyFunctionRegistry, NoSuchTableException, ResolvedFieldName, ResolvedIdentifier, ResolvedTable, ResolveSessionCatalog, UnresolvedAttribute, UnresolvedInlineTable, UnresolvedRelation, UnresolvedSubqueryColumnAliases, UnresolvedTable}
Expand Down Expand Up @@ -292,13 +293,12 @@ class PlanResolutionSuite extends AnalysisTest {
|CREATE TABLE my_tab(a INT, b STRING) USING parquet
|PARTITIONED BY ($transform)
""".stripMargin

val ae = intercept[UnsupportedOperationException] {
parseAndResolve(query)
}

assert(ae.getMessage
.contains(s"Unsupported partition transform: $transform"))
checkError(
exception = intercept[SparkUnsupportedOperationException] {
parseAndResolve(query)
},
errorClass = "_LEGACY_ERROR_TEMP_2067",
parameters = Map("transform" -> transform))
Copy link
Contributor Author

@panbingkun panbingkun Oct 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

Copy link
Contributor Author

@panbingkun panbingkun Oct 25, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fact, it throws SparkUnsupportedOperationException.

}
}

Expand All @@ -310,13 +310,12 @@ class PlanResolutionSuite extends AnalysisTest {
|CREATE TABLE my_tab(a INT, b STRING, c String) USING parquet
|PARTITIONED BY ($transform)
""".stripMargin

val ae = intercept[UnsupportedOperationException] {
parseAndResolve(query)
}

assert(ae.getMessage
.contains("Multiple bucket transforms are not supported."))
checkError(
exception = intercept[SparkUnsupportedOperationException] {
parseAndResolve(query)
},
errorClass = "UNSUPPORTED_FEATURE.MULTIPLE_BUCKET_TRANSFORMS",
parameters = Map.empty)
}
}

Expand Down