Skip to content

Support both Spark2.4 and Spark3.4 in one module #26729

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

Open
wangkewen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support both Spark2.4 and Spark3.4 in one module #26729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
147 changes: 3 additions & 144 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2828,6 +2828,7 @@
</dependency>
</dependencies>
<configuration>
<skip>true</skip>
<rules>
<requireUpperBoundDeps>
<excludes combine.children="append">
Expand All @@ -2847,6 +2848,7 @@
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
<ignoredClassPatterns combine.children="append">
<ignoredClassPattern>com.github.benmanes.caffeine.*</ignoredClassPattern>
<!-- Duplicate class is being brought in by commons-io & log4j-api -->
Expand Down Expand Up @@ -2966,6 +2968,7 @@
</execution>
</executions>
</plugin>

</plugins>
</build>

Expand Down Expand Up @@ -3207,149 +3210,5 @@
</plugins>
</build>
</profile>
<profile>
<id>spark2</id>

<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>!spark-version</name>
</property>
</activation>

<properties>
<dep.spark.version>2.0.2-6</dep.spark.version>
</properties>

<modules>
<module>presto-spark-classloader-spark2</module>
</modules>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.3.0</version>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.6.2</version>
</dependency>
</dependencies>
<configuration>
<skip>true</skip>
<rules>
<requireUpperBoundDeps>
<excludes combine.children="append">
<!-- TODO: fix this in Airlift resolver -->
<exclude>org.codehaus.plexus:plexus-utils</exclude>
<exclude>com.google.guava:guava</exclude>
<exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
<exclude>com.fasterxml.jackson.core:jackson-core</exclude>
<exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
</excludes>
</requireUpperBoundDeps>
</rules>
</configuration>
</plugin>

<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
<ignoredClassPatterns combine.children="append">
<ignoredClassPattern>com.github.benmanes.caffeine.*</ignoredClassPattern>
<!-- Duplicate class is being brought in by commons-io & log4j-api -->
<ignoredClassPattern>META-INF.versions.9.module-info</ignoredClassPattern>
<!-- Duplicate class is being brought in by several netty dependencies-->
<ignoredClassPattern>META-INF.versions.11.module-info</ignoredClassPattern>
<!-- Ignore duplicate classes related to lucene-core and ranger-apache -->
<ignoredClassPattern>META-INF.versions.9.org.apache.lucene.*</ignoredClassPattern>
</ignoredClassPatterns>

</configuration>
</plugin>

</plugins>
</pluginManagement>
</build>

</profile>
<profile>
<id>spark3</id>

<activation>
<property>
<name>spark-version</name>
<value>3</value>
</property>
</activation>

<properties>
<dep.spark.version>3.4.1-1</dep.spark.version>
</properties>

<modules>
<module>presto-spark-classloader-spark3</module>
</modules>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.3.0</version>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.6.2</version>
</dependency>
</dependencies>
<configuration>
<skip>true</skip>
<rules>
<requireUpperBoundDeps>
<excludes combine.children="append">
<!-- TODO: fix this in Airlift resolver -->
<exclude>org.codehaus.plexus:plexus-utils</exclude>
<exclude>com.google.guava:guava</exclude>
<exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
<exclude>com.fasterxml.jackson.core:jackson-core</exclude>
<exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
</excludes>
</requireUpperBoundDeps>
</rules>
</configuration>
</plugin>

<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
<ignoredClassPatterns combine.children="append">
<ignoredClassPattern>com.github.benmanes.caffeine.*</ignoredClassPattern>
<!-- Duplicate class is being brought in by commons-io & log4j-api -->
<ignoredClassPattern>META-INF.versions.9.module-info</ignoredClassPattern>
<!-- Duplicate class is being brought in by several netty dependencies-->
<ignoredClassPattern>META-INF.versions.11.module-info</ignoredClassPattern>
<!-- Ignore duplicate classes related to lucene-core and ranger-apache -->
<ignoredClassPattern>META-INF.versions.9.org.apache.lucene.*</ignoredClassPattern>
</ignoredClassPatterns>

</configuration>
</plugin>

</plugins>
</pluginManagement>
</build>

</profile>
</profiles>
</project>
17 changes: 4 additions & 13 deletions presto-spark-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,14 +540,6 @@
<name>!spark-version</name>
</property>
</activation>

<dependencies>
<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-spark-classloader-spark2</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>

<profile>
Expand All @@ -560,12 +552,11 @@
</property>
</activation>

<properties>
<spark.binary.version.main>3</spark.binary.version.main>
</properties>

<dependencies>
<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-spark-classloader-spark3</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.facebook.presto.spark</groupId>
Expand Down
152 changes: 140 additions & 12 deletions presto-spark-classloader-interface/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<properties>
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
<air.check.skip-modernizer>true</air.check.skip-modernizer>
<spark.binary.version.main>2</spark.binary.version.main>
</properties>

<dependencies>
Expand All @@ -33,6 +34,31 @@
</dependency>
</dependencies>

<build>
<outputDirectory>target/java-spark${spark.binary.version.main}/classes</outputDirectory>
<testOutputDirectory>target/java-spark${spark.binary.version.main}/test-classes</testOutputDirectory>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>src/main/java-spark${spark.binary.version.main}</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>spark2</id>
Expand All @@ -44,13 +70,62 @@
</property>
</activation>

<dependencies>
<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-spark-classloader-spark2</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<properties>
<dep.spark.version>2.0.2-6</dep.spark.version>
</properties>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.3.0</version>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.6.2</version>
</dependency>
</dependencies>
<configuration>
<skip>true</skip>
<rules>
<requireUpperBoundDeps>
<excludes combine.children="append">
<!-- TODO: fix this in Airlift resolver -->
<exclude>org.codehaus.plexus:plexus-utils</exclude>
<exclude>com.google.guava:guava</exclude>
<exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
<exclude>com.fasterxml.jackson.core:jackson-core</exclude>
<exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
</excludes>
</requireUpperBoundDeps>
</rules>
</configuration>
</plugin>

<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
<ignoredClassPatterns combine.children="append">
<ignoredClassPattern>com.github.benmanes.caffeine.*</ignoredClassPattern>
<!-- Duplicate class is being brought in by commons-io & log4j-api -->
<ignoredClassPattern>META-INF.versions.9.module-info</ignoredClassPattern>
<!-- Duplicate class is being brought in by several netty dependencies-->
<ignoredClassPattern>META-INF.versions.11.module-info</ignoredClassPattern>
<!-- Ignore duplicate classes related to lucene-core and ranger-apache -->
<ignoredClassPattern>META-INF.versions.9.org.apache.lucene.*</ignoredClassPattern>
</ignoredClassPatterns>

</configuration>
</plugin>

</plugins>
</pluginManagement>
</build>

</profile>
<profile>
Expand All @@ -63,19 +138,72 @@
</property>
</activation>

<properties>
<spark.binary.version.main>3</spark.binary.version.main>
<dep.spark.version>3.4.1-1</dep.spark.version>
</properties>

<dependencies>
<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-spark-classloader-spark3</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.3.0</version>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.6.2</version>
</dependency>
</dependencies>
<configuration>
<skip>true</skip>
<rules>
<requireUpperBoundDeps>
<excludes combine.children="append">
<!-- TODO: fix this in Airlift resolver -->
<exclude>org.codehaus.plexus:plexus-utils</exclude>
<exclude>com.google.guava:guava</exclude>
<exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
<exclude>com.fasterxml.jackson.core:jackson-core</exclude>
<exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
</excludes>
</requireUpperBoundDeps>
</rules>
</configuration>
</plugin>

<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
<ignoredClassPatterns combine.children="append">
<ignoredClassPattern>com.github.benmanes.caffeine.*</ignoredClassPattern>
<!-- Duplicate class is being brought in by commons-io & log4j-api -->
<ignoredClassPattern>META-INF.versions.9.module-info</ignoredClassPattern>
<!-- Duplicate class is being brought in by several netty dependencies-->
<ignoredClassPattern>META-INF.versions.11.module-info</ignoredClassPattern>
<!-- Ignore duplicate classes related to lucene-core and ranger-apache -->
<ignoredClassPattern>META-INF.versions.9.org.apache.lucene.*</ignoredClassPattern>
</ignoredClassPatterns>

</configuration>
</plugin>

</plugins>
</pluginManagement>
</build>

</profile>
</profiles>

Expand Down
0 ...sloader_interface/MutablePartitionId.java → ...sloader_interface/MutablePartitionId.java
View file
Open in desktop
File renamed without changes.
0 ...interface/MutablePartitionIdOrdering.java → ...interface/MutablePartitionIdOrdering.java
View file
Open in desktop
File renamed without changes.
0 ...toSparkNativeExecutionShuffleManager.java → ...toSparkNativeExecutionShuffleManager.java
View file
Open in desktop
File renamed without changes.
0 ...assloader_interface/PrestoSparkUtils.java → ...assloader_interface/PrestoSparkUtils.java
View file
Open in desktop
File renamed without changes.
0 ...ark/classloader_interface/ScalaUtils.java → ...ark.classloader_interface/ScalaUtils.java
View file
Open in desktop
File renamed without changes.
0 ...sloader_interface/MutablePartitionId.java → ...sloader_interface/MutablePartitionId.java
View file
Open in desktop
File renamed without changes.
0 ...interface/MutablePartitionIdOrdering.java → ...interface/MutablePartitionIdOrdering.java
View file
Open in desktop
File renamed without changes.
0 ...toSparkNativeExecutionShuffleManager.java → ...toSparkNativeExecutionShuffleManager.java
View file
Open in desktop
File renamed without changes.
0 ...assloader_interface/PrestoSparkUtils.java → ...assloader_interface/PrestoSparkUtils.java
View file
Open in desktop
File renamed without changes.
0 ...ark/classloader_interface/ScalaUtils.java → ...ark.classloader_interface/ScalaUtils.java
View file
Open in desktop
File renamed without changes.
Loading
Loading