Skip to content

Test: fix base branch#26

Draft
giggsoff wants to merge 55 commits into3.5.4-developfrom
feature/3.5.4-tests
Draft

Test: fix base branch#26
giggsoff wants to merge 55 commits into3.5.4-developfrom
feature/3.5.4-tests

Conversation

@giggsoff
Copy link
Copy Markdown
Collaborator

Try to fix tests

@giggsoff giggsoff force-pushed the feature/3.5.4-tests branch 2 times, most recently from 3f5f9d6 to 2b12d7b Compare March 20, 2026 09:21
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
@giggsoff giggsoff force-pushed the feature/3.5.4-tests branch from 2b12d7b to 511104d Compare March 20, 2026 09:25
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
@giggsoff giggsoff force-pushed the feature/3.5.4-tests branch 2 times, most recently from 1f91fb5 to 3583efc Compare March 20, 2026 13:44
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
@giggsoff giggsoff force-pushed the feature/3.5.4-tests branch 6 times, most recently from f55606f to a5dbd7a Compare March 23, 2026 10:28
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
re-submit of an indeterminate stage with partial result will fail

Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
@giggsoff giggsoff force-pushed the feature/3.5.4-tests branch 2 times, most recently from a857f15 to 2806ff3 Compare March 23, 2026 14:25
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
@giggsoff giggsoff force-pushed the feature/3.5.4-tests branch 4 times, most recently from f8c30dd to 24da775 Compare March 24, 2026 09:49
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
@giggsoff giggsoff force-pushed the feature/3.5.4-tests branch from 24da775 to 0311a2b Compare March 24, 2026 16:11
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
@giggsoff giggsoff force-pushed the feature/3.5.4-tests branch from 0311a2b to c530da7 Compare March 25, 2026 06:17
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
giggsoff added 11 commits March 30, 2026 16:20
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
@giggsoff giggsoff force-pushed the feature/3.5.4-tests branch from 45250d7 to 82ae73b Compare March 31, 2026 15:32
giggsoff added 3 commits April 1, 2026 09:13
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
@giggsoff giggsoff force-pushed the feature/3.5.4-tests branch from 82ae73b to 4b4fca9 Compare April 1, 2026 06:43
giggsoff added 2 commits April 1, 2026 10:20
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
@giggsoff giggsoff force-pushed the feature/3.5.4-tests branch from 4b4fca9 to 7d671a0 Compare April 1, 2026 07:20
giggsoff and others added 3 commits April 2, 2026 08:30
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
…Guava class conflicts in spark 4.0

Backport apache#52767 to Spark 4.0 branch
We upgraded Guava from 14.0.1 to 30+ in  spark 4.0 . Guava 33.4.0 used in Spark 4 consists of two main packages:

- `com.google.common`
- `com.google.thirdparty`

Prior to this PR, only the `com.google.common` package was shaded into the spark-network-common jar, while classes under `com.google.thirdparty` remained unshaded in the spark-network-common jar. This partial shading causes classloading conflicts and runtime errors when a downstream project depends on both Spark and its own version of Guava.

Eg:  calls to guava class `com.google.common.net.InternetDomainName` fails with the following error:
```
Caused by: java.lang.NoSuchFieldError: EXACT
        at com.google.common.net.InternetDomainName.findSuffixOfType(InternetDomainName.java:226)
        at com.google.common.net.InternetDomainName.publicSuffixIndex(InternetDomainName.java:185)
        at com.google.common.net.InternetDomainName.hasPublicSuffix(InternetDomainName.java:400)
        at com.eadx.Domain$.printDomainInfo(Domain.scala:16)
        at com.eadx.TestApp$.main(TestApp.scala:16)
```
**Root Cause**:
`com.google.common.net.InternetDomainName` uses classes from `com.google.thirdparty.publicsuffix`.
The classloader resolves `com.google.common.net.InternetDomainName` from the downstream Guava jar, while `com.google.thirdparty.publicsuffix.PublicSuffixPatterns` is loaded from Spark 4.x Guava classes, leading to binary incompatibility.

Example diagnostic:

```
InternetDomainName → guava-32.0.0-jre.jar
(target/.../guava-32.0.0-jre.jar)

PublicSuffixPatterns → spark-network-common_2.13-4.0.0.jar
(target/.../spark-network-common_2.13-4.0.0.jar)
```

### What changes were proposed in this pull request?

This PR ensures package  `com.google.thirdparty` is also shaded and isolated under the sparkproject namespace in Spark, preventing downstream class conflicts and runtime errors.

### Why are the changes needed?

These changes are necessary to prevent runtime errors and class conflicts for downstream projects that depend on both Spark and Guava by restoring proper isolation of shaded Guava classes in spark

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

No

### How was this patch tested?

No new test cases added; used existing UT and IT.

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

No

Closes apache#52869 from vinodkc/br_shade_guava_thirdparty_4.0.

Authored-by: vinodkc <vinod.kc.in@gmail.com>
Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
@giggsoff giggsoff force-pushed the feature/3.5.4-tests branch from c0a9dea to 438f5ef Compare April 2, 2026 05:37
giggsoff added 2 commits April 2, 2026 11:31
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
@giggsoff giggsoff force-pushed the feature/3.5.4-tests branch from 438f5ef to feaeb56 Compare April 2, 2026 08:32
giggsoff added 3 commits April 3, 2026 14:50
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
This reverts commit 6f74f6f.
Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
@giggsoff giggsoff force-pushed the feature/3.5.4-tests branch from d98f482 to 277057e Compare April 3, 2026 13:36
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