This is an automated email from the ASF dual-hosted git repository.
feiwang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/auron.git
The following commit(s) were added to refs/heads/master by this push:
new 327b9dd9 [AURON #1473] Rename module spark-extension-shims-spark3 to
spark-extension-shims-spark. (#1474)
327b9dd9 is described below
commit 327b9dd96762f2b13a8a76c821f1121bdfc5e76f
Author: slfan1989 <[email protected]>
AuthorDate: Thu Oct 23 14:10:05 2025 +0800
[AURON #1473] Rename module spark-extension-shims-spark3 to
spark-extension-shims-spark. (#1474)
#### Which issue does this PR close?
Closes #1473.
We plan to introduce support for `Spark 4`. Currently, the module name
`spark-extension-shims-spark3` is tightly coupled with `Spark 3-specific`
versions. To make the module naming more general and version-agnostic, we
should rename it to `spark-extension-shims-spark`.
This change will make it easier to extend support for multiple Spark
versions (e.g., Spark 3.x, Spark 4.x) without duplicating shim module
definitions.
#### Rationale for this change
The local compilation passes.
```
[INFO]
------------------------------------------------------------------------
[INFO] Reactor Summary for Apache Auron Parent Pom 7.0.0-SNAPSHOT:
[INFO]
[INFO] Apache Auron Parent Pom ............................ SUCCESS [
2.009 s]
[INFO] Apache Auron Proto ................................. SUCCESS [
13.495 s]
[INFO] Apache Auron Hadoop Shim 2.12 ...................... SUCCESS [
4.903 s]
[INFO] Apache Auron Core .................................. SUCCESS [
7.310 s]
[INFO] Apache Auron Common 2.12 ........................... SUCCESS [
7.611 s]
[INFO] Apache Auron Spark Version Annotation Macros 2.12 .. SUCCESS [
6.020 s]
[INFO] Apache Auron Spark UI 2.12 ......................... SUCCESS [
4.335 s]
[INFO] Apache Auron Spark Extension 2.12 .................. SUCCESS [
24.360 s]
[INFO] Apache Auron Spark Extension Shims Spark 3.5.7_2.12 SUCCESS [
18.153 s]
[INFO] Apache Auron Assembly .............................. SUCCESS [
9.452 s]
[INFO]
------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO]
------------------------------------------------------------------------
[INFO] Total time: 01:38 min
[INFO] Finished at: 2025-10-20T11:30:21+08:00
[INFO]
------------------------------------------------------------------------
```
#### What changes are included in this PR?
Rename **spark-extension-shims-spark3** to **spark-extension-shims-spark**.
#### Are there any user-facing changes?
No.
#### How was this patch tested?
CI
---
dev/docker-build/docker-compose.yml | 2 +-
pom.xml | 12 ++++++------
.../pom.xml | 4 ++--
.../spark/sql/auron/ForceApplyShuffledHashJoinInjector.java | 0
.../sql/auron/ForceApplyShuffledHashJoinInterceptor.java | 0
.../spark/sql/auron/ValidateSparkPlanApplyInterceptor.java | 0
.../apache/spark/sql/auron/ValidateSparkPlanInjector.java | 0
.../spark/sql/auron/InterceptedValidateSparkPlan.scala | 0
.../main/scala/org/apache/spark/sql/auron/ShimsImpl.scala | 0
.../spark/sql/execution/auron/plan/ConvertToNativeExec.scala | 0
.../spark/sql/execution/auron/plan/NativeAggExec.scala | 0
.../execution/auron/plan/NativeBroadcastExchangeExec.scala | 0
.../spark/sql/execution/auron/plan/NativeExpandExec.scala | 0
.../spark/sql/execution/auron/plan/NativeFilterExec.scala | 0
.../spark/sql/execution/auron/plan/NativeGenerateExec.scala | 0
.../sql/execution/auron/plan/NativeGlobalLimitExec.scala | 0
.../sql/execution/auron/plan/NativeLocalLimitExec.scala | 0
.../spark/sql/execution/auron/plan/NativeOrcScanExec.scala | 0
.../auron/plan/NativeParquetInsertIntoHiveTableExec.scala | 0
.../sql/execution/auron/plan/NativeParquetScanExec.scala | 0
.../sql/execution/auron/plan/NativeParquetSinkExec.scala | 0
.../execution/auron/plan/NativePartialTakeOrderedExec.scala | 0
.../sql/execution/auron/plan/NativeProjectExecProvider.scala | 0
.../auron/plan/NativeRenameColumnsExecProvider.scala | 0
.../sql/execution/auron/plan/NativeShuffleExchangeExec.scala | 0
.../spark/sql/execution/auron/plan/NativeSortExec.scala | 0
.../sql/execution/auron/plan/NativeTakeOrderedExec.scala | 0
.../spark/sql/execution/auron/plan/NativeUnionExec.scala | 0
.../spark/sql/execution/auron/plan/NativeWindowExec.scala | 0
.../auron/shuffle/AuronBlockStoreShuffleReader.scala | 0
.../execution/auron/shuffle/AuronRssShuffleManagerBase.scala | 0
.../sql/execution/auron/shuffle/AuronShuffleManager.scala | 0
.../sql/execution/auron/shuffle/AuronShuffleWriter.scala | 0
.../execution/joins/auron/plan/NativeBroadcastJoinExec.scala | 0
.../auron/plan/NativeShuffledHashJoinExecProvider.scala | 0
.../joins/auron/plan/NativeSortMergeJoinExecProvider.scala | 0
.../apache/spark/sql/auron/AuronAdaptiveQueryExecSuite.scala | 0
.../sql/auron/AuronCheckConvertBroadcastExchangeSuite.scala | 0
.../sql/auron/AuronCheckConvertShuffleExchangeSuite.scala | 0
.../apache/spark/sql/auron/AuronEmptyNativeRddSuite.scala | 0
.../org/apache/spark/sql/auron/AuronFunctionSuite.scala | 0
.../scala/org/apache/spark/sql/auron/AuronQuerySuite.scala | 0
.../org/apache/spark/sql/auron/AuronSQLTestHelper.scala | 0
.../scala/org/apache/spark/sql/auron/BaseAuronSQLSuite.scala | 0
.../org/apache/spark/sql/auron/BuildInfoAuronSQLSuite.scala | 0
.../org/apache/spark/sql/auron/BuildinfoInSparkUISuite.scala | 0
.../org/apache/spark/sql/auron/EmptyNativeRddSuite.scala | 0
.../org/apache/spark/sql/auron/NativeConvertersSuite.scala | 0
thirdparty/auron-celeborn-0.5/pom.xml | 2 +-
thirdparty/auron-celeborn-0.6/pom.xml | 2 +-
thirdparty/auron-uniffle/pom.xml | 2 +-
51 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dev/docker-build/docker-compose.yml
b/dev/docker-build/docker-compose.yml
index 27bbc922..2db0005c 100644
--- a/dev/docker-build/docker-compose.yml
+++ b/dev/docker-build/docker-compose.yml
@@ -28,7 +28,7 @@ services:
- ./../../:/auron:rw
- ./../../target-docker:/auron/target:rw
-
./../../target-docker/spark-extension-target:/auron/spark-extension/target:rw
- -
./../../target-docker/spark-extension-shims-spark3-target:/auron/spark-extension-shims-spark3/target:rw
+ -
./../../target-docker/spark-extension-shims-spark-target:/auron/spark-extension-shims-spark/target:rw
-
./../../target-docker/build-helper-proto-target:/auron/dev/mvn-build-helper/proto/target:rw
-
./../../target-docker/build-helper-assembly-target:/auron/dev/mvn-build-helper/assembly/target:rw
environment:
diff --git a/pom.xml b/pom.xml
index a717d710..56045c3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -565,7 +565,7 @@
<id>spark-3.0</id>
<properties>
<shimName>spark-3.0</shimName>
- <shimPkg>spark-extension-shims-spark3</shimPkg>
+ <shimPkg>spark-extension-shims-spark</shimPkg>
<scalaTestVersion>3.0.8</scalaTestVersion>
<sparkVersion>3.0.3</sparkVersion>
</properties>
@@ -575,7 +575,7 @@
<id>spark-3.1</id>
<properties>
<shimName>spark-3.1</shimName>
- <shimPkg>spark-extension-shims-spark3</shimPkg>
+ <shimPkg>spark-extension-shims-spark</shimPkg>
<scalaTestVersion>3.2.9</scalaTestVersion>
<sparkVersion>3.1.3</sparkVersion>
</properties>
@@ -585,7 +585,7 @@
<id>spark-3.2</id>
<properties>
<shimName>spark-3.2</shimName>
- <shimPkg>spark-extension-shims-spark3</shimPkg>
+ <shimPkg>spark-extension-shims-spark</shimPkg>
<scalaTestVersion>3.2.9</scalaTestVersion>
<sparkVersion>3.2.4</sparkVersion>
</properties>
@@ -595,7 +595,7 @@
<id>spark-3.3</id>
<properties>
<shimName>spark-3.3</shimName>
- <shimPkg>spark-extension-shims-spark3</shimPkg>
+ <shimPkg>spark-extension-shims-spark</shimPkg>
<scalaTestVersion>3.2.9</scalaTestVersion>
<sparkVersion>3.3.4</sparkVersion>
</properties>
@@ -605,7 +605,7 @@
<id>spark-3.4</id>
<properties>
<shimName>spark-3.4</shimName>
- <shimPkg>spark-extension-shims-spark3</shimPkg>
+ <shimPkg>spark-extension-shims-spark</shimPkg>
<scalaTestVersion>3.2.9</scalaTestVersion>
<sparkVersion>3.4.4</sparkVersion>
</properties>
@@ -615,7 +615,7 @@
<id>spark-3.5</id>
<properties>
<shimName>spark-3.5</shimName>
- <shimPkg>spark-extension-shims-spark3</shimPkg>
+ <shimPkg>spark-extension-shims-spark</shimPkg>
<scalaTestVersion>3.2.9</scalaTestVersion>
<sparkVersion>3.5.7</sparkVersion>
</properties>
diff --git a/spark-extension-shims-spark3/pom.xml
b/spark-extension-shims-spark/pom.xml
similarity index 96%
rename from spark-extension-shims-spark3/pom.xml
rename to spark-extension-shims-spark/pom.xml
index 267b6616..20652d1b 100644
--- a/spark-extension-shims-spark3/pom.xml
+++ b/spark-extension-shims-spark/pom.xml
@@ -25,9 +25,9 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>spark-extension-shims-spark3_${scalaVersion}</artifactId>
+ <artifactId>spark-extension-shims-spark_${scalaVersion}</artifactId>
<packaging>jar</packaging>
- <name>Apache Auron Spark Extension Shims Spark3_${scalaVersion}</name>
+ <name>Apache Auron Spark Extension Shims Spark
${sparkVersion}_${scalaVersion}</name>
<description>Apache Auron Spark Extension Shims Project</description>
<dependencies>
diff --git
a/spark-extension-shims-spark3/src/main/java/org/apache/spark/sql/auron/ForceApplyShuffledHashJoinInjector.java
b/spark-extension-shims-spark/src/main/java/org/apache/spark/sql/auron/ForceApplyShuffledHashJoinInjector.java
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/java/org/apache/spark/sql/auron/ForceApplyShuffledHashJoinInjector.java
rename to
spark-extension-shims-spark/src/main/java/org/apache/spark/sql/auron/ForceApplyShuffledHashJoinInjector.java
diff --git
a/spark-extension-shims-spark3/src/main/java/org/apache/spark/sql/auron/ForceApplyShuffledHashJoinInterceptor.java
b/spark-extension-shims-spark/src/main/java/org/apache/spark/sql/auron/ForceApplyShuffledHashJoinInterceptor.java
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/java/org/apache/spark/sql/auron/ForceApplyShuffledHashJoinInterceptor.java
rename to
spark-extension-shims-spark/src/main/java/org/apache/spark/sql/auron/ForceApplyShuffledHashJoinInterceptor.java
diff --git
a/spark-extension-shims-spark3/src/main/java/org/apache/spark/sql/auron/ValidateSparkPlanApplyInterceptor.java
b/spark-extension-shims-spark/src/main/java/org/apache/spark/sql/auron/ValidateSparkPlanApplyInterceptor.java
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/java/org/apache/spark/sql/auron/ValidateSparkPlanApplyInterceptor.java
rename to
spark-extension-shims-spark/src/main/java/org/apache/spark/sql/auron/ValidateSparkPlanApplyInterceptor.java
diff --git
a/spark-extension-shims-spark3/src/main/java/org/apache/spark/sql/auron/ValidateSparkPlanInjector.java
b/spark-extension-shims-spark/src/main/java/org/apache/spark/sql/auron/ValidateSparkPlanInjector.java
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/java/org/apache/spark/sql/auron/ValidateSparkPlanInjector.java
rename to
spark-extension-shims-spark/src/main/java/org/apache/spark/sql/auron/ValidateSparkPlanInjector.java
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/auron/InterceptedValidateSparkPlan.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/auron/InterceptedValidateSparkPlan.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/auron/InterceptedValidateSparkPlan.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/auron/InterceptedValidateSparkPlan.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/auron/ShimsImpl.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/auron/ShimsImpl.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/auron/ShimsImpl.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/auron/ShimsImpl.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/ConvertToNativeExec.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/ConvertToNativeExec.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/ConvertToNativeExec.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/ConvertToNativeExec.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeAggExec.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeAggExec.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeAggExec.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeAggExec.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeBroadcastExchangeExec.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeBroadcastExchangeExec.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeBroadcastExchangeExec.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeBroadcastExchangeExec.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeExpandExec.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeExpandExec.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeExpandExec.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeExpandExec.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeFilterExec.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeFilterExec.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeFilterExec.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeFilterExec.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeGenerateExec.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeGenerateExec.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeGenerateExec.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeGenerateExec.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeGlobalLimitExec.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeGlobalLimitExec.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeGlobalLimitExec.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeGlobalLimitExec.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeLocalLimitExec.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeLocalLimitExec.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeLocalLimitExec.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeLocalLimitExec.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeOrcScanExec.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeOrcScanExec.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeOrcScanExec.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeOrcScanExec.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetInsertIntoHiveTableExec.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetInsertIntoHiveTableExec.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetInsertIntoHiveTableExec.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetInsertIntoHiveTableExec.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetScanExec.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetScanExec.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetScanExec.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetScanExec.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetSinkExec.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetSinkExec.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetSinkExec.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetSinkExec.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativePartialTakeOrderedExec.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativePartialTakeOrderedExec.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativePartialTakeOrderedExec.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativePartialTakeOrderedExec.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeProjectExecProvider.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeProjectExecProvider.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeProjectExecProvider.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeProjectExecProvider.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeRenameColumnsExecProvider.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeRenameColumnsExecProvider.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeRenameColumnsExecProvider.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeRenameColumnsExecProvider.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeShuffleExchangeExec.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeShuffleExchangeExec.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeShuffleExchangeExec.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeShuffleExchangeExec.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeSortExec.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeSortExec.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeSortExec.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeSortExec.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeTakeOrderedExec.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeTakeOrderedExec.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeTakeOrderedExec.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeTakeOrderedExec.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeUnionExec.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeUnionExec.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeUnionExec.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeUnionExec.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeWindowExec.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeWindowExec.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeWindowExec.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeWindowExec.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/AuronBlockStoreShuffleReader.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/AuronBlockStoreShuffleReader.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/AuronBlockStoreShuffleReader.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/AuronBlockStoreShuffleReader.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/AuronRssShuffleManagerBase.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/AuronRssShuffleManagerBase.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/AuronRssShuffleManagerBase.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/AuronRssShuffleManagerBase.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/AuronShuffleManager.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/AuronShuffleManager.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/AuronShuffleManager.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/AuronShuffleManager.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/AuronShuffleWriter.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/AuronShuffleWriter.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/AuronShuffleWriter.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/AuronShuffleWriter.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/joins/auron/plan/NativeBroadcastJoinExec.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/joins/auron/plan/NativeBroadcastJoinExec.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/joins/auron/plan/NativeBroadcastJoinExec.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/joins/auron/plan/NativeBroadcastJoinExec.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/joins/auron/plan/NativeShuffledHashJoinExecProvider.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/joins/auron/plan/NativeShuffledHashJoinExecProvider.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/joins/auron/plan/NativeShuffledHashJoinExecProvider.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/joins/auron/plan/NativeShuffledHashJoinExecProvider.scala
diff --git
a/spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/joins/auron/plan/NativeSortMergeJoinExecProvider.scala
b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/joins/auron/plan/NativeSortMergeJoinExecProvider.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/main/scala/org/apache/spark/sql/execution/joins/auron/plan/NativeSortMergeJoinExecProvider.scala
rename to
spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/execution/joins/auron/plan/NativeSortMergeJoinExecProvider.scala
diff --git
a/spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/AuronAdaptiveQueryExecSuite.scala
b/spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/AuronAdaptiveQueryExecSuite.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/AuronAdaptiveQueryExecSuite.scala
rename to
spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/AuronAdaptiveQueryExecSuite.scala
diff --git
a/spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/AuronCheckConvertBroadcastExchangeSuite.scala
b/spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/AuronCheckConvertBroadcastExchangeSuite.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/AuronCheckConvertBroadcastExchangeSuite.scala
rename to
spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/AuronCheckConvertBroadcastExchangeSuite.scala
diff --git
a/spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/AuronCheckConvertShuffleExchangeSuite.scala
b/spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/AuronCheckConvertShuffleExchangeSuite.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/AuronCheckConvertShuffleExchangeSuite.scala
rename to
spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/AuronCheckConvertShuffleExchangeSuite.scala
diff --git
a/spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/AuronEmptyNativeRddSuite.scala
b/spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/AuronEmptyNativeRddSuite.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/AuronEmptyNativeRddSuite.scala
rename to
spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/AuronEmptyNativeRddSuite.scala
diff --git
a/spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/AuronFunctionSuite.scala
b/spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/AuronFunctionSuite.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/AuronFunctionSuite.scala
rename to
spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/AuronFunctionSuite.scala
diff --git
a/spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/AuronQuerySuite.scala
b/spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/AuronQuerySuite.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/AuronQuerySuite.scala
rename to
spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/AuronQuerySuite.scala
diff --git
a/spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/AuronSQLTestHelper.scala
b/spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/AuronSQLTestHelper.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/AuronSQLTestHelper.scala
rename to
spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/AuronSQLTestHelper.scala
diff --git
a/spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/BaseAuronSQLSuite.scala
b/spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/BaseAuronSQLSuite.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/BaseAuronSQLSuite.scala
rename to
spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/BaseAuronSQLSuite.scala
diff --git
a/spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/BuildInfoAuronSQLSuite.scala
b/spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/BuildInfoAuronSQLSuite.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/BuildInfoAuronSQLSuite.scala
rename to
spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/BuildInfoAuronSQLSuite.scala
diff --git
a/spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/BuildinfoInSparkUISuite.scala
b/spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/BuildinfoInSparkUISuite.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/BuildinfoInSparkUISuite.scala
rename to
spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/BuildinfoInSparkUISuite.scala
diff --git
a/spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/EmptyNativeRddSuite.scala
b/spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/EmptyNativeRddSuite.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/EmptyNativeRddSuite.scala
rename to
spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/EmptyNativeRddSuite.scala
diff --git
a/spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/NativeConvertersSuite.scala
b/spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/NativeConvertersSuite.scala
similarity index 100%
rename from
spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/auron/NativeConvertersSuite.scala
rename to
spark-extension-shims-spark/src/test/scala/org/apache/spark/sql/auron/NativeConvertersSuite.scala
diff --git a/thirdparty/auron-celeborn-0.5/pom.xml
b/thirdparty/auron-celeborn-0.5/pom.xml
index d29bd0bf..5c98b8f0 100644
--- a/thirdparty/auron-celeborn-0.5/pom.xml
+++ b/thirdparty/auron-celeborn-0.5/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.auron</groupId>
- <artifactId>spark-extension-shims-spark3_${scalaVersion}</artifactId>
+ <artifactId>spark-extension-shims-spark_${scalaVersion}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/thirdparty/auron-celeborn-0.6/pom.xml
b/thirdparty/auron-celeborn-0.6/pom.xml
index 1dc21dba..b676e5ce 100644
--- a/thirdparty/auron-celeborn-0.6/pom.xml
+++ b/thirdparty/auron-celeborn-0.6/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.auron</groupId>
- <artifactId>spark-extension-shims-spark3_${scalaVersion}</artifactId>
+ <artifactId>spark-extension-shims-spark_${scalaVersion}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/thirdparty/auron-uniffle/pom.xml b/thirdparty/auron-uniffle/pom.xml
index 04d00666..9c5b95ab 100644
--- a/thirdparty/auron-uniffle/pom.xml
+++ b/thirdparty/auron-uniffle/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.auron</groupId>
- <artifactId>spark-extension-shims-spark3_${scalaVersion}</artifactId>
+ <artifactId>spark-extension-shims-spark_${scalaVersion}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
