Skip to content

Commit 5f8d25a

Browse files
[SPARK] Throw exceptions when check constraint expression is unresolved in DeltaInvariantCheckerExec (delta-io#4892)
<!-- Thanks for sending a pull request! Here are some tips for you: 1. If this is your first time, please read our contributor guidelines: https://github.com/delta-io/delta/blob/master/CONTRIBUTING.md 2. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP] Your PR title ...'. 3. Be sure to keep the PR description updated to reflect all changes. 4. Please write your PR title to summarize what this PR proposes. 5. If possible, provide a concise example to reproduce the issue for a faster review. 6. If applicable, include the corresponding issue number in the PR title and link it in the body. --> #### Which Delta project/connector is this regarding? <!-- Please add the component selected below to the beginning of the pull request title For example: [Spark] Title of my pull request --> - [x] Spark - [ ] Standalone - [ ] Flink - [ ] Kernel - [ ] Other (fill in here) ## Description In DeltaInvariantCheckerExec, if the check constraint expressions are unresolvable, we used to create an assertion log and not throw an exception. So in some cases an internal error is thrown in the subsequent steps. The PR proposes to throw a proper user-facing error (AnalysisException) in DeltaInvariantCheckerExec to expose the problem to the user for better clarity, and avoid the issues in the downstream. It invokes checkAnalysis to throw a user-facing exception when the check constraint expression is unresolved. <!-- - Describe what this PR changes. - Describe why we need the change. If this PR resolves an issue be sure to include "Resolves #XXX" to correctly link and close the issue upon merge. --> ## How was this patch tested? New UT. <!-- If tests were added, say they were added here. Please make sure to test the changes thoroughly including negative and positive cases if possible. If the changes were tested in any way other than unit tests, please clarify how you tested step by step (ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future). If the changes were not tested, please explain why. --> ## Does this PR introduce _any_ user-facing changes? <!-- If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible. If possible, please also clarify if this is a user-facing change compared to the released Delta Lake versions or within the unreleased branches such as master. If no, write 'No'. --> Yes. Previous behavior: If the check constraint expressions are unresolvable, we used to create an assertion log and not throw an exception. So in some cases an internal error is thrown in the subsequent steps. Proposed change: We throw a proper user-facing error (AnalysisException) when the check constraint expressions are unresolvable in DeltaInvariantCheckerExec to expose the problem to the user for better clarity, and avoid the issues in the downstream.
1 parent 7f34040 commit 5f8d25a

File tree

2 files changed

+36
-12
lines changed

2 files changed

+36
-12
lines changed

spark/src/main/scala/org/apache/spark/sql/delta/constraints/DeltaInvariantCheckerExec.scala

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -199,19 +199,24 @@ object DeltaInvariantCheckerExec extends DeltaLogging {
199199
// Cap the maximum length when logging an unresolved expression to avoid issues. This is a
200200
// CHECK constraint expression and should be relatively simple.
201201
val MAX_OUTPUT_LENGTH = 10 * 1024
202-
deltaAssert(
203-
resolvedExpr.resolved,
204-
name = "invariant.unresolvedExpression",
205-
msg = s"CHECK constraint child expression was not properly resolved",
206-
data = Map(
207-
"name" -> name,
208-
"checkExpr" -> expr.treeString.take(MAX_OUTPUT_LENGTH),
209-
"attributesExtracted" -> attributesExtracted.treeString.take(MAX_OUTPUT_LENGTH),
210-
"analyzedLogicalPlan" -> analyzedLogicalPlan.treeString.take(MAX_OUTPUT_LENGTH),
211-
"optimizedLogicalPlan" -> optimizedLogicalPlan.treeString.take(MAX_OUTPUT_LENGTH),
212-
"resolvedExpr" -> resolvedExpr.treeString.take(MAX_OUTPUT_LENGTH)
202+
if (!resolvedExpr.resolved) {
203+
// If the plan is not resolved, check the plan so that a user-facing exception is
204+
// thrown.
205+
spark.sessionState.analyzer.checkAnalysis(wrappedPlan)
206+
deltaAssert(
207+
check = false,
208+
name = "invariant.unresolvedExpression",
209+
msg = s"CHECK constraint child expression was not properly resolved",
210+
data = Map(
211+
"name" -> name,
212+
"checkExpr" -> expr.treeString.take(MAX_OUTPUT_LENGTH),
213+
"attributesExtracted" -> attributesExtracted.treeString.take(MAX_OUTPUT_LENGTH),
214+
"analyzedLogicalPlan" -> analyzedLogicalPlan.treeString.take(MAX_OUTPUT_LENGTH),
215+
"optimizedLogicalPlan" -> optimizedLogicalPlan.treeString.take(MAX_OUTPUT_LENGTH),
216+
"resolvedExpr" -> resolvedExpr.treeString.take(MAX_OUTPUT_LENGTH)
217+
)
213218
)
214-
)
219+
}
215220
resolvedExpr
216221
}
217222

spark/src/test/scala/org/apache/spark/sql/delta/schema/CheckConstraintsSuite.scala

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,25 @@ class CheckConstraintsSuite extends QueryTest
7474
}
7575
}
7676

77+
test("Checking incorrect constraints added through table property in CREATE TABLE errors out") {
78+
val tableName = "test_tbl"
79+
withTable(tableName) {
80+
sql(
81+
s"""
82+
|CREATE TABLE $tableName (
83+
|id INT,
84+
|event_date DATE
85+
|) USING DELTA
86+
|TBLPROPERTIES('delta.constraints.ch' = 'event_date < 2025-06-12');""".stripMargin)
87+
88+
val e = intercept[AnalysisException] {
89+
sql(s"INSERT INTO $tableName VALUES(1, '2025-06-11')")
90+
}
91+
errorContains(e.getMessage,
92+
"Cannot resolve \"(event_date < ((2025 - 6) - 12))\" due to data type mismatch")
93+
}
94+
}
95+
7796
test("constraint must be boolean") {
7897
withTestTable { table =>
7998
checkError(

0 commit comments

Comments
 (0)