Skip to content

[SPARK-47572][SQL] Enforce Window partitionSpec is orderable. #45730

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
chenhao-db wants to merge 3 commits into from
Closed

[SPARK-47572][SQL] Enforce Window partitionSpec is orderable. #45730

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e47643a
initial
chenhao-db Mar 26, 2024
86fd4ca
Merge branch 'master' into SPARK-47572
chenhao-db Mar 29, 2024
2231e50
change error class
chenhao-db Mar 29, 2024
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
12 changes: 12 additions & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,18 @@ trait CheckAnalysis extends PredicateHelper with LookupCatalog with QueryErrorsB
}
}

case Window(_, partitionSpec, _, _) =>
// Both `partitionSpec` and `orderSpec` must be orderable. We only need an extra check
// for `partitionSpec` here because `orderSpec` has the type check itself.
partitionSpec.foreach { p =>
if (!RowOrdering.isOrderable(p.dataType)) {
p.dataTypeMismatch(p, TypeCheckResult.DataTypeMismatch(
errorSubClass = "INVALID_ORDERING_TYPE",

@cloud-fan cloud-fan Mar 29, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

why not use the error class EXPRESSION_TYPE_IS_NOT_ORDERABLE?

@chenhao-db chenhao-db Mar 29, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I cannot really tell the difference between these two error classes, so I just randomly picked one. Now I changed it into EXPRESSION_TYPE_IS_NOT_ORDERABLE instead.

Map("functionName" -> toSQLId(p.prettyName), "dataType" -> toSQLType(p.dataType))
))
}
}

case GlobalLimit(limitExpr, _) => checkLimitLikeClause("limit", limitExpr)

case LocalLimit(limitExpr, child) =>
Expand Down
15 changes: 15 additions & 0 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/AnalysisErrorSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1387,4 +1387,19 @@ class AnalysisErrorSuite extends AnalysisTest with DataTypeErrorsBase {
)
}
}

errorClassTest(
"SPARK-47572: Enforce Window partitionSpec is orderable",
testRelation2.select(
WindowExpression(
new Rank(),
WindowSpecDefinition(
CreateMap(Literal("key") :: UnresolvedAttribute("a") :: Nil) :: Nil,
SortOrder(UnresolvedAttribute("b"), Ascending) :: Nil,
UnspecifiedFrame)).as("window")),
errorClass = "DATATYPE_MISMATCH.INVALID_ORDERING_TYPE",
messageParameters = Map(
"functionName" -> "`attributereference`",
"dataType" -> "\"MAP<STRING, STRING>\"",
"sqlExpr" -> "\"_w0\""))
}