Skip to content
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.

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

test: Follow up on Spark 3.4 diff #209

Merged
merged 1 commit into from
Mar 18, 2024
Merged

Conversation

sunchao
Copy link
Member

@sunchao sunchao commented Mar 15, 2024

Which issue does this PR close?

Closes #.

Rationale for this change

Certain changes to address comments from #166 were somehow excluded in the final commit. This adds them back.

What changes are included in this PR?

How are these changes tested?

@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 33.54%. Comparing base (4b66a78) to head (a23554c).
Report is 2 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main     #209      +/-   ##
============================================
- Coverage     33.54%   33.54%   -0.01%     
- Complexity      769      770       +1     
============================================
  Files           107      107              
  Lines         35470    35517      +47     
  Branches       7723     7751      +28     
============================================
+ Hits          11899    11913      +14     
- Misses        21079    21100      +21     
- Partials       2492     2504      +12     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sunchao
Copy link
Member Author

sunchao commented Mar 15, 2024

cc @viirya

new file mode 100644
index 00000000000..4b31bea33de
--- /dev/null
+++ b/sql/core/src/test/scala/org/apache/spark/sql/IgnoreComet.scala
Copy link
Member

Choose a reason for hiding this comment

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

This is main change? DisableCometSuite -> IgnoreCometSuite?

+ op.asInstanceOf[CometExec].originalPlan.find(_.isInstanceOf[SortExec]).isDefined)
+ }.isDefined == sortLeft,
+
+ joinOperator.left.exists(op => op.isInstanceOf[ShuffleExchangeExec] ||
Copy link
Member Author

Choose a reason for hiding this comment

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

here's another change

Copy link
Member

Choose a reason for hiding this comment

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

For op.isInstanceOf[ShuffleExchangeExec], don't we need to check if it equals to shuffleLeft?

Copy link
Member Author

Choose a reason for hiding this comment

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

hmm? it is checked in the code:

exists(op => op.isInstanceOf[ShuffleExchangeExec] || op.isInstanceOf[CometShuffleExchangeExec]) == shuffleLeft

Copy link
Member

Choose a reason for hiding this comment

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

Oh, yea, I read it wrongly.

Comment on lines -985 to -988
+ op.isInstanceOf[SortExec] ||
+ (op.isInstanceOf[CometExec] &&
+ op.asInstanceOf[CometExec].originalPlan.find(_.isInstanceOf[SortExec]).isDefined)
+ }.isDefined == sortLeft,
Copy link
Member

Choose a reason for hiding this comment

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

I forgot why we changed to check sort instead of shuffle here.

Copy link
Contributor

@advancedxy advancedxy left a comment

Choose a reason for hiding this comment

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

LGTM.

Hmm, I remembered that I checked these parts.

@sunchao sunchao merged commit 5f58010 into apache:main Mar 18, 2024
27 checks passed
@sunchao
Copy link
Member Author

sunchao commented Mar 18, 2024

Thanks, merged

@sunchao sunchao deleted the fix-3.4-diff branch March 18, 2024 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants