Skip to content

Add support for Spark 3.x #8560

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
Jackie-Jiang merged 7 commits into from
Jun 8, 2022
Merged

Add support for Spark 3.x #8560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5a319b1
Upgrade spark version to 3.2.1
Apr 17, 2022
f2641c9
Add spark 2.4 in parallel to spark 3
Apr 17, 2022
3259dcc
Refactor package name to spark3 so that both plugins can co-exist
May 19, 2022
022c512
lint fix
May 19, 2022
e861e42
Add spark3 test. Fails at maven enforce
May 23, 2022
bf57918
Dependencies working for tests as well
May 23, 2022
c8e04a3
Add test for spark2
May 23, 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
12 changes: 10 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,18 @@
</file>
<file>
<source>
${pinot.root}/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark/target/pinot-batch-ingestion-spark-${project.version}-shaded.jar
${pinot.root}/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark-2.4/target/pinot-batch-ingestion-spark-2.4-${project.version}-shaded.jar
</source>
<destName>
plugins-external/pinot-batch-ingestion/pinot-batch-ingestion-spark/pinot-batch-ingestion-spark-${project.version}-shaded.jar
plugins-external/pinot-batch-ingestion/pinot-batch-ingestion-spark-2.4/pinot-batch-ingestion-spark-2.4-${project.version}-shaded.jar
</destName>
</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
</source>
<destName>
plugins-external/pinot-batch-ingestion/pinot-batch-ingestion-spark-3.2/pinot-batch-ingestion-spark-3.2-${project.version}-shaded.jar
</destName>
</file>
<!-- End Include Pinot Batch Ingestion Plugins-->
Expand Down
4 changes: 4 additions & 0 deletions pinot-distribution/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,10 @@
<pattern>org.apache.hadoop</pattern>
<shadedPattern>shaded.org.apache.hadoop</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.commons</pattern>
<shadedPattern>shaded.org.apache.commons</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
Expand Down
248 changes: 248 additions & 0 deletions pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark-2.4/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,248 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.

-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>pinot-batch-ingestion</artifactId>
<groupId>org.apache.pinot</groupId>
<version>0.11.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pinot-batch-ingestion-spark-2.4</artifactId>
<name>Pinot Batch Ingestion for Spark 2.4</name>
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
<phase.prop>package</phase.prop>
<scala.major.version>2.11</scala.major.version>
<spark.version>2.4.0</spark.version>
<scala.minor.version>2.11.11</scala.minor.version>
<spark2.jackson.version>2.6.7</spark2.jackson.version>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.pinot</groupId>
<artifactId>pinot-batch-ingestion-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_${scala.major.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</exclusion>
<exclusion>
<groupId>com.twitter</groupId>
<artifactId>chill_2.11</artifactId>
</exclusion>
<exclusion>
<groupId>com.twitter</groupId>
<artifactId>chill-java</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</exclusion>
<exclusion>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP-java7</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>jakarta.inject</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.minor.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<!-- For testing import of csv files -->
<dependency>
<groupId>org.apache.pinot</groupId>
<artifactId>pinot-csv</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.esotericsoftware.kryo</groupId>
<artifactId>kryo</artifactId>
<version>2.24.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.twitter</groupId>
<artifactId>chill_2.11</artifactId>
<version>0.9.3</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</exclusion>
<exclusion>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${spark2.jackson.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${spark2.jackson.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${spark2.jackson.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
<artifactId>pinot-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
<artifactId>pinot-spi</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>
0 ...park/SparkSegmentGenerationJobRunner.java → ...park/SparkSegmentGenerationJobRunner.java
View file
Open in desktop
File renamed without changes.
0 ...rk/SparkSegmentMetadataPushJobRunner.java → ...rk/SparkSegmentMetadataPushJobRunner.java
View file
Open in desktop
File renamed without changes.
0 ...h/spark/SparkSegmentTarPushJobRunner.java → ...h/spark/SparkSegmentTarPushJobRunner.java
View file
Open in desktop
File renamed without changes.
0 ...h/spark/SparkSegmentUriPushJobRunner.java → ...h/spark/SparkSegmentUriPushJobRunner.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...egmentCreationAndMetadataPushJobSpec.yaml → ...egmentCreationAndMetadataPushJobSpec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ pushJobSpec:
pushAttempts: 2

# pushRetryIntervalMillis: retry wait Ms, default to 1 second.
pushRetryIntervalMillis: 1000
pushRetryIntervalMillis: 1000
2 changes: 1 addition & 1 deletion ...ces/segmentCreationAndTarPushJobSpec.yaml → ...ces/segmentCreationAndTarPushJobSpec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ pinotClusterSpecs:
- controllerURI: 'localhost:9000'
pushJobSpec:
pushAttempts: 2
pushRetryIntervalMillis: 1000
pushRetryIntervalMillis: 1000
2 changes: 1 addition & 1 deletion ...ces/segmentCreationAndUriPushJobSpec.yaml → ...ces/segmentCreationAndUriPushJobSpec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ pinotClusterSpecs:
- controllerURI: 'localhost:9000'
pushJobSpec:
segmentUriPrefix: 'file://'
segmentUriSuffix: ''
segmentUriSuffix: ''
1 change: 1 addition & 0 deletions ...ain/resources/segmentCreationJobSpec.yaml → ...ain/resources/segmentCreationJobSpec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ tableSpec:
tableConfigURI: 'http://localhost:9000/tables/myTable'
pinotClusterSpecs:
- controllerURI: 'localhost:9000'

2 changes: 1 addition & 1 deletion ...main/resources/segmentTarPushJobSpec.yaml → ...main/resources/segmentTarPushJobSpec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ pinotClusterSpecs:
- controllerURI: 'localhost:9000'
pushJobSpec:
pushAttempts: 2
pushRetryIntervalMillis: 1000
pushRetryIntervalMillis: 1000
2 changes: 1 addition & 1 deletion ...main/resources/segmentUriPushJobSpec.yaml → ...main/resources/segmentUriPushJobSpec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ pinotClusterSpecs:
- controllerURI: 'localhost:9000'
pushJobSpec:
segmentUriPrefix: 'file://'
segmentUriSuffix: ''
segmentUriSuffix: ''
Loading