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

[#635] feat(client): enable LOCAL_ORDER by default for Spark AQE #644

Merged
merged 2 commits into from
Feb 23, 2023

Conversation

zuston
Copy link
Member

@zuston zuston commented Feb 22, 2023

What changes were proposed in this pull request?

enable LOCAL_ORDER by default for Spark AQE

Why are the changes needed?

Currently, the local_order data distribution type should be activated explicitly. It's better to enable it when using AQE by default.
Fix: #635

Does this PR introduce any user-facing change?

Yes

How was this patch tested?

  1. Existing UTs

@zuston
Copy link
Member Author

zuston commented Feb 22, 2023

PTAL @jerqi

@codecov-commenter
Copy link

codecov-commenter commented Feb 22, 2023

Codecov Report

Merging #644 (ede29e5) into master (8b347a2) will increase coverage by 2.29%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##             master     #644      +/-   ##
============================================
+ Coverage     60.61%   62.91%   +2.29%     
- Complexity     1798     1800       +2     
============================================
  Files           216      202      -14     
  Lines         12462    10491    -1971     
  Branches       1052     1052              
============================================
- Hits           7554     6600     -954     
+ Misses         4500     3545     -955     
+ Partials        408      346      -62     
Impacted Files Coverage Δ
...rg/apache/uniffle/common/config/RssClientConf.java 93.75% <100.00%> (ø)
deploy/kubernetes/operator/pkg/webhook/manager.go
...eploy/kubernetes/operator/pkg/utils/coordinator.go
...oy/kubernetes/operator/pkg/utils/shufflerserver.go
deploy/kubernetes/operator/pkg/utils/util.go
deploy/kubernetes/operator/pkg/utils/config.go
...rnetes/operator/pkg/webhook/inspector/inspector.go
deploy/kubernetes/operator/pkg/utils/rss.go
...y/kubernetes/operator/pkg/webhook/inspector/pod.go
...bernetes/operator/pkg/controller/controller/rss.go
... and 6 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@VisibleForTesting
protected static ShuffleDataDistributionType getDataDistributionType(SparkConf sparkConf) {
RssConf rssConf = RssSparkConfig.toRssConf(sparkConf);
if ((boolean) sparkConf.get(SQLConf.ADAPTIVE_EXECUTION_ENABLED())
Copy link
Member Author

Choose a reason for hiding this comment

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

sparkConf.get(SQLConf.ADAPTIVE_EXECUTION_ENABLED() should be used to be consistent with spark, because different spark versions have different default value

Copy link
Member Author

Choose a reason for hiding this comment

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

cc @jerqi

Copy link
Contributor

Choose a reason for hiding this comment

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

is (boolean) necessary?

@zuston zuston requested a review from jerqi February 22, 2023 12:05
Copy link
Contributor

@jerqi jerqi left a comment

Choose a reason for hiding this comment

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

LGTM

@jerqi jerqi merged commit a8d20f2 into apache:master Feb 23, 2023
@jerqi
Copy link
Contributor

jerqi commented Feb 23, 2023

thanks @zuston , merged to master.

xianjingfeng pushed a commit to xianjingfeng/incubator-uniffle that referenced this pull request Apr 5, 2023
apache#644)

### What changes were proposed in this pull request?
enable LOCAL_ORDER by default for Spark AQE 

### Why are the changes needed?
Currently, the local_order data distribution type should be activated explicitly. It's better to enable it when using AQE by default.
Fix: apache#635

### Does this PR introduce _any_ user-facing change?
Yes

### How was this patch tested?
1. Existing UTs
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.

[Improvement] Enable LOCAL_ORDER for Spark AQE by default
4 participants