Skip to content

Conversation

@LuciferYang
Copy link
Contributor

@LuciferYang LuciferYang commented Jan 30, 2023

What changes were proposed in this pull request?

This pr aims to fix the finding connect jar condition in SparkConnectServerUtils#findSparkConnectJar to ensure the correct connect jar is found for maven test

Why are the changes needed?

After run

build/mvn -DskipTests clean install -pl connector/connect/server

or

build/mvn -DskipTests clean package -pl connector/connect/server

There will be 5 jars that meet the original conditions for maven:

spark-connect_2.12-3.5.0-SNAPSHOT-javadoc.jar
spark-connect_2.12-3.5.0-SNAPSHOT-sources.jar
spark-connect_2.12-3.5.0-SNAPSHOT-test-sources.jar
spark-connect_2.12-3.5.0-SNAPSHOT-tests.jar
spark-connect_2.12-3.5.0-SNAPSHOT.jar

and the head may not spark-connect_2.12-3.5.0-SNAPSHOT.jar, so need to make the condition more strictly to ensure that spark-connect_2.12-3.5.0-SNAPSHOT.jar is found

Does this PR introduce any user-facing change?

No

How was this patch tested?

Pass Github Actions

@LuciferYang LuciferYang changed the title [SPARK-42241][CONNECT][TESTS] Correct the condition of SparkConnectServerUtils#findSparkConnectJar to find the correct connect server jar for maven [SPARK-42241][CONNECT][TESTS] Correct the condition of finding connect jar in SparkConnectServerUtils#findSparkConnectJar for maven Jan 30, 2023
@LuciferYang
Copy link
Contributor Author

LuciferYang commented Jan 30, 2023

https://github.com/LuciferYang/spark/actions/runs/4046025224/jobs/6958308503
image

cc @HyukjinKwon when I do some maven test work using GA, I found the original condition may found wrong connect jar for maven

Using jar: /home/runner/work/spark/spark/connector/connect/server/target/spark-connect_2.12-3.5.0-SNAPSHOT-javadoc.jar

@LuciferYang LuciferYang changed the title [SPARK-42241][CONNECT][TESTS] Correct the condition of finding connect jar in SparkConnectServerUtils#findSparkConnectJar for maven [SPARK-42241][CONNECT][TESTS] Fix the condition of finding connect jar in SparkConnectServerUtils#findSparkConnectJar for maven Jan 30, 2023
@LuciferYang LuciferYang changed the title [SPARK-42241][CONNECT][TESTS] Fix the condition of finding connect jar in SparkConnectServerUtils#findSparkConnectJar for maven [SPARK-42241][CONNECT][TESTS] Fix the find connect jar condition in SparkConnectServerUtils#findSparkConnectJar for maven Jan 30, 2023
@HyukjinKwon
Copy link
Member

HyukjinKwon commented Jan 31, 2023

Merged to master and branch-3.4.

@LuciferYang would you mind telling me the order that you want for merging your PRs?

HyukjinKwon pushed a commit that referenced this pull request Jan 31, 2023
…SparkConnectServerUtils#findSparkConnectJar` for maven

### What changes were proposed in this pull request?
This pr aims to fix the finding connect jar condition in `SparkConnectServerUtils#findSparkConnectJar` to ensure the correct connect jar is found for maven test

### Why are the changes needed?
After run

```
build/mvn -DskipTests clean install -pl connector/connect/server
```
or
```
build/mvn -DskipTests clean package -pl connector/connect/server
```

There will be 5 jars that meet the original conditions for maven:

```
spark-connect_2.12-3.5.0-SNAPSHOT-javadoc.jar
spark-connect_2.12-3.5.0-SNAPSHOT-sources.jar
spark-connect_2.12-3.5.0-SNAPSHOT-test-sources.jar
spark-connect_2.12-3.5.0-SNAPSHOT-tests.jar
spark-connect_2.12-3.5.0-SNAPSHOT.jar
```

and the head may not `spark-connect_2.12-3.5.0-SNAPSHOT.jar`, so need to make the condition more strictly to ensure that `spark-connect_2.12-3.5.0-SNAPSHOT.jar` is found

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

### How was this patch tested?
Pass Github Actions

Closes #39810 from LuciferYang/SPARK-42241.

Authored-by: yangjie01 <yangjie01@baidu.com>
Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
(cherry picked from commit a98ac25)
Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
@LuciferYang
Copy link
Contributor Author

Thanks @HyukjinKwon

I hope #39789 can be merged first, which seems to be blocking version release

snmvaughan pushed a commit to snmvaughan/spark that referenced this pull request Jun 20, 2023
…SparkConnectServerUtils#findSparkConnectJar` for maven

### What changes were proposed in this pull request?
This pr aims to fix the finding connect jar condition in `SparkConnectServerUtils#findSparkConnectJar` to ensure the correct connect jar is found for maven test

### Why are the changes needed?
After run

```
build/mvn -DskipTests clean install -pl connector/connect/server
```
or
```
build/mvn -DskipTests clean package -pl connector/connect/server
```

There will be 5 jars that meet the original conditions for maven:

```
spark-connect_2.12-3.5.0-SNAPSHOT-javadoc.jar
spark-connect_2.12-3.5.0-SNAPSHOT-sources.jar
spark-connect_2.12-3.5.0-SNAPSHOT-test-sources.jar
spark-connect_2.12-3.5.0-SNAPSHOT-tests.jar
spark-connect_2.12-3.5.0-SNAPSHOT.jar
```

and the head may not `spark-connect_2.12-3.5.0-SNAPSHOT.jar`, so need to make the condition more strictly to ensure that `spark-connect_2.12-3.5.0-SNAPSHOT.jar` is found

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

### How was this patch tested?
Pass Github Actions

Closes apache#39810 from LuciferYang/SPARK-42241.

Authored-by: yangjie01 <yangjie01@baidu.com>
Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
(cherry picked from commit a98ac25)
Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
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