[SPARK-50600][CONNECT][SQL] Set analyzed on analysis failure #49383
+86
−10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jdesjean
changed the title
jdesjean
force-pushed
the
jdesjean/SPARK-50600
branch
2 times, most recently
from
815a10c to
d69efe0
Compare
jdesjean
force-pushed
the
jdesjean/SPARK-50600
branch
from
5ef6c5c to
5863371
Compare
jdesjean
changed the title
jdesjean
force-pushed
the
jdesjean/SPARK-50600
branch
4 times, most recently
from
29333e8 to
771da36
Compare
jdesjean
force-pushed
the
jdesjean/SPARK-50600
branch
from
771da36 to
11d42f2
Compare
cloud-fan
reviewed
Jan 9, 2025
| @@ -147,6 +157,17 @@ class QueryPlanningTracker( | |||
| ret | |||
| } | |||
|
|
|||
| /** | |||
| * Set when the query has been parsed. | |||
There was a problem hiding this comment.
Suggested change
| * Set when the query has been parsed. | |
| * Set when the query has been parsed but failed to be analyzed. |
cloud-fan
reviewed
Jan 9, 2025
| @@ -145,13 +145,19 @@ case class ExecuteEventsManager(executeHolder: ExecuteHolder, clock: Clock) { | |||
| * | |||
| * @param analyzedPlan | |||
| * The analyzed plan generated by the Connect request plan. None when the request does not | |||
| * generate a Spark plan or analysis fails. | |||
| * @param parsedPlan | |||
| * The analyzed plan generated by the Connect request plan. None when the request does not | |||
cloud-fan
reviewed
Jan 9, 2025
| @@ -251,6 +257,10 @@ case class ExecuteEventsManager(executeHolder: ExecuteHolder, clock: Clock) { | |||
| postAnalyzed(Some(analyzedPlan)) | |||
| } | |||
|
|
|||
| override def analysisFailed(tracker: QueryPlanningTracker, parsedPlan: LogicalPlan): Unit = { | |||
| postAnalyzed(None, Some(parsedPlan)) | |||
There was a problem hiding this comment.
Suggested change
| postAnalyzed(None, Some(parsedPlan)) | |
| postAnalyzed(parsedPlan = Some(parsedPlan)) |
cloud-fan
reviewed
Jan 9, 2025
| @@ -342,9 +352,15 @@ case class SparkListenerConnectOperationAnalyzed( | |||
| extends SparkListenerEvent { | |||
|
|
|||
| /** | |||
| * Analyzed Spark plan generated by the Connect request. None when the Connect request does not | |||
| * Parsed Spark plan generated by the Connect request. None when the Connect request does not | |||
| * generate a Spark plan. | |||
There was a problem hiding this comment.
ditto, it's None when request is analyzed successfully?
cloud-fan
reviewed
Jan 9, 2025
| val plan = executePhase(QueryPlanningTracker.ANALYSIS) { | ||
| // We can't clone `logical` here, which will reset the `_analyzed` flag. | ||
| sparkSession.sessionState.analyzer.executeAndCheck(logical, tracker) | ||
| val plan = Try { |
There was a problem hiding this comment.
can we use the primitive try?
try {
val plan = ...
...
} catch {
case NonFatal(_) => tracker. setAnalysisFailed...
}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
As part of SPARK-44145, a callback was added to track completion of analysis and optimization phase of a query. While the analyzed plan is sent when analysis completes successfully it does not when it fail. In that case, we should fallback to the ParsedPlan.
Why are the changes needed?
The purpose of the analyze event is to track when analysis completes, as such it should also be sent on both success & failure.
Does this PR introduce any user-facing change?
No
How was this patch tested?
Unit
Was this patch authored or co-authored using generative AI tooling?
No