[SPARK-39437][SQL][TEST] Normalize plan id separately in PlanStabilitySuite #36827
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
This was referenced Jun 10, 2022
| @@ -37,7 +37,7 @@ abstract class Exchange extends UnaryExecNode { | |||
| override def output: Seq[Attribute] = child.output | |||
| final override val nodePatterns: Seq[TreePattern] = Seq(EXCHANGE) | |||
|
|
|||
| override def stringArgs: Iterator[Any] = super.stringArgs ++ Iterator(s"[id=#$id]") | |||
| override def stringArgs: Iterator[Any] = super.stringArgs ++ Iterator(s"[plan_id=$id]") | |||
dongjoon-hyun
approved these changes
Jun 10, 2022
HyukjinKwon
approved these changes
Jun 10, 2022
|
Could you fix more test failures? |
|
More golden files need to be re-generated. Working on it now. |
cloud-fan
added a commit
that referenced
this pull request
Jun 10, 2022
…bilitySuite backport #36827 ### What changes were proposed in this pull request? In `PlanStabilitySuite`, we normalize expression IDs by matching `#\d+` in the explain string. However, this regex can match plan id in `Exchange` node as well, which will mess up the normalization if expression IDs and plan IDs overlap. This PR normalizes plan id separately in `PlanStabilitySuite`. ### Why are the changes needed? Make the plan golden file more stable. ### Does this PR introduce _any_ user-facing change? no ### How was this patch tested? N/A Closes #36828 from cloud-fan/test2. Authored-by: Wenchen Fan <wenchen@databricks.com> Signed-off-by: Wenchen Fan <wenchen@databricks.com>
|
Merged to master. Thank you, @cloud-fan and @HyukjinKwon . |
|
Oh, I verified that it's stable locally. |
|
Ah, I found that it is ANSI mode test. Let me make a follow-up. |
dongjoon-hyun
added a commit
that referenced
this pull request
Jun 10, 2022
### What changes were proposed in this pull request? This is a follow-up of #36827 to update `q83.ansi` result. ### Why are the changes needed? ANSI mode unit tests are not covered on GitHub Action on PRs. - https://github.com/apache/spark/commits/master ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? This should be tested manually because `GitHub Action` doesn't test this. ``` $ SPARK_ANSI_SQL_MODE=true build/sbt "sql/testOnly *PlanStabilitySuite" ``` Closes #36836 from dongjoon-hyun/SPARK-39437. Authored-by: Dongjoon Hyun <dongjoon@apache.org> Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
dongjoon-hyun
added a commit
that referenced
this pull request
Jun 10, 2022
### What changes were proposed in this pull request? This is a follow-up of #36827 to update `q83.sf100.ansi` result. ### Why are the changes needed? ANSI mode unit tests are not covered on GitHub Action on PRs. - https://github.com/apache/spark/commits/master ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? This should be tested manually because `GitHub Action` doesn't test this. ``` $ SPARK_ANSI_SQL_MODE=true build/sbt "sql/testOnly *PlanStabilityWithStatsSuite" ``` Closes #36838 from dongjoon-hyun/SPARK-39437-2. Authored-by: Dongjoon Hyun <dongjoon@apache.org> Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
cloud-fan
added a commit
to cloud-fan/spark
that referenced
this pull request
Jun 13, 2022
…ySuite In `PlanStabilitySuite`, we normalize expression IDs by matching `#\d+` in the explain string. However, this regex can match plan id in `Exchange` node as well, which will mess up the normalization if expression IDs and plan IDs overlap. This PR normalizes plan id separately in `PlanStabilitySuite`. Make the plan golden file more stable. no N/A Closes apache#36827 from cloud-fan/test. Authored-by: Wenchen Fan <wenchen@databricks.com> Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
dongjoon-hyun
pushed a commit
that referenced
this pull request
Jun 13, 2022
…bilitySuite ### What changes were proposed in this pull request? In `PlanStabilitySuite`, we normalize expression IDs by matching `#\d+` in the explain string. However, this regex can match plan id in `Exchange` node as well, which will mess up the normalization if expression IDs and plan IDs overlap. This PR normalizes plan id separately in `PlanStabilitySuite`. ### Why are the changes needed? Make the plan golden file more stable. ### Does this PR introduce _any_ user-facing change? no ### How was this patch tested? N/A backport #36827 Closes #36854 from cloud-fan/test2. Authored-by: Wenchen Fan <wenchen@databricks.com> Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
sunchao
pushed a commit
to sunchao/spark
that referenced
this pull request
Jun 2, 2023
…bilitySuite backport apache#36827 ### What changes were proposed in this pull request? In `PlanStabilitySuite`, we normalize expression IDs by matching `#\d+` in the explain string. However, this regex can match plan id in `Exchange` node as well, which will mess up the normalization if expression IDs and plan IDs overlap. This PR normalizes plan id separately in `PlanStabilitySuite`. ### Why are the changes needed? Make the plan golden file more stable. ### Does this PR introduce _any_ user-facing change? no ### How was this patch tested? N/A Closes apache#36828 from cloud-fan/test2. Authored-by: Wenchen Fan <wenchen@databricks.com> Signed-off-by: Wenchen Fan <wenchen@databricks.com>
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?
In
PlanStabilitySuite, we normalize expression IDs by matching#\d+in the explain string. However, this regex can match plan id inExchangenode as well, which will mess up the normalization if expression IDs and plan IDs overlap.This PR normalizes plan id separately in
PlanStabilitySuite.Why are the changes needed?
Make the plan golden file more stable.
Does this PR introduce any user-facing change?
no
How was this patch tested?
N/A