[SPARK-52312][SQL] Ignore V2WriteCommand when caching DataFrame #51032
+21
−1
Conversation
This file contains hidden or 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
cloud-fan
reviewed
May 28, 2025
| tableName, | ||
| storageLevel | ||
| ) | ||
| if (query.queryExecution.analyzed.isInstanceOf[IgnoreCachedData]) { |
There was a problem hiding this comment.
shall we do it in cacheQueryInternal which is lower level?
There was a problem hiding this comment.
Yeah that would be better. We have two cacheQuery() variants and they both call cacheQueryInternal().
Moved the check there.
cloud-fan
reviewed
May 28, 2025
| @@ -875,4 +875,53 @@ class DataFrameWriterV2Suite extends QueryTest with SharedSparkSession with Befo | |||
| } | |||
| } | |||
| } | |||
|
|
|||
| test("SPARK-52312: caching dataframe created from INSERT shouldn't re-execute the command") { | |||
There was a problem hiding this comment.
I'm fine with this test only. It's a unit test, and we don't need to iterate all v2 commands to prove the fix. Testing a common v2 command (table INSERT) is good.
There was a problem hiding this comment.
Makes sense. I've removed repeated ones.
cloud-fan
reviewed
May 29, 2025
| @@ -127,6 +127,11 @@ class CacheManager extends Logging with AdaptiveSparkPlanHelper { | |||
| // Do nothing for StorageLevel.NONE since it will not actually cache any data. | |||
| } else if (lookupCachedDataInternal(normalizedPlan).nonEmpty) { | |||
| logWarning("Asked to cache already cached data.") | |||
| } else if (unnormalizedPlan.isInstanceOf[IgnoreCachedData]) { | |||
There was a problem hiding this comment.
shall we move it before the above else if? For IgnoreCachedData, we don't even need to do a lookup.
cloud-fan
approved these changes
May 29, 2025
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?
We found an issue that
V2WriteCommandplans were not properly excluded fromDataFramecaching, which can cause unintended side effects.For example, when
cache()is called on aDataFramecreated from anINSERTSQL statement, theINSERTcommand gets re-executed during the caching process because the underlying plan is not being ignored.This PR fixes this by
V2WriteCommandextend theIgnoreCachedDatatraitIgnoreCachedData, preventing inapplicable plans from being cachedWhy are the changes needed?
This is a bug, since calling
cache()on aDataFrameshouldn't re-execute the command that created it.Does this PR introduce any user-facing change?
No.
How was this patch tested?
New tests were added.
Was this patch authored or co-authored using generative AI tooling?
No.