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.

Sign up for GitHub

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

Jump to bottom

Include dependency of common jar in tools jar #5270

Merged
merged 11 commits into from
Apr 20, 2022
Merged

Include dependency of common jar in tools jar #5270

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d6a8ad9
Revert "Fix tools depending on the common jar (#5239)"
nartal1 Apr 13, 2022
2b0034a
generate reduced pom
nartal1 Apr 14, 2022
44591cf
include only required classes
nartal1 Apr 15, 2022
ad28306
include ThreadyFactoryBuilder.class
nartal1 Apr 18, 2022
60d7ee3
addressed review comments
nartal1 Apr 18, 2022
8fb92f2
Merge branch 'branch-22.06' of github.com:NVIDIA/spark-rapids into to…
nartal1 Apr 19, 2022
ec1a54a
add minimizeJar to include classes
nartal1 Apr 19, 2022
fa313f1
update spark-nightly-build.sh to to deploy dependency reduced pom
nartal1 Apr 20, 2022
f8c570d
update nightly script
nartal1 Apr 20, 2022
12d8a5d
Merge branch 'branch-22.06' of github.com:NVIDIA/spark-rapids into to…
nartal1 Apr 20, 2022
990897c
addressed review comments
nartal1 Apr 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jenkins/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ TOOL_FPATH="deployjars/$TOOL_ART_ID-$TOOL_ART_VER"
TOOL_DOC_JARS="-Dsources=${TOOL_FPATH}-sources.jar -Djavadoc=${TOOL_FPATH}-javadoc.jar"
$DEPLOY_CMD -Durl=$SERVER_URL -DrepositoryId=$SERVER_ID \
$TOOL_DOC_JARS \
-Dfile=$TOOL_FPATH.jar -DpomFile=${TOOL_PL}/pom.xml
-Dfile=$TOOL_FPATH.jar -DpomFile=${TOOL_PL}/dependency-reduced-pom.xml
tgravescs marked this conversation as resolved.
Show resolved Hide resolved

###### Deploy Spark 2.x explain meta jar ######
SPARK2_PL=${SPARK2_PL:-"spark2-sql-plugin"}
Expand Down
9 changes: 8 additions & 1 deletion tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@
</properties>

<dependencies>
<dependency>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-common_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
Expand Down Expand Up @@ -97,9 +102,11 @@
<goal>shade</goal>
</goals>
<configuration>
<minimizeJar>true</minimizeJar>
<artifactSet>
<includes>
<include>org.rogach:scallop_${scala.binary.version}</include>
<include>com.nvidia:rapids-4-spark-common_${scala.binary.version}</include>
</includes>
</artifactSet>
<filters>
Expand All @@ -118,7 +125,7 @@
<mainClass>com.nvidia.spark.rapids.tool.profiling.ProfileMain</mainClass>
</transformer>
</transformers>
<createDependencyReducedPom>false</createDependencyReducedPom>
<createDependencyReducedPom>true</createDependencyReducedPom>
</configuration>
</execution>
</executions>
Expand Down
52 changes: 0 additions & 52 deletions tools/src/main/scala/com/nvidia/spark/rapids/tool/ThreadFactoryBuilder.scala
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tools/src/main/scala/com/nvidia/spark/rapids/tool/profiling/Profiler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import scala.collection.JavaConverters._
import scala.collection.mutable.{ArrayBuffer, HashMap}
import scala.util.control.NonFatal

import com.nvidia.spark.rapids.ThreadFactoryBuilder
import com.nvidia.spark.rapids.tool.{EventLogInfo, EventLogPathProcessor}
import com.nvidia.spark.rapids.tool.ThreadFactoryBuilder
import org.apache.hadoop.conf.Configuration

import org.apache.spark.internal.Logging
Expand Down
2 changes: 1 addition & 1 deletion tools/src/main/scala/com/nvidia/spark/rapids/tool/qualification/Qualification.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import java.util.concurrent.{ConcurrentLinkedQueue, Executors, ThreadPoolExecuto

import scala.collection.JavaConverters._

import com.nvidia.spark.rapids.ThreadFactoryBuilder
import com.nvidia.spark.rapids.tool.EventLogInfo
import com.nvidia.spark.rapids.tool.ThreadFactoryBuilder
import org.apache.hadoop.conf.Configuration

import org.apache.spark.internal.Logging
Expand Down
2 changes: 1 addition & 1 deletion tools/src/main/scala/org/apache/spark/sql/rapids/tool/AppFilterImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import java.util.regex.PatternSyntaxException

import scala.collection.JavaConverters._

import com.nvidia.spark.rapids.ThreadFactoryBuilder
import com.nvidia.spark.rapids.tool.EventLogInfo
import com.nvidia.spark.rapids.tool.ThreadFactoryBuilder
import com.nvidia.spark.rapids.tool.qualification.QualificationArgs
import org.apache.hadoop.conf.Configuration

Expand Down