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

[spark] adjust paimon spark structure #4573

Merged
merged 4 commits into from
Nov 26, 2024
Merged

[spark] adjust paimon spark structure #4573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da506a1
[spark] modify paimon-spark structure
YannByron Nov 22, 2024
244e62b
[update]
YannByron Nov 25, 2024
817728a
[update]
YannByron Nov 25, 2024
14b1371
[update]
YannByron Nov 26, 2024
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 .github/workflows/utitcase-spark-3.x.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
jvm_timezone=$(random_timezone)
echo "JVM timezone is set to $jvm_timezone"
test_modules=""
for suffix in common_2.12 3.5 3.4 3.3 3.2; do
for suffix in ut 3.5 3.4 3.3 3.2; do
test_modules+="org.apache.paimon:paimon-spark-${suffix},"
done
test_modules="${test_modules%,}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/utitcase-spark-4.x.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
jvm_timezone=$(random_timezone)
echo "JVM timezone is set to $jvm_timezone"
test_modules=""
for suffix in common_2.13 4.0; do
for suffix in ut 4.0; do
test_modules+="org.apache.paimon:paimon-spark-${suffix},"
done
test_modules="${test_modules%,}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/utitcase.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
jvm_timezone=$(random_timezone)
echo "JVM timezone is set to $jvm_timezone"
test_modules="!paimon-e2e-tests,"
for suffix in 3.5 3.4 3.3 3.2 common_2.12; do
for suffix in 3.5 3.4 3.3 3.2 ut; do
test_modules+="!org.apache.paimon:paimon-spark-${suffix},"
done
test_modules="${test_modules%,}"
Expand Down
10 changes: 8 additions & 2 deletions paimon-spark/paimon-spark-3.2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ under the License.
</properties>

<dependencies>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-spark3-common</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
Expand Down Expand Up @@ -63,7 +69,7 @@ under the License.

<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
<artifactId>paimon-spark-ut</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down Expand Up @@ -126,7 +132,7 @@ under the License.
</filters>
<artifactSet>
<includes combine.children="append">
<include>org.apache.paimon:paimon-spark-common_${scala.binary.version}</include>
<include>org.apache.paimon:paimon-spark3-common</include>
</includes>
</artifactSet>
</configuration>
Expand Down
10 changes: 8 additions & 2 deletions paimon-spark/paimon-spark-3.3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ under the License.
</properties>

<dependencies>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-spark3-common</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
Expand Down Expand Up @@ -63,7 +69,7 @@ under the License.

<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
<artifactId>paimon-spark-ut</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down Expand Up @@ -126,7 +132,7 @@ under the License.
</filters>
<artifactSet>
<includes combine.children="append">
<include>org.apache.paimon:paimon-spark-common_${scala.binary.version}</include>
<include>org.apache.paimon:paimon-spark3-common</include>
</includes>
</artifactSet>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions ...ark/paimon-spark-3.3/src/test/scala/org/apache/paimon/spark/sql/InsertOverwriteTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ class InsertOverwriteTest extends PaimonSparkTestBase {
spark.sql("SELECT * FROM T ORDER BY a, b"),
Row(1, 3, "3") :: Row(2, 4, "4") :: Nil)

withSQLConf("spark.sql.sources.partitionOverwriteMode" -> "dynamic") {
withSparkSQLConf("spark.sql.sources.partitionOverwriteMode" -> "dynamic") {
// dynamic overwrite the a=1 partition
spark.sql("INSERT OVERWRITE T VALUES (1, 5, '5'), (1, 7, '7')")
checkAnswer(
Expand Down Expand Up @@ -289,7 +289,7 @@ class InsertOverwriteTest extends PaimonSparkTestBase {
"ptv2",
22) :: Nil)

withSQLConf("spark.sql.sources.partitionOverwriteMode" -> "dynamic") {
withSparkSQLConf("spark.sql.sources.partitionOverwriteMode" -> "dynamic") {
// dynamic overwrite the pt2=22 partition
spark.sql(
"INSERT OVERWRITE T PARTITION (pt2 = 22) VALUES (3, 'c2', 'ptv1'), (4, 'd2', 'ptv3')")
Expand Down
10 changes: 8 additions & 2 deletions paimon-spark/paimon-spark-3.4/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ under the License.
</properties>

<dependencies>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-spark3-common</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
Expand Down Expand Up @@ -63,7 +69,7 @@ under the License.

<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
<artifactId>paimon-spark-ut</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down Expand Up @@ -126,7 +132,7 @@ under the License.
</filters>
<artifactSet>
<includes combine.children="append">
<include>org.apache.paimon:paimon-spark-common_${scala.binary.version}</include>
<include>org.apache.paimon:paimon-spark3-common</include>
</includes>
</artifactSet>
</configuration>
Expand Down
10 changes: 8 additions & 2 deletions paimon-spark/paimon-spark-3.5/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ under the License.
</properties>

<dependencies>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-spark3-common</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
Expand Down Expand Up @@ -63,7 +69,7 @@ under the License.

<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
<artifactId>paimon-spark-ut</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down Expand Up @@ -126,7 +132,7 @@ under the License.
</filters>
<artifactSet>
<includes combine.children="append">
<include>org.apache.paimon:paimon-spark-common_${scala.binary.version}</include>
<include>org.apache.paimon:paimon-spark3-common</include>
</includes>
</artifactSet>
</configuration>
Expand Down
10 changes: 8 additions & 2 deletions paimon-spark/paimon-spark-4.0/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ under the License.
</properties>

<dependencies>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-spark4-common</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
Expand Down Expand Up @@ -63,7 +69,7 @@ under the License.

<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
<artifactId>paimon-spark-ut</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down Expand Up @@ -126,7 +132,7 @@ under the License.
</filters>
<artifactSet>
<includes combine.children="append">
<include>org.apache.paimon:paimon-spark-common_${scala.binary.version}</include>
<include>org.apache.paimon:paimon-spark4-common</include>
</includes>
</artifactSet>
</configuration>
Expand Down
68 changes: 0 additions & 68 deletions paimon-spark/paimon-spark-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,6 @@ under the License.
</properties>

<dependencies>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>${paimon-sparkx-common}</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_${scala.binary.version}</artifactId>
Expand All @@ -72,46 +60,6 @@ under the License.
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-bundle</artifactId>
</dependency>

<!-- test -->

<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-catalyst_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-hive_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-avro_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand All @@ -130,7 +78,6 @@ under the License.
<artifactSet>
<includes combine.children="append">
<include>org.apache.paimon:paimon-bundle</include>
<include>org.apache.paimon:${paimon-sparkx-common}</include>
</includes>
</artifactSet>
</configuration>
Expand All @@ -155,21 +102,6 @@ under the License.
<sourceDirectory>src/main/antlr4</sourceDirectory>
</configuration>
</plugin>

<!-- Used for submodules to utilize the test code -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>prepare-test-jar</id>
<phase>test-compile</phase>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Loading
Loading