[SPARK-51653][CONNECT][TESTS] Migrate the tests related to RemoteSparkSession from the connect-client-jvm module to connect-client-integration-tests
#50463
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…starting `SparkConnectServer` when the directory `assembly/target/scala-2.13/jars/` not exist" This reverts commit 38a1958.
This comment was marked as outdated.
This comment was marked as outdated.
LuciferYang
commented
Mar 31, 2025
LuciferYang
commented
Mar 31, 2025
.../integration-tests/src/test/scala/org/apache/spark/sql/connect/UDFClassLoadingE2ESuite.scala
Outdated
Show resolved
Hide resolved
LuciferYang
commented
Mar 31, 2025
|
cc @HyukjinKwon I'm trying to do this refactoring. Do you have any better suggestions? |
LuciferYang
commented
Mar 31, 2025
LuciferYang
commented
Mar 31, 2025
project/SparkBuild.scala
Outdated
| ShadeRule.rename("io.netty.**" -> "org.sparkproject.connect.client.io.netty.@1").inAll, | ||
| ShadeRule.rename("org.checkerframework.**" -> "org.sparkproject.connect.client.org.checkerframework.@1").inAll, | ||
| ShadeRule.rename("javax.annotation.**" -> "org.sparkproject.connect.client.javax.annotation.@1").inAll, | ||
| // ShadeRule.rename("javax.annotation.**" -> "org.sparkproject.connect.client.javax.annotation.@1").inAll, |
There was a problem hiding this comment.
for fix:
[warn] javac exited with exit code 1
[error] (connect-client-integration-tests / Test / compileIncremental) javac returned non-zero exit code
will take another look at it later
There was a problem hiding this comment.
seems we can only delete this ShadeRule.rename
LuciferYang
commented
Mar 31, 2025
LuciferYang
changed the title
LuciferYang
changed the title
LuciferYang
changed the title
RemoteSparkSession from the connect-client-jvm module to connect-client-integration-tests
LuciferYang
commented
Apr 1, 2025
| @@ -198,7 +198,7 @@ jobs: | |||
| if [[ "$INCLUDED_TAGS" != "" ]]; then | |||
| ./build/mvn $MAVEN_CLI_OPTS -pl "$TEST_MODULES" -Pyarn -Pkubernetes -Pvolcano -Phive -Phive-thriftserver -Phadoop-cloud -Pjvm-profiler -Pspark-ganglia-lgpl -Pkinesis-asl -Djava.version=${JAVA_VERSION/-ea} -Dtest.include.tags="$INCLUDED_TAGS" test -fae | |||
| elif [[ "$MODULES_TO_TEST" == "connect" ]]; then | |||
| ./build/mvn $MAVEN_CLI_OPTS -Dtest.exclude.tags="$EXCLUDED_TAGS" -Djava.version=${JAVA_VERSION/-ea} -pl sql/connect/client/jvm,sql/connect/common,sql/connect/server test -fae | |||
| ./build/mvn $MAVEN_CLI_OPTS -Dtest.exclude.tags="$EXCLUDED_TAGS" -Djava.version=${JAVA_VERSION/-ea} -pl sql/connect/client/jvm,sql/connect/client/integration-tests,sql/connect/common,sql/connect/server package test -fae | |||
There was a problem hiding this comment.
Here, it is necessary to use package test. If only test is specified, then client-integration-tests will use the client-jvm's classes directory instead of a jar file as the build classpath, which will result in a failure of testCompile.
|
cc @HyukjinKwon This pr is basically completed, and we can discuss its feasibility. There might still be some duplicate code that can be cleaned up, but I think we can leave that for a follow-up if this plan is feasible. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
This pr moves the test cases related to
RemoteSparkSessionfrom theconnect-client-jvmmodule to a new module namedconnect-client-integration-tests. The new module depends on both theconnect-client-jvmandassemblymodules, aiming to resolve the circular dependency issue betweenconnect-client-jvmandassembly:RemoteSparkSessionin theconnect-client-jvmmodule rely on the output from thetarget/scala-2.13/jarsdirectory of theassemblymodule during testing.assemblymodule depends on the compilation output of theconnect-client-jvmmodule during packaging.The main changes of this pr are as follows:
connect-client-integration-tests, which depends on both theconnect-client-jvmandassemblymodules. Move the test cases and related utility code forRemoteSparkSessionfrom theconnect-client-jvmmodule to the new module.assemblymodule should already be built whenconnect-client-integration-testsis being tested.assembly/pom.xmlto executeinstallanddeployto allow theconnect-client-integration-testsmodule to depend on theassemblymodule.ShadeRule.renamerule forcom.google.protobufinSparkBuild.scalato align with Maven, ensuring thatUDFClassLoadingE2ESuitepasses tests in both Maven and SBT.ShadeRule.renamerule forjavax.annotationto prevent compilation failures.dev/test-jars.txt,dev/sparktestsupport/modules.py,dev/lint-scala, and.github/workflows/maven_test.ymlrelated to the new module and tests.Why are the changes needed?
Resolve the issue of logical circular dependency between
connect-client-jvmandassembly.Does this PR introduce any user-facing change?
No
How was this patch tested?
and
All passed
Was this patch authored or co-authored using generative AI tooling?
No