Skip to content

Conversation

@yikf
Copy link
Contributor

@yikf yikf commented Jan 19, 2024

What changes were proposed in this pull request?

This PR amins to correct relocation connect guava dependency and remove duplicate connect-common from SBT build jars.

Item 1: In #43436, We fixed the connect module dependency on guava, but the dependency on guava was relocation incorrectly.

  • connect server and connect client jvm don't relocation guava dependency, this runs the risk of causing conflict problems;
  • connect common relocation does not take effect because it defines conflicting relocation rules with the parent pom(Now, we remove guava dependency from connect-common as it never use this library);

Item2: Remove duplicate connect-common from SBT build jars as it is shaded in the spark connect. Also, in fact, before this PR, in the output jars built using SBT, connect-common and common-server were the same thing, because they both hit the jar.getName.contains("spark-connect") condition.

Why are the changes needed?

Bugfix

Does this PR introduce any user-facing change?

No

How was this patch tested?

GA

Was this patch authored or co-authored using generative AI tooling?

No.

@yikf
Copy link
Contributor Author

yikf commented Jan 19, 2024

@LuciferYang Please take a look

@yikf yikf force-pushed the SPARK-45593-SBT branch 3 times, most recently from 0d88e01 to a455129 Compare January 24, 2024 04:01
@LuciferYang LuciferYang changed the title [SPARK-45593][FOLLOWUP] Correct relocation connect guava dependency. [SPARK-45593][BUILD][FOLLOWUP] Correct relocation connect guava dependency. Jan 24, 2024
@LuciferYang LuciferYang changed the title [SPARK-45593][BUILD][FOLLOWUP] Correct relocation connect guava dependency. [SPARK-45593][BUILD][FOLLOWUP] Correct relocation connect guava dependency Jan 24, 2024
@LuciferYang
Copy link
Contributor

Merged into master for Spark 4.0. Thanks @yikf

@yikf yikf deleted the SPARK-45593-SBT branch January 24, 2024 11:03
LuciferYang pushed a commit that referenced this pull request Apr 1, 2024
### What changes were proposed in this pull request?

This PR amins to correct relocation connect guava dependency and remove duplicate connect-common from SBT build jars.

This PR cherry-pick from #43436 and #44801 as a backport to 3.5 branch.

### Why are the changes needed?

Bugfix

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

No

### How was this patch tested?

Follow the steps described at #43195 (comment) to test manually.

In addition, will continue to observe the GA situation in recent days.

### Was this patch authored or co-authored using generative AI tooling?

No

Closes #45775 from Yikf/branch-3.5.

Authored-by: yikaifei <yikaifei@apache.org>
Signed-off-by: yangjie01 <yangjie01@baidu.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants