Skip to content

Upgrade spark from 3.2 to 3.5 #11702

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

Merged
xiangfu0 merged 2 commits into from
Oct 13, 2023
Merged

Upgrade spark from 3.2 to 3.5 #11702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83e0940
Upgrade spark from 3.2 to 3.5
gortiz Sep 28, 2023
78278da
Rename pinot-batch-ingestion-spark-3.2 as pinot-batch-ingestion-spark-3
gortiz Oct 4, 2023
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 pinot-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<artifactId>log4j-slf4j2-impl</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Expand Down
2 changes: 1 addition & 1 deletion pinot-connectors/pinot-spark-3-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../..</pinot.root>
<spark.version>3.4.0</spark.version>
<spark.version>3.5.0</spark.version>
<antlr-runtime.version>4.8</antlr-runtime.version>
<scalatest.version>3.1.1</scalatest.version>
<shadeBase>org.apache.pinot.\$internal</shadeBase>
Expand Down
4 changes: 2 additions & 2 deletions pinot-distribution/pinot-assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@
</file>
<file>
<source>
${pinot.root}/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark-3.2/target/pinot-batch-ingestion-spark-3.2-${project.version}-shaded.jar
${pinot.root}/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark-3/target/pinot-batch-ingestion-spark-3-${project.version}-shaded.jar
</source>
<destName>
plugins-external/pinot-batch-ingestion/pinot-batch-ingestion-spark-3.2/pinot-batch-ingestion-spark-3.2-${project.version}-shaded.jar
plugins-external/pinot-batch-ingestion/pinot-batch-ingestion-spark-3/pinot-batch-ingestion-spark-3-${project.version}-shaded.jar
</destName>
</file>
<!-- End Include Pinot Batch Ingestion Plugins-->
Expand Down
6 changes: 3 additions & 3 deletions ...n/pinot-batch-ingestion-spark-3.2/pom.xml → ...ion/pinot-batch-ingestion-spark-3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
<relativePath>..</relativePath>
</parent>

<artifactId>pinot-batch-ingestion-spark-3.2</artifactId>
<name>Pinot Batch Ingestion for Spark 3.2</name>
<artifactId>pinot-batch-ingestion-spark-3</artifactId>
<name>Pinot Batch Ingestion for Spark 3</name>
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
<phase.prop>package</phase.prop>
<scala.major.version>2.12</scala.major.version>
<spark.version>3.2.1</spark.version>
<spark.version>3.5.0</spark.version>
<scala.minor.version>2.12.15</scala.minor.version>
<commons-lang3.version>3.11</commons-lang3.version>
</properties>
Expand Down
0 ...ark3/SparkSegmentGenerationJobRunner.java → ...ark3/SparkSegmentGenerationJobRunner.java
View file
Open in desktop
File renamed without changes.
0 ...k3/SparkSegmentMetadataPushJobRunner.java → ...k3/SparkSegmentMetadataPushJobRunner.java
View file
Open in desktop
File renamed without changes.
0 .../spark3/SparkSegmentTarPushJobRunner.java → .../spark3/SparkSegmentTarPushJobRunner.java
View file
Open in desktop
File renamed without changes.
0 .../spark3/SparkSegmentUriPushJobRunner.java → .../spark3/SparkSegmentUriPushJobRunner.java
View file
Open in desktop
File renamed without changes.
0 ...egmentCreationAndMetadataPushJobSpec.yaml → ...egmentCreationAndMetadataPushJobSpec.yaml
View file
Open in desktop
File renamed without changes.
0 ...ces/segmentCreationAndTarPushJobSpec.yaml → ...ces/segmentCreationAndTarPushJobSpec.yaml
View file
Open in desktop
File renamed without changes.
0 ...ces/segmentCreationAndUriPushJobSpec.yaml → ...ces/segmentCreationAndUriPushJobSpec.yaml
View file
Open in desktop
File renamed without changes.
0 ...ain/resources/segmentCreationJobSpec.yaml → ...ain/resources/segmentCreationJobSpec.yaml
View file
Open in desktop
File renamed without changes.
0 ...main/resources/segmentTarPushJobSpec.yaml → ...main/resources/segmentTarPushJobSpec.yaml
View file
Open in desktop
File renamed without changes.
0 ...main/resources/segmentUriPushJobSpec.yaml → ...main/resources/segmentUriPushJobSpec.yaml
View file
Open in desktop
File renamed without changes.
0 .../SparkSegmentGenerationJobRunnerTest.java → .../SparkSegmentGenerationJobRunnerTest.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pinot-plugins/pinot-batch-ingestion/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<modules>
<module>pinot-batch-ingestion-common</module>
<module>pinot-batch-ingestion-spark-2.4</module>
<module>pinot-batch-ingestion-spark-3.2</module>
<module>pinot-batch-ingestion-spark-3</module>

<module>pinot-batch-ingestion-hadoop</module>
<module>pinot-batch-ingestion-standalone</module>
Expand Down
2 changes: 1 addition & 1 deletion pinot-spi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<artifactId>log4j-slf4j2-impl</artifactId>
</dependency>
<dependency>
<groupId>com.lmax</groupId>
Expand Down
15 changes: 13 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
<snappy-java.version>1.1.10.4</snappy-java.version>
<zstd-jni.version>1.5.2-3</zstd-jni.version>
<lz4-java.version>1.8.0</lz4-java.version>
<log4j.version>2.17.1</log4j.version>
<log4j.version>2.20.0</log4j.version>
<netty.version>4.1.94.Final</netty.version>
<reactivestreams.version>1.0.3</reactivestreams.version>
<jts.version>1.19.0</jts.version>
Expand Down Expand Up @@ -605,7 +605,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<version>2.0.9</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Expand All @@ -618,9 +618,20 @@
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<!--
We don't use slf4j but slf4j2, so we can just ignore this dependency.
Instead of just remove this dependency, we set the scope as provided.
We cannot just remove the dependency because that would create conflicts in the enforcer
-->
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Expand Down