This is an automated email from the ASF dual-hosted git repository.
hongze pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 9606031a0c [GLUTEN-9995][CORE] Source folder control for different
Spark versions in all Maven modules (#9996)
9606031a0c is described below
commit 9606031a0cd970b7893a4a8bbb97db0b7a2c77de
Author: Hongze Zhang <[email protected]>
AuthorDate: Wed Jun 18 15:16:30 2025 +0800
[GLUTEN-9995][CORE] Source folder control for different Spark versions in
all Maven modules (#9996)
---
backends-clickhouse/pom.xml | 146 ++-------------------
.../org.apache.gluten.sql.shims.DeltaShimProvider | 0
.../scala/io/delta/tables/ClickhouseTable.scala | 0
.../gluten/parser/GlutenCacheFilesSqlParser.scala | 0
.../gluten/parser/GlutenClickhouseSqlParser.scala | 0
.../sql/shims/delta20/Delta20ShimProvider.scala | 0
.../gluten/sql/shims/delta20/Delta20Shims.scala | 0
.../delta/ClickhouseOptimisticTransaction.scala | 0
.../org/apache/spark/sql/delta/DeltaAdapter.scala | 0
.../org/apache/spark/sql/delta/DeltaLog.scala | 0
.../org/apache/spark/sql/delta/Snapshot.scala | 0
.../sql/delta/catalog/ClickHouseTableV2.scala | 0
.../spark/sql/delta/commands/DeleteCommand.scala | 0
.../sql/delta/commands/MergeIntoCommand.scala | 0
.../sql/delta/commands/OptimizeTableCommand.scala | 0
.../commands/OptimizeTableCommandOverwrites.scala | 0
.../spark/sql/delta/commands/UpdateCommand.scala | 0
.../spark/sql/delta/commands/VacuumCommand.scala | 0
.../files/MergeTreeDelayedCommitProtocol.scala | 0
.../rules/CHOptimizeMetadataOnlyDeltaQuery.scala | 0
.../spark/sql/execution/CHDeltaColumnarWrite.scala | 0
.../v2/clickhouse/ClickHouseDataSource.scala | 0
.../v2/clickhouse/ClickHouseSparkCatalog.scala | 0
.../v2/clickhouse/metadata/AddFileTags.scala | 0
.../source/DeltaMergeTreeFileFormat.scala | 0
.../spark/gluten/delta/DeltaStatsUtils.scala | 0
.../org.apache.gluten.sql.shims.DeltaShimProvider | 0
.../scala/io/delta/tables/ClickhouseTable.scala | 0
.../gluten/parser/GlutenCacheFilesSqlParser.scala | 0
.../gluten/parser/GlutenClickhouseSqlParser.scala | 0
.../sql/shims/delta23/Delta23ShimProvider.scala | 0
.../gluten/sql/shims/delta23/Delta23Shims.scala | 0
.../delta/ClickhouseOptimisticTransaction.scala | 0
.../org/apache/spark/sql/delta/DeltaAdapter.scala | 0
.../org/apache/spark/sql/delta/DeltaLog.scala | 0
.../org/apache/spark/sql/delta/Snapshot.scala | 0
.../sql/delta/catalog/ClickHouseTableV2.scala | 0
.../spark/sql/delta/commands/DeleteCommand.scala | 0
.../sql/delta/commands/MergeIntoCommand.scala | 0
.../sql/delta/commands/OptimizeTableCommand.scala | 0
.../commands/OptimizeTableCommandOverwrites.scala | 0
.../spark/sql/delta/commands/UpdateCommand.scala | 0
.../spark/sql/delta/commands/VacuumCommand.scala | 0
.../files/MergeTreeDelayedCommitProtocol.scala | 0
.../rules/CHOptimizeMetadataOnlyDeltaQuery.scala | 0
.../spark/sql/delta/stats/PrepareDeltaScan.scala | 0
.../spark/sql/execution/CHDeltaColumnarWrite.scala | 0
.../v2/clickhouse/ClickHouseDataSource.scala | 0
.../v2/clickhouse/ClickHouseSparkCatalog.scala | 0
.../v2/clickhouse/metadata/AddFileTags.scala | 0
.../source/DeltaMergeTreeFileFormat.scala | 0
.../spark/gluten/delta/DeltaStatsUtils.scala | 0
.../gluten/vectorized/DeltaWriterJNIWrapper.java | 0
.../org.apache.gluten.sql.shims.DeltaShimProvider | 0
.../scala/io/delta/tables/ClickhouseTable.scala | 0
.../DeltaExpressionExtensionTransformer.scala | 0
.../gluten/parser/GlutenCacheFilesSqlParser.scala | 0
.../gluten/parser/GlutenClickhouseSqlParser.scala | 0
.../sql/shims/delta33/Delta33ShimProvider.scala | 0
.../gluten/sql/shims/delta33/Delta33Shims.scala | 0
.../delta/ClickhouseOptimisticTransaction.scala | 0
.../org/apache/spark/sql/delta/DeltaAdapter.scala | 0
.../org/apache/spark/sql/delta/DeltaLog.scala | 0
.../spark/sql/delta/PreprocessTableWithDVs.scala | 0
.../org/apache/spark/sql/delta/Snapshot.scala | 0
.../sql/delta/catalog/ClickHouseTableV2.scala | 0
.../commands/DMLWithDeletionVectorsHelper.scala | 0
.../spark/sql/delta/commands/VacuumCommand.scala | 0
.../merge/MergeIntoMaterializeSource.scala | 0
.../files/MergeTreeDelayedCommitProtocol.scala | 0
.../rules/CHOptimizeMetadataOnlyDeltaQuery.scala | 0
.../execution/DeletionVectorWriteTransformer.scala | 0
.../sql/execution/FileDeltaColumnarWrite.scala | 0
.../execution/MergeTreeDeltaColumnarWrite.scala | 0
.../sql/execution/datasources/DeltaV1Writes.scala | 0
.../clickhouse/MergeTreeFileFormatDataWriter.scala | 0
.../v1/clickhouse/MergeTreeFileFormatWriter.scala | 0
.../v2/clickhouse/ClickHouseDataSource.scala | 0
.../v2/clickhouse/ClickHouseSparkCatalog.scala | 0
.../v2/clickhouse/metadata/AddFileTags.scala | 0
.../source/DeltaMergeTreeFileFormat.scala | 0
.../spark/gluten/delta/DeltaStatsUtils.scala | 0
.../GlutenDeltaMergeTreeDeletionVectorSuite.scala | 0
.../GlutenDeltaParquetDeletionVectorSuite.scala | 0
.../sql/execution/GlutenDeltaExpressionSuite.scala | 0
.../apache/spark/sql/execution/RDDScanSuite.scala | 0
.../execution/datasources/DeltaV1WritesSuite.scala | 0
.../gluten/execution/iceberg/TestFlinkUpsert.java | 15 ++-
.../iceberg/TestPositionDeletesTableGluten.java | 4 +-
.../iceberg/TestPositionDeletesTableGluten.java | 4 +-
backends-velox/pom.xml | 71 ----------
.../execution/TestStoragePartitionedJoins.java | 2 +-
.../execution/TestTPCHStoragePartitionedJoins.java | 2 +-
.../extensions/GlutenTestCopyOnWriteDelete.java | 2 +-
.../extensions/GlutenTestMergeOnReadDelete.java | 2 +-
.../extensions/GlutenTestMergeOnReadMerge.java | 2 +-
.../extensions/GlutenTestMergeOnReadUpdate.java | 2 +-
...toragePartitionedJoinsInRowLevelOperations.java | 2 +-
.../GlutenTestSystemFunctionPushDownDQL.java | 2 +-
...SystemFunctionPushDownInRowLevelOperations.java | 2 +-
.../source/GlutenTestDataFrameWriterV2.java | 2 +-
.../GlutenTestDataFrameWriterV2Coercion.java | 2 +-
.../source/GlutenTestDataSourceOptions.java | 2 +-
.../source/GlutenTestIcebergSourceHiveTables.java | 2 +-
.../source/GlutenTestIdentityPartitionData.java | 2 +-
.../source/GlutenTestPositionDeletesTable.java | 2 +-
.../gluten}/source/GlutenTestRuntimeFiltering.java | 2 +-
.../source/GlutenTestSparkMetadataColumns.java | 2 +-
.../gluten}/source/GlutenTestSparkStagedScan.java | 2 +-
.../apache/gluten}/source/TestDataFrameWrites.java | 2 +-
.../apache/gluten}/source/TestFilteredScan.java | 4 +-
.../gluten}/source/TestForwardCompatibility.java | 4 +-
.../apache/gluten}/source/TestIcebergSpark.java | 4 +-
.../org/apache/gluten}/source/TestParquetScan.java | 4 +-
.../gluten}/source/TestPartitionPruning.java | 4 +-
.../apache/gluten}/source/TestPartitionValues.java | 4 +-
.../apache/gluten}/source/TestSparkDataFile.java | 4 +-
.../source/TestSparkReaderWithBloomFilter.java | 4 +-
.../gluten}/source/TestStructuredStreaming.java | 4 +-
.../gluten}/source/TestTimestampWithoutZone.java | 2 +-
.../gluten}/sql/GlutenTestAggregatePushDown.java | 4 +-
.../apache/gluten}/sql/GlutenTestDeleteFrom.java | 2 +-
.../sql/GlutenTestPartitionedWritesAsSelect.java | 2 +-
.../sql/GlutenTestPartitionedWritesToBranch.java | 2 +-
.../GlutenTestPartitionedWritesToWapBranch.java | 2 +-
.../org/apache/gluten}/sql/GlutenTestSelect.java | 2 +-
.../sql/GlutenTestTimestampWithoutZone.java | 2 +-
.../org/apache/gluten}/sql/TestFilterPushDown.java | 2 +-
.../org/apache/iceberg/spark/SparkTestBase.java | 2 +-
.../spark/extensions/SparkExtensionsTestBase.java | 2 +-
.../spark/source/GlutenSparkScanBuilder.java | 0
.../spark/source/TestIcebergSourceTablesBase.java | 0
.../spark/source/TestSparkReadProjection.java | 2 +-
.../spark/source/TestSparkReaderDeletes.java | 2 +-
.../java/org/apache/gluten}/TestConfUtil.java | 2 +-
gluten-core/pom.xml | 2 +-
gluten-delta/pom.xml | 6 -
.../execution/DeltaFilterExecTransformer.scala | 0
.../execution/DeltaProjectExecTransformer.scala | 0
.../execution/DeltaFilterExecTransformer.scala | 0
.../execution/DeltaProjectExecTransformer.scala | 0
.../execution/DeltaFilterExecTransformer.scala | 0
.../execution/DeltaProjectExecTransformer.scala | 0
.../execution/DeltaFilterExecTransformer.scala | 0
.../execution/DeltaProjectExecTransformer.scala | 0
.../sql/perf/DeltaOptimizedWriterTransformer.scala | 0
pom.xml | 137 ++++++++++++++++++-
147 files changed, 205 insertions(+), 284 deletions(-)
diff --git a/backends-clickhouse/pom.xml b/backends-clickhouse/pom.xml
index 7c46553964..808a9ad28d 100644
--- a/backends-clickhouse/pom.xml
+++ b/backends-clickhouse/pom.xml
@@ -48,70 +48,6 @@
<activation>
<activeByDefault>false</activeByDefault>
</activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-spark33-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.basedir}/src-spark33/main/scala</source>
- <source>${project.basedir}/src-spark33/main/java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-spark33-resources</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>add-resource</goal>
- </goals>
- <configuration>
- <resources>
- <resource>
-
<directory>${project.basedir}/src-spark33/main/resources</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>add-spark33-test-sources</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.basedir}/src-spark33/test/scala</source>
-
<source>${project.basedir}/src-iceberg/test/java-spark33</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-spark33-test-resources</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>add-test-resource</goal>
- </goals>
- <configuration>
- <resources>
- <resource>
-
<directory>${project.basedir}/src-spark33/test/resources</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</profile>
<profile>
<id>spark-3.5</id>
@@ -154,70 +90,6 @@
</exclusions>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-spark35-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.basedir}/src-spark35/main/scala</source>
- <source>${project.basedir}/src-spark35/main/java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-spark35-resources</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>add-resource</goal>
- </goals>
- <configuration>
- <resources>
- <resource>
-
<directory>${project.basedir}/src-spark35/main/resources</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>add-spark35-test-sources</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.basedir}/src-spark35/test/scala</source>
-
<source>${project.basedir}/src-iceberg/test/java-spark35</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-spark35-test-resources</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>add-test-resource</goal>
- </goals>
- <configuration>
- <resources>
- <resource>
-
<directory>${project.basedir}/src-spark35/test/resources</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</profile>
<profile>
<id>iceberg</id>
@@ -806,17 +678,17 @@
<include>src/test/scala/**/*.scala</include>
<include>src-delta/main/scala/**/*.scala</include>
<include>src-delta/test/scala/**/*.scala</include>
-
<include>src-delta-${delta.binary.version}/main/scala/**/*.scala</include>
-
<include>src-delta-${delta.binary.version}/test/scala/**/*.scala</include>
+
<include>src-delta${delta.binary.version}/main/scala/**/*.scala</include>
+
<include>src-delta${delta.binary.version}/test/scala/**/*.scala</include>
</includes>
<excludes>
-
<exclude>src-delta-${delta.binary.version}/main/scala/org/apache/spark/sql/delta/commands/*.scala</exclude>
-
<exclude>src-delta-${delta.binary.version}/main/scala/org/apache/spark/sql/delta/commands/merge/*.scala</exclude>
-
<exclude>src-delta-${delta.binary.version}/main/scala/org/apache/spark/sql/delta/stats/*.scala</exclude>
-
<exclude>src-delta-${delta.binary.version}/main/scala/org/apache/spark/sql/delta/DeltaLog.scala</exclude>
-
<exclude>src-delta-${delta.binary.version}/main/scala/org/apache/spark/sql/delta/Snapshot.scala</exclude>
-
<exclude>src-delta-${delta.binary.version}/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala</exclude>
-
<exclude>src-delta-${delta.binary.version}/main/scala/org/apache/spark/sql/delta/PreprocessTableWithDVs.scala</exclude>
+
<exclude>src-delta${delta.binary.version}/main/scala/org/apache/spark/sql/delta/commands/*.scala</exclude>
+
<exclude>src-delta${delta.binary.version}/main/scala/org/apache/spark/sql/delta/commands/merge/*.scala</exclude>
+
<exclude>src-delta${delta.binary.version}/main/scala/org/apache/spark/sql/delta/stats/*.scala</exclude>
+
<exclude>src-delta${delta.binary.version}/main/scala/org/apache/spark/sql/delta/DeltaLog.scala</exclude>
+
<exclude>src-delta${delta.binary.version}/main/scala/org/apache/spark/sql/delta/Snapshot.scala</exclude>
+
<exclude>src-delta${delta.binary.version}/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala</exclude>
+
<exclude>src-delta${delta.binary.version}/main/scala/org/apache/spark/sql/delta/PreprocessTableWithDVs.scala</exclude>
</excludes>
</scala>
</configuration>
diff --git
a/backends-clickhouse/src-delta-20/main/resources/META-INF/services/org.apache.gluten.sql.shims.DeltaShimProvider
b/backends-clickhouse/src-delta20/main/resources/META-INF/services/org.apache.gluten.sql.shims.DeltaShimProvider
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/resources/META-INF/services/org.apache.gluten.sql.shims.DeltaShimProvider
rename to
backends-clickhouse/src-delta20/main/resources/META-INF/services/org.apache.gluten.sql.shims.DeltaShimProvider
diff --git
a/backends-clickhouse/src-delta-20/main/scala/io/delta/tables/ClickhouseTable.scala
b/backends-clickhouse/src-delta20/main/scala/io/delta/tables/ClickhouseTable.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/io/delta/tables/ClickhouseTable.scala
rename to
backends-clickhouse/src-delta20/main/scala/io/delta/tables/ClickhouseTable.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/gluten/parser/GlutenCacheFilesSqlParser.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/gluten/parser/GlutenCacheFilesSqlParser.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/gluten/parser/GlutenCacheFilesSqlParser.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/gluten/parser/GlutenCacheFilesSqlParser.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/gluten/parser/GlutenClickhouseSqlParser.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/gluten/parser/GlutenClickhouseSqlParser.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/gluten/parser/GlutenClickhouseSqlParser.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/gluten/parser/GlutenClickhouseSqlParser.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/gluten/sql/shims/delta20/Delta20ShimProvider.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/gluten/sql/shims/delta20/Delta20ShimProvider.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/gluten/sql/shims/delta20/Delta20ShimProvider.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/gluten/sql/shims/delta20/Delta20ShimProvider.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/gluten/sql/shims/delta20/Delta20Shims.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/gluten/sql/shims/delta20/Delta20Shims.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/gluten/sql/shims/delta20/Delta20Shims.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/gluten/sql/shims/delta20/Delta20Shims.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/DeltaAdapter.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/DeltaAdapter.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/DeltaAdapter.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/DeltaAdapter.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/DeltaLog.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/DeltaLog.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/DeltaLog.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/DeltaLog.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/Snapshot.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/Snapshot.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/Snapshot.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/Snapshot.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/catalog/ClickHouseTableV2.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/catalog/ClickHouseTableV2.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/catalog/ClickHouseTableV2.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/catalog/ClickHouseTableV2.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/commands/DeleteCommand.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/commands/DeleteCommand.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/commands/DeleteCommand.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/commands/DeleteCommand.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/commands/MergeIntoCommand.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/commands/MergeIntoCommand.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/commands/MergeIntoCommand.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/commands/MergeIntoCommand.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/commands/OptimizeTableCommand.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/commands/OptimizeTableCommand.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/commands/OptimizeTableCommand.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/commands/OptimizeTableCommand.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/commands/OptimizeTableCommandOverwrites.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/commands/OptimizeTableCommandOverwrites.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/commands/OptimizeTableCommandOverwrites.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/commands/OptimizeTableCommandOverwrites.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/commands/UpdateCommand.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/commands/UpdateCommand.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/commands/UpdateCommand.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/commands/UpdateCommand.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/commands/VacuumCommand.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/commands/VacuumCommand.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/commands/VacuumCommand.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/commands/VacuumCommand.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/files/MergeTreeDelayedCommitProtocol.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/files/MergeTreeDelayedCommitProtocol.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/files/MergeTreeDelayedCommitProtocol.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/files/MergeTreeDelayedCommitProtocol.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/rules/CHOptimizeMetadataOnlyDeltaQuery.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/rules/CHOptimizeMetadataOnlyDeltaQuery.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/delta/rules/CHOptimizeMetadataOnlyDeltaQuery.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/rules/CHOptimizeMetadataOnlyDeltaQuery.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/execution/CHDeltaColumnarWrite.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/execution/CHDeltaColumnarWrite.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/execution/CHDeltaColumnarWrite.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/execution/CHDeltaColumnarWrite.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseDataSource.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseDataSource.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseDataSource.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseDataSource.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseSparkCatalog.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseSparkCatalog.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseSparkCatalog.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseSparkCatalog.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/metadata/AddFileTags.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/metadata/AddFileTags.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/metadata/AddFileTags.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/metadata/AddFileTags.scala
diff --git
a/backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/source/DeltaMergeTreeFileFormat.scala
b/backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/source/DeltaMergeTreeFileFormat.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/source/DeltaMergeTreeFileFormat.scala
rename to
backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/source/DeltaMergeTreeFileFormat.scala
diff --git
a/backends-clickhouse/src-delta-20/test/scala/org/apache/spark/gluten/delta/DeltaStatsUtils.scala
b/backends-clickhouse/src-delta20/test/scala/org/apache/spark/gluten/delta/DeltaStatsUtils.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-20/test/scala/org/apache/spark/gluten/delta/DeltaStatsUtils.scala
rename to
backends-clickhouse/src-delta20/test/scala/org/apache/spark/gluten/delta/DeltaStatsUtils.scala
diff --git
a/backends-clickhouse/src-delta-23/main/resources/META-INF/services/org.apache.gluten.sql.shims.DeltaShimProvider
b/backends-clickhouse/src-delta23/main/resources/META-INF/services/org.apache.gluten.sql.shims.DeltaShimProvider
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/resources/META-INF/services/org.apache.gluten.sql.shims.DeltaShimProvider
rename to
backends-clickhouse/src-delta23/main/resources/META-INF/services/org.apache.gluten.sql.shims.DeltaShimProvider
diff --git
a/backends-clickhouse/src-delta-23/main/scala/io/delta/tables/ClickhouseTable.scala
b/backends-clickhouse/src-delta23/main/scala/io/delta/tables/ClickhouseTable.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/io/delta/tables/ClickhouseTable.scala
rename to
backends-clickhouse/src-delta23/main/scala/io/delta/tables/ClickhouseTable.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/gluten/parser/GlutenCacheFilesSqlParser.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/gluten/parser/GlutenCacheFilesSqlParser.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/gluten/parser/GlutenCacheFilesSqlParser.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/gluten/parser/GlutenCacheFilesSqlParser.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/gluten/parser/GlutenClickhouseSqlParser.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/gluten/parser/GlutenClickhouseSqlParser.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/gluten/parser/GlutenClickhouseSqlParser.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/gluten/parser/GlutenClickhouseSqlParser.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/gluten/sql/shims/delta23/Delta23ShimProvider.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/gluten/sql/shims/delta23/Delta23ShimProvider.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/gluten/sql/shims/delta23/Delta23ShimProvider.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/gluten/sql/shims/delta23/Delta23ShimProvider.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/gluten/sql/shims/delta23/Delta23Shims.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/gluten/sql/shims/delta23/Delta23Shims.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/gluten/sql/shims/delta23/Delta23Shims.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/gluten/sql/shims/delta23/Delta23Shims.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/DeltaAdapter.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/DeltaAdapter.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/DeltaAdapter.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/DeltaAdapter.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/DeltaLog.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/DeltaLog.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/DeltaLog.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/DeltaLog.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/Snapshot.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/Snapshot.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/Snapshot.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/Snapshot.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/catalog/ClickHouseTableV2.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/catalog/ClickHouseTableV2.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/catalog/ClickHouseTableV2.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/catalog/ClickHouseTableV2.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/commands/DeleteCommand.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/commands/DeleteCommand.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/commands/DeleteCommand.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/commands/DeleteCommand.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/commands/MergeIntoCommand.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/commands/MergeIntoCommand.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/commands/MergeIntoCommand.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/commands/MergeIntoCommand.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/commands/OptimizeTableCommand.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/commands/OptimizeTableCommand.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/commands/OptimizeTableCommand.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/commands/OptimizeTableCommand.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/commands/OptimizeTableCommandOverwrites.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/commands/OptimizeTableCommandOverwrites.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/commands/OptimizeTableCommandOverwrites.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/commands/OptimizeTableCommandOverwrites.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/commands/UpdateCommand.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/commands/UpdateCommand.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/commands/UpdateCommand.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/commands/UpdateCommand.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/commands/VacuumCommand.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/commands/VacuumCommand.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/commands/VacuumCommand.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/commands/VacuumCommand.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/files/MergeTreeDelayedCommitProtocol.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/files/MergeTreeDelayedCommitProtocol.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/files/MergeTreeDelayedCommitProtocol.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/files/MergeTreeDelayedCommitProtocol.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/rules/CHOptimizeMetadataOnlyDeltaQuery.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/rules/CHOptimizeMetadataOnlyDeltaQuery.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/rules/CHOptimizeMetadataOnlyDeltaQuery.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/rules/CHOptimizeMetadataOnlyDeltaQuery.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/stats/PrepareDeltaScan.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/stats/PrepareDeltaScan.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/delta/stats/PrepareDeltaScan.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/delta/stats/PrepareDeltaScan.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/execution/CHDeltaColumnarWrite.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/execution/CHDeltaColumnarWrite.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/execution/CHDeltaColumnarWrite.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/execution/CHDeltaColumnarWrite.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseDataSource.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseDataSource.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseDataSource.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseDataSource.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseSparkCatalog.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseSparkCatalog.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseSparkCatalog.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseSparkCatalog.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/metadata/AddFileTags.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/metadata/AddFileTags.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/metadata/AddFileTags.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/metadata/AddFileTags.scala
diff --git
a/backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/source/DeltaMergeTreeFileFormat.scala
b/backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/source/DeltaMergeTreeFileFormat.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/source/DeltaMergeTreeFileFormat.scala
rename to
backends-clickhouse/src-delta23/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/source/DeltaMergeTreeFileFormat.scala
diff --git
a/backends-clickhouse/src-delta-23/test/scala/org/apache/spark/gluten/delta/DeltaStatsUtils.scala
b/backends-clickhouse/src-delta23/test/scala/org/apache/spark/gluten/delta/DeltaStatsUtils.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-23/test/scala/org/apache/spark/gluten/delta/DeltaStatsUtils.scala
rename to
backends-clickhouse/src-delta23/test/scala/org/apache/spark/gluten/delta/DeltaStatsUtils.scala
diff --git
a/backends-clickhouse/src-delta-33/main/java/org/apache/gluten/vectorized/DeltaWriterJNIWrapper.java
b/backends-clickhouse/src-delta33/main/java/org/apache/gluten/vectorized/DeltaWriterJNIWrapper.java
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/java/org/apache/gluten/vectorized/DeltaWriterJNIWrapper.java
rename to
backends-clickhouse/src-delta33/main/java/org/apache/gluten/vectorized/DeltaWriterJNIWrapper.java
diff --git
a/backends-clickhouse/src-delta-33/main/resources/META-INF/services/org.apache.gluten.sql.shims.DeltaShimProvider
b/backends-clickhouse/src-delta33/main/resources/META-INF/services/org.apache.gluten.sql.shims.DeltaShimProvider
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/resources/META-INF/services/org.apache.gluten.sql.shims.DeltaShimProvider
rename to
backends-clickhouse/src-delta33/main/resources/META-INF/services/org.apache.gluten.sql.shims.DeltaShimProvider
diff --git
a/backends-clickhouse/src-delta-33/main/scala/io/delta/tables/ClickhouseTable.scala
b/backends-clickhouse/src-delta33/main/scala/io/delta/tables/ClickhouseTable.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/io/delta/tables/ClickhouseTable.scala
rename to
backends-clickhouse/src-delta33/main/scala/io/delta/tables/ClickhouseTable.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/gluten/extension/DeltaExpressionExtensionTransformer.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/gluten/extension/DeltaExpressionExtensionTransformer.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/gluten/extension/DeltaExpressionExtensionTransformer.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/gluten/extension/DeltaExpressionExtensionTransformer.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/gluten/parser/GlutenCacheFilesSqlParser.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/gluten/parser/GlutenCacheFilesSqlParser.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/gluten/parser/GlutenCacheFilesSqlParser.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/gluten/parser/GlutenCacheFilesSqlParser.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/gluten/parser/GlutenClickhouseSqlParser.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/gluten/parser/GlutenClickhouseSqlParser.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/gluten/parser/GlutenClickhouseSqlParser.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/gluten/parser/GlutenClickhouseSqlParser.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/gluten/sql/shims/delta33/Delta33ShimProvider.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/gluten/sql/shims/delta33/Delta33ShimProvider.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/gluten/sql/shims/delta33/Delta33ShimProvider.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/gluten/sql/shims/delta33/Delta33ShimProvider.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/gluten/sql/shims/delta33/Delta33Shims.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/gluten/sql/shims/delta33/Delta33Shims.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/gluten/sql/shims/delta33/Delta33Shims.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/gluten/sql/shims/delta33/Delta33Shims.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/DeltaAdapter.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/DeltaAdapter.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/DeltaAdapter.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/DeltaAdapter.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/DeltaLog.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/DeltaLog.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/DeltaLog.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/DeltaLog.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/PreprocessTableWithDVs.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/PreprocessTableWithDVs.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/PreprocessTableWithDVs.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/PreprocessTableWithDVs.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/Snapshot.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/Snapshot.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/Snapshot.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/Snapshot.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/catalog/ClickHouseTableV2.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/catalog/ClickHouseTableV2.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/catalog/ClickHouseTableV2.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/catalog/ClickHouseTableV2.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/commands/DMLWithDeletionVectorsHelper.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/commands/DMLWithDeletionVectorsHelper.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/commands/DMLWithDeletionVectorsHelper.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/commands/DMLWithDeletionVectorsHelper.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/commands/VacuumCommand.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/commands/VacuumCommand.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/commands/VacuumCommand.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/commands/VacuumCommand.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/commands/merge/MergeIntoMaterializeSource.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/commands/merge/MergeIntoMaterializeSource.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/commands/merge/MergeIntoMaterializeSource.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/commands/merge/MergeIntoMaterializeSource.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/files/MergeTreeDelayedCommitProtocol.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/files/MergeTreeDelayedCommitProtocol.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/files/MergeTreeDelayedCommitProtocol.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/files/MergeTreeDelayedCommitProtocol.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/rules/CHOptimizeMetadataOnlyDeltaQuery.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/rules/CHOptimizeMetadataOnlyDeltaQuery.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/delta/rules/CHOptimizeMetadataOnlyDeltaQuery.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/delta/rules/CHOptimizeMetadataOnlyDeltaQuery.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/DeletionVectorWriteTransformer.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/DeletionVectorWriteTransformer.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/DeletionVectorWriteTransformer.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/DeletionVectorWriteTransformer.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/FileDeltaColumnarWrite.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/FileDeltaColumnarWrite.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/FileDeltaColumnarWrite.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/FileDeltaColumnarWrite.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/MergeTreeDeltaColumnarWrite.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/MergeTreeDeltaColumnarWrite.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/MergeTreeDeltaColumnarWrite.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/MergeTreeDeltaColumnarWrite.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/datasources/DeltaV1Writes.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/datasources/DeltaV1Writes.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/datasources/DeltaV1Writes.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/datasources/DeltaV1Writes.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/datasources/v1/clickhouse/MergeTreeFileFormatDataWriter.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/datasources/v1/clickhouse/MergeTreeFileFormatDataWriter.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/datasources/v1/clickhouse/MergeTreeFileFormatDataWriter.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/datasources/v1/clickhouse/MergeTreeFileFormatDataWriter.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/datasources/v1/clickhouse/MergeTreeFileFormatWriter.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/datasources/v1/clickhouse/MergeTreeFileFormatWriter.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/datasources/v1/clickhouse/MergeTreeFileFormatWriter.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/datasources/v1/clickhouse/MergeTreeFileFormatWriter.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseDataSource.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseDataSource.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseDataSource.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseDataSource.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseSparkCatalog.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseSparkCatalog.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseSparkCatalog.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseSparkCatalog.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/metadata/AddFileTags.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/metadata/AddFileTags.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/metadata/AddFileTags.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/metadata/AddFileTags.scala
diff --git
a/backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/source/DeltaMergeTreeFileFormat.scala
b/backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/source/DeltaMergeTreeFileFormat.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/source/DeltaMergeTreeFileFormat.scala
rename to
backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/source/DeltaMergeTreeFileFormat.scala
diff --git
a/backends-clickhouse/src-delta-33/test/scala/org/apache/spark/gluten/delta/DeltaStatsUtils.scala
b/backends-clickhouse/src-delta33/test/scala/org/apache/spark/gluten/delta/DeltaStatsUtils.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/test/scala/org/apache/spark/gluten/delta/DeltaStatsUtils.scala
rename to
backends-clickhouse/src-delta33/test/scala/org/apache/spark/gluten/delta/DeltaStatsUtils.scala
diff --git
a/backends-clickhouse/src-delta-33/test/scala/org/apache/spark/gluten/delta/GlutenDeltaMergeTreeDeletionVectorSuite.scala
b/backends-clickhouse/src-delta33/test/scala/org/apache/spark/gluten/delta/GlutenDeltaMergeTreeDeletionVectorSuite.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/test/scala/org/apache/spark/gluten/delta/GlutenDeltaMergeTreeDeletionVectorSuite.scala
rename to
backends-clickhouse/src-delta33/test/scala/org/apache/spark/gluten/delta/GlutenDeltaMergeTreeDeletionVectorSuite.scala
diff --git
a/backends-clickhouse/src-delta-33/test/scala/org/apache/spark/gluten/delta/GlutenDeltaParquetDeletionVectorSuite.scala
b/backends-clickhouse/src-delta33/test/scala/org/apache/spark/gluten/delta/GlutenDeltaParquetDeletionVectorSuite.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/test/scala/org/apache/spark/gluten/delta/GlutenDeltaParquetDeletionVectorSuite.scala
rename to
backends-clickhouse/src-delta33/test/scala/org/apache/spark/gluten/delta/GlutenDeltaParquetDeletionVectorSuite.scala
diff --git
a/backends-clickhouse/src-delta-33/test/scala/org/apache/spark/sql/execution/GlutenDeltaExpressionSuite.scala
b/backends-clickhouse/src-delta33/test/scala/org/apache/spark/sql/execution/GlutenDeltaExpressionSuite.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/test/scala/org/apache/spark/sql/execution/GlutenDeltaExpressionSuite.scala
rename to
backends-clickhouse/src-delta33/test/scala/org/apache/spark/sql/execution/GlutenDeltaExpressionSuite.scala
diff --git
a/backends-clickhouse/src-delta-33/test/scala/org/apache/spark/sql/execution/RDDScanSuite.scala
b/backends-clickhouse/src-delta33/test/scala/org/apache/spark/sql/execution/RDDScanSuite.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/test/scala/org/apache/spark/sql/execution/RDDScanSuite.scala
rename to
backends-clickhouse/src-delta33/test/scala/org/apache/spark/sql/execution/RDDScanSuite.scala
diff --git
a/backends-clickhouse/src-delta-33/test/scala/org/apache/spark/sql/execution/datasources/DeltaV1WritesSuite.scala
b/backends-clickhouse/src-delta33/test/scala/org/apache/spark/sql/execution/datasources/DeltaV1WritesSuite.scala
similarity index 100%
rename from
backends-clickhouse/src-delta-33/test/scala/org/apache/spark/sql/execution/datasources/DeltaV1WritesSuite.scala
rename to
backends-clickhouse/src-delta33/test/scala/org/apache/spark/sql/execution/datasources/DeltaV1WritesSuite.scala
diff --git
a/backends-clickhouse/src-iceberg/test/java-spark33/org/apache/gluten/execution/iceberg/TestFlinkUpsert.java
b/backends-clickhouse/src-iceberg-spark33/test/java/org/apache/gluten/execution/iceberg/TestFlinkUpsert.java
similarity index 99%
rename from
backends-clickhouse/src-iceberg/test/java-spark33/org/apache/gluten/execution/iceberg/TestFlinkUpsert.java
rename to
backends-clickhouse/src-iceberg-spark33/test/java/org/apache/gluten/execution/iceberg/TestFlinkUpsert.java
index 429feab086..0c734b152f 100644
---
a/backends-clickhouse/src-iceberg/test/java-spark33/org/apache/gluten/execution/iceberg/TestFlinkUpsert.java
+++
b/backends-clickhouse/src-iceberg-spark33/test/java/org/apache/gluten/execution/iceberg/TestFlinkUpsert.java
@@ -16,13 +16,6 @@
*/
package org.apache.gluten.execution.iceberg;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.stream.Collectors;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.table.api.EnvironmentSettings;
import org.apache.flink.table.api.TableEnvironment;
@@ -45,6 +38,14 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestTemplate;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Collectors;
+
public class TestFlinkUpsert extends CatalogTestBase {
@Parameter(index = 2)
diff --git
a/backends-clickhouse/src-iceberg/test/java-spark33/org/apache/gluten/execution/iceberg/TestPositionDeletesTableGluten.java
b/backends-clickhouse/src-iceberg-spark33/test/java/org/apache/gluten/execution/iceberg/TestPositionDeletesTableGluten.java
similarity index 100%
rename from
backends-clickhouse/src-iceberg/test/java-spark33/org/apache/gluten/execution/iceberg/TestPositionDeletesTableGluten.java
rename to
backends-clickhouse/src-iceberg-spark33/test/java/org/apache/gluten/execution/iceberg/TestPositionDeletesTableGluten.java
index 103cdd7438..0dbb871e7b 100644
---
a/backends-clickhouse/src-iceberg/test/java-spark33/org/apache/gluten/execution/iceberg/TestPositionDeletesTableGluten.java
+++
b/backends-clickhouse/src-iceberg-spark33/test/java/org/apache/gluten/execution/iceberg/TestPositionDeletesTableGluten.java
@@ -14,10 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.gluten.execution.iceberg;
-import java.util.Map;
import org.apache.iceberg.CatalogUtil;
import org.apache.iceberg.FileFormat;
import org.apache.iceberg.catalog.Namespace;
@@ -32,6 +30,8 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.runners.Parameterized;
+import java.util.Map;
+
public class TestPositionDeletesTableGluten extends TestPositionDeletesTable {
private static final Map<String, String> CATALOG_PROPS =
ImmutableMap.of("type", "hive", "default-namespace", "default",
"cache-enabled", "false");
diff --git
a/backends-clickhouse/src-iceberg/test/java-spark35/org/apache/gluten/execution/iceberg/TestPositionDeletesTableGluten.java
b/backends-clickhouse/src-iceberg-spark35/test/java/org/apache/gluten/execution/iceberg/TestPositionDeletesTableGluten.java
similarity index 100%
rename from
backends-clickhouse/src-iceberg/test/java-spark35/org/apache/gluten/execution/iceberg/TestPositionDeletesTableGluten.java
rename to
backends-clickhouse/src-iceberg-spark35/test/java/org/apache/gluten/execution/iceberg/TestPositionDeletesTableGluten.java
index 3421a094fa..0dff6fcb0c 100644
---
a/backends-clickhouse/src-iceberg/test/java-spark35/org/apache/gluten/execution/iceberg/TestPositionDeletesTableGluten.java
+++
b/backends-clickhouse/src-iceberg-spark35/test/java/org/apache/gluten/execution/iceberg/TestPositionDeletesTableGluten.java
@@ -14,10 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.gluten.execution.iceberg;
-import java.util.Map;
import org.apache.iceberg.CatalogUtil;
import org.apache.iceberg.FileFormat;
import org.apache.iceberg.ParameterizedTestExtension;
@@ -34,6 +32,8 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.extension.ExtendWith;
+import java.util.Map;
+
@ExtendWith({ParameterizedTestExtension.class})
public class TestPositionDeletesTableGluten extends TestPositionDeletesTable {
private static final Map<String, String> CATALOG_PROPS =
diff --git a/backends-velox/pom.xml b/backends-velox/pom.xml
index 1c569ef1ad..4fec6a8aac 100755
--- a/backends-velox/pom.xml
+++ b/backends-velox/pom.xml
@@ -211,77 +211,6 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>spark-3.2</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <testExcludes>
- <testExclude>**/org/apache/gluten/spark34/**</testExclude>
- <testExclude>**/org/apache/iceberg/**</testExclude>
- </testExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>spark-3.3</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <testExcludes>
- <testExclude>**/org/apache/gluten/spark34/**</testExclude>
- <testExclude>**/org/apache/iceberg/**</testExclude>
- </testExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>spark-3.5</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <testExcludes>
- <testExclude>**/org/apache/gluten/spark34/**</testExclude>
- <testExclude>**/org/apache/iceberg/**</testExclude>
- </testExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <testExcludes>
- <testExclude>**/org/apache/gluten/spark34/**</testExclude>
- <testExclude>**/org/apache/iceberg/**</testExclude>
- </testExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<dependencies>
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/execution/TestStoragePartitionedJoins.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/execution/TestStoragePartitionedJoins.java
similarity index 99%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/execution/TestStoragePartitionedJoins.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/execution/TestStoragePartitionedJoins.java
index b9a6ea28c0..8123ca16fc 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/execution/TestStoragePartitionedJoins.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/execution/TestStoragePartitionedJoins.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.execution;
+package org.apache.gluten.execution;
import org.apache.commons.lang3.StringUtils;
import org.apache.iceberg.PlanningMode;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/execution/TestTPCHStoragePartitionedJoins.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/execution/TestTPCHStoragePartitionedJoins.java
similarity index 99%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/execution/TestTPCHStoragePartitionedJoins.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/execution/TestTPCHStoragePartitionedJoins.java
index d4c3a7dccf..d2edc28fc8 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/execution/TestTPCHStoragePartitionedJoins.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/execution/TestTPCHStoragePartitionedJoins.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.execution;
+package org.apache.gluten.execution;
import org.apache.gluten.config.GlutenConfig;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestCopyOnWriteDelete.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestCopyOnWriteDelete.java
similarity index 97%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestCopyOnWriteDelete.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestCopyOnWriteDelete.java
index ca23519bbb..d161fca882 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestCopyOnWriteDelete.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestCopyOnWriteDelete.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.extensions;
+package org.apache.gluten.extensions;
import org.apache.iceberg.PlanningMode;
import org.apache.iceberg.spark.extensions.TestCopyOnWriteDelete;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestMergeOnReadDelete.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestMergeOnReadDelete.java
similarity index 97%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestMergeOnReadDelete.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestMergeOnReadDelete.java
index a5173de70f..7a2932a321 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestMergeOnReadDelete.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestMergeOnReadDelete.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.extensions;
+package org.apache.gluten.extensions;
import org.apache.iceberg.PlanningMode;
import org.apache.iceberg.spark.extensions.TestMergeOnReadDelete;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestMergeOnReadMerge.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestMergeOnReadMerge.java
similarity index 97%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestMergeOnReadMerge.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestMergeOnReadMerge.java
index e132f65c23..f4774a08bf 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestMergeOnReadMerge.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestMergeOnReadMerge.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.extensions;
+package org.apache.gluten.extensions;
import org.apache.iceberg.PlanningMode;
import org.apache.iceberg.spark.extensions.TestMergeOnReadMerge;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestMergeOnReadUpdate.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestMergeOnReadUpdate.java
similarity index 97%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestMergeOnReadUpdate.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestMergeOnReadUpdate.java
index 091f836b89..b74157d3f3 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestMergeOnReadUpdate.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestMergeOnReadUpdate.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.extensions;
+package org.apache.gluten.extensions;
import org.apache.iceberg.PlanningMode;
import org.apache.iceberg.spark.extensions.TestMergeOnReadUpdate;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestStoragePartitionedJoinsInRowLevelOperations.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestStoragePartitionedJoinsInRowLevelOperations.java
similarity index 96%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestStoragePartitionedJoinsInRowLevelOperations.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestStoragePartitionedJoinsInRowLevelOperations.java
index 12f7665150..3f324b7827 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestStoragePartitionedJoinsInRowLevelOperations.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestStoragePartitionedJoinsInRowLevelOperations.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.extensions;
+package org.apache.gluten.extensions;
import
org.apache.iceberg.spark.extensions.TestStoragePartitionedJoinsInRowLevelOperations;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestSystemFunctionPushDownDQL.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestSystemFunctionPushDownDQL.java
similarity index 96%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestSystemFunctionPushDownDQL.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestSystemFunctionPushDownDQL.java
index 48ca172ff7..d195b3e21b 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestSystemFunctionPushDownDQL.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestSystemFunctionPushDownDQL.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.extensions;
+package org.apache.gluten.extensions;
import org.apache.iceberg.spark.extensions.TestSystemFunctionPushDownDQL;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestSystemFunctionPushDownInRowLevelOperations.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestSystemFunctionPushDownInRowLevelOperations.java
similarity index 96%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestSystemFunctionPushDownInRowLevelOperations.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestSystemFunctionPushDownInRowLevelOperations.java
index 34e0414986..85480eac0c 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/extensions/GlutenTestSystemFunctionPushDownInRowLevelOperations.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/extensions/GlutenTestSystemFunctionPushDownInRowLevelOperations.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.extensions;
+package org.apache.gluten.extensions;
import java.util.Map;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestDataFrameWriterV2.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestDataFrameWriterV2.java
similarity index 95%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestDataFrameWriterV2.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestDataFrameWriterV2.java
index ebd885704e..f192c9be40 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestDataFrameWriterV2.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestDataFrameWriterV2.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
import org.apache.iceberg.spark.source.TestDataFrameWriterV2;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestDataFrameWriterV2Coercion.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestDataFrameWriterV2Coercion.java
similarity index 96%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestDataFrameWriterV2Coercion.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestDataFrameWriterV2Coercion.java
index 80b79ce8de..aeeb9245a7 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestDataFrameWriterV2Coercion.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestDataFrameWriterV2Coercion.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
import org.apache.iceberg.FileFormat;
import org.apache.iceberg.spark.source.TestDataFrameWriterV2Coercion;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestDataSourceOptions.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestDataSourceOptions.java
similarity index 95%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestDataSourceOptions.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestDataSourceOptions.java
index 7e17036607..44da14b7d6 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestDataSourceOptions.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestDataSourceOptions.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
import org.apache.iceberg.spark.source.TestDataSourceOptions;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestIcebergSourceHiveTables.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestIcebergSourceHiveTables.java
similarity index 96%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestIcebergSourceHiveTables.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestIcebergSourceHiveTables.java
index 0b16ac83cb..99a79e8352 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestIcebergSourceHiveTables.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestIcebergSourceHiveTables.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
import org.apache.iceberg.spark.source.TestIcebergSourceHiveTables;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestIdentityPartitionData.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestIdentityPartitionData.java
similarity index 96%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestIdentityPartitionData.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestIdentityPartitionData.java
index 76e9f82716..02811e5afd 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestIdentityPartitionData.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestIdentityPartitionData.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
import org.apache.iceberg.PlanningMode;
import org.apache.iceberg.spark.source.TestIdentityPartitionData;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestPositionDeletesTable.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestPositionDeletesTable.java
similarity index 96%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestPositionDeletesTable.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestPositionDeletesTable.java
index 015e23a91f..3dd9df6d1a 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestPositionDeletesTable.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestPositionDeletesTable.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
import org.apache.iceberg.FileFormat;
import org.apache.iceberg.spark.source.TestPositionDeletesTable;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestRuntimeFiltering.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestRuntimeFiltering.java
similarity index 96%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestRuntimeFiltering.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestRuntimeFiltering.java
index d4b29bb7cb..950db498ed 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestRuntimeFiltering.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestRuntimeFiltering.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
import org.apache.iceberg.PlanningMode;
import org.apache.iceberg.spark.source.TestRuntimeFiltering;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestSparkMetadataColumns.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestSparkMetadataColumns.java
similarity index 96%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestSparkMetadataColumns.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestSparkMetadataColumns.java
index 45ceeb4b22..b090b10b1d 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestSparkMetadataColumns.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestSparkMetadataColumns.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
import org.apache.iceberg.FileFormat;
import org.apache.iceberg.spark.source.TestSparkMetadataColumns;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestSparkStagedScan.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestSparkStagedScan.java
similarity index 96%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestSparkStagedScan.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestSparkStagedScan.java
index 7b06feb5e2..32c1441432 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/GlutenTestSparkStagedScan.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/GlutenTestSparkStagedScan.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
import org.apache.iceberg.spark.source.TestSparkStagedScan;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestDataFrameWrites.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestDataFrameWrites.java
similarity index 99%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestDataFrameWrites.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestDataFrameWrites.java
index ea6fc9eb6c..678cec58d9 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestDataFrameWrites.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestDataFrameWrites.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
import org.apache.hadoop.conf.Configuration;
import org.apache.iceberg.*;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestFilteredScan.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestFilteredScan.java
similarity index 99%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestFilteredScan.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestFilteredScan.java
index 47099176bd..0d9bc0f42c 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestFilteredScan.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestFilteredScan.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
-import org.apache.gluten.spark34.TestConfUtil;
+import org.apache.gluten.TestConfUtil;
import org.apache.hadoop.conf.Configuration;
import org.apache.iceberg.DataFile;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestForwardCompatibility.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestForwardCompatibility.java
similarity index 98%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestForwardCompatibility.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestForwardCompatibility.java
index 05051844a6..3913ff4d61 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestForwardCompatibility.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestForwardCompatibility.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
-import org.apache.gluten.spark34.TestConfUtil;
+import org.apache.gluten.TestConfUtil;
import org.apache.hadoop.conf.Configuration;
import org.apache.iceberg.*;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestIcebergSpark.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestIcebergSpark.java
similarity index 99%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestIcebergSpark.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestIcebergSpark.java
index 0e8b482ee6..5a4d1079bf 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestIcebergSpark.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestIcebergSpark.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
-import org.apache.gluten.spark34.TestConfUtil;
+import org.apache.gluten.TestConfUtil;
import org.apache.iceberg.spark.IcebergSpark;
import org.apache.iceberg.transforms.Transforms;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestParquetScan.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestParquetScan.java
similarity index 99%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestParquetScan.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestParquetScan.java
index 86b1045fac..ef1e3becc0 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestParquetScan.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestParquetScan.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
-import org.apache.gluten.spark34.TestConfUtil;
+import org.apache.gluten.TestConfUtil;
import org.apache.hadoop.conf.Configuration;
import org.apache.iceberg.*;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestPartitionPruning.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestPartitionPruning.java
similarity index 99%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestPartitionPruning.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestPartitionPruning.java
index 72e608d92f..ceb5799db7 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestPartitionPruning.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestPartitionPruning.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
-import org.apache.gluten.spark34.TestConfUtil;
+import org.apache.gluten.TestConfUtil;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestPartitionValues.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestPartitionValues.java
similarity index 99%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestPartitionValues.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestPartitionValues.java
index 29b4412089..4fb6de296b 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestPartitionValues.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestPartitionValues.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
-import org.apache.gluten.spark34.TestConfUtil;
+import org.apache.gluten.TestConfUtil;
import org.apache.iceberg.*;
import org.apache.iceberg.avro.Avro;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestSparkDataFile.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestSparkDataFile.java
similarity index 99%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestSparkDataFile.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestSparkDataFile.java
index a2af246808..652cedd6ae 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestSparkDataFile.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestSparkDataFile.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
-import org.apache.gluten.spark34.TestConfUtil;
+import org.apache.gluten.TestConfUtil;
import org.apache.hadoop.conf.Configuration;
import org.apache.iceberg.*;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestSparkReaderWithBloomFilter.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestSparkReaderWithBloomFilter.java
similarity index 99%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestSparkReaderWithBloomFilter.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestSparkReaderWithBloomFilter.java
index 8dec613f20..7d0b42000e 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestSparkReaderWithBloomFilter.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestSparkReaderWithBloomFilter.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
-import org.apache.gluten.spark34.TestConfUtil;
+import org.apache.gluten.TestConfUtil;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.iceberg.*;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestStructuredStreaming.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestStructuredStreaming.java
similarity index 99%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestStructuredStreaming.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestStructuredStreaming.java
index 24b0d69adb..1fc2b3f965 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestStructuredStreaming.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestStructuredStreaming.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
-import org.apache.gluten.spark34.TestConfUtil;
+import org.apache.gluten.TestConfUtil;
import org.apache.hadoop.conf.Configuration;
import org.apache.iceberg.PartitionSpec;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestTimestampWithoutZone.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestTimestampWithoutZone.java
similarity index 99%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestTimestampWithoutZone.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestTimestampWithoutZone.java
index d24503056a..27572c97d4 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/source/TestTimestampWithoutZone.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/source/TestTimestampWithoutZone.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.source;
+package org.apache.gluten.source;
import org.apache.hadoop.conf.Configuration;
import org.apache.iceberg.DataFile;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestAggregatePushDown.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestAggregatePushDown.java
similarity index 96%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestAggregatePushDown.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestAggregatePushDown.java
index 9224050f6a..6b332ddab1 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestAggregatePushDown.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestAggregatePushDown.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.sql;
+package org.apache.gluten.sql;
-import org.apache.gluten.spark34.TestConfUtil;
+import org.apache.gluten.TestConfUtil;
import org.apache.iceberg.CatalogUtil;
import org.apache.iceberg.catalog.Namespace;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestDeleteFrom.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestDeleteFrom.java
similarity index 96%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestDeleteFrom.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestDeleteFrom.java
index 034fa4a1d3..af68cbbdf7 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestDeleteFrom.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestDeleteFrom.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.sql;
+package org.apache.gluten.sql;
import org.apache.iceberg.spark.sql.TestDeleteFrom;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestPartitionedWritesAsSelect.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestPartitionedWritesAsSelect.java
similarity index 96%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestPartitionedWritesAsSelect.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestPartitionedWritesAsSelect.java
index c2097b76bc..31266eabe2 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestPartitionedWritesAsSelect.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestPartitionedWritesAsSelect.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.sql;
+package org.apache.gluten.sql;
import org.apache.iceberg.spark.sql.TestPartitionedWritesAsSelect;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestPartitionedWritesToBranch.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestPartitionedWritesToBranch.java
similarity index 96%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestPartitionedWritesToBranch.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestPartitionedWritesToBranch.java
index 99bcd2ed1e..b0aeb1e332 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestPartitionedWritesToBranch.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestPartitionedWritesToBranch.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.sql;
+package org.apache.gluten.sql;
import org.apache.iceberg.spark.sql.TestPartitionedWritesToBranch;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestPartitionedWritesToWapBranch.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestPartitionedWritesToWapBranch.java
similarity index 96%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestPartitionedWritesToWapBranch.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestPartitionedWritesToWapBranch.java
index 77b04ba14f..11a4778161 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestPartitionedWritesToWapBranch.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestPartitionedWritesToWapBranch.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.sql;
+package org.apache.gluten.sql;
import org.apache.iceberg.spark.sql.TestPartitionedWritesToWapBranch;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestSelect.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestSelect.java
similarity index 96%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestSelect.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestSelect.java
index d794b53920..b7072a0771 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestSelect.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestSelect.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.sql;
+package org.apache.gluten.sql;
import org.apache.iceberg.spark.sql.TestSelect;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestTimestampWithoutZone.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestTimestampWithoutZone.java
similarity index 96%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestTimestampWithoutZone.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestTimestampWithoutZone.java
index 98c4ae581e..a1a394bab0 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/GlutenTestTimestampWithoutZone.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/GlutenTestTimestampWithoutZone.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.sql;
+package org.apache.gluten.sql;
import org.apache.iceberg.spark.sql.TestTimestampWithoutZone;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/TestFilterPushDown.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/TestFilterPushDown.java
similarity index 99%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/TestFilterPushDown.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/TestFilterPushDown.java
index cea4897e33..bfc8c440bf 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/sql/TestFilterPushDown.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/sql/TestFilterPushDown.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34.sql;
+package org.apache.gluten.sql;
import org.apache.iceberg.PlanningMode;
import org.apache.iceberg.Table;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/iceberg/spark/SparkTestBase.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/iceberg/spark/SparkTestBase.java
similarity index 99%
rename from
backends-velox/src-iceberg/test/java/org/apache/iceberg/spark/SparkTestBase.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/iceberg/spark/SparkTestBase.java
index 5ae211196c..9d82ec7b4f 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/iceberg/spark/SparkTestBase.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/iceberg/spark/SparkTestBase.java
@@ -16,8 +16,8 @@
*/
package org.apache.iceberg.spark;
+import org.apache.gluten.TestConfUtil;
import org.apache.gluten.config.GlutenConfig;
-import org.apache.gluten.spark34.TestConfUtil;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.iceberg.CatalogUtil;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/iceberg/spark/extensions/SparkExtensionsTestBase.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/iceberg/spark/extensions/SparkExtensionsTestBase.java
similarity index 98%
rename from
backends-velox/src-iceberg/test/java/org/apache/iceberg/spark/extensions/SparkExtensionsTestBase.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/iceberg/spark/extensions/SparkExtensionsTestBase.java
index 7b1a751a8d..4f9931eec7 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/iceberg/spark/extensions/SparkExtensionsTestBase.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/iceberg/spark/extensions/SparkExtensionsTestBase.java
@@ -16,7 +16,7 @@
*/
package org.apache.iceberg.spark.extensions;
-import org.apache.gluten.spark34.TestConfUtil;
+import org.apache.gluten.TestConfUtil;
import org.apache.iceberg.CatalogUtil;
import org.apache.iceberg.hive.HiveCatalog;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/iceberg/spark/source/GlutenSparkScanBuilder.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/iceberg/spark/source/GlutenSparkScanBuilder.java
similarity index 100%
rename from
backends-velox/src-iceberg/test/java/org/apache/iceberg/spark/source/GlutenSparkScanBuilder.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/iceberg/spark/source/GlutenSparkScanBuilder.java
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
similarity index 100%
rename from
backends-velox/src-iceberg/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/iceberg/spark/source/TestSparkReadProjection.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/iceberg/spark/source/TestSparkReadProjection.java
similarity index 99%
rename from
backends-velox/src-iceberg/test/java/org/apache/iceberg/spark/source/TestSparkReadProjection.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/iceberg/spark/source/TestSparkReadProjection.java
index c020614c72..da6e83f6f6 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/iceberg/spark/source/TestSparkReadProjection.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/iceberg/spark/source/TestSparkReadProjection.java
@@ -16,7 +16,7 @@
*/
package org.apache.iceberg.spark.source;
-import org.apache.gluten.spark34.TestConfUtil;
+import org.apache.gluten.TestConfUtil;
import org.apache.iceberg.*;
import org.apache.iceberg.data.GenericAppenderFactory;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/iceberg/spark/source/TestSparkReaderDeletes.java
b/backends-velox/src-iceberg-spark34/test/java/org/apache/iceberg/spark/source/TestSparkReaderDeletes.java
similarity index 99%
rename from
backends-velox/src-iceberg/test/java/org/apache/iceberg/spark/source/TestSparkReaderDeletes.java
rename to
backends-velox/src-iceberg-spark34/test/java/org/apache/iceberg/spark/source/TestSparkReaderDeletes.java
index d812516392..9a610dc340 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/iceberg/spark/source/TestSparkReaderDeletes.java
+++
b/backends-velox/src-iceberg-spark34/test/java/org/apache/iceberg/spark/source/TestSparkReaderDeletes.java
@@ -16,8 +16,8 @@
*/
package org.apache.iceberg.spark.source;
+import org.apache.gluten.TestConfUtil;
import org.apache.gluten.config.GlutenConfig;
-import org.apache.gluten.spark34.TestConfUtil;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
diff --git
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/TestConfUtil.java
b/backends-velox/src-iceberg/main/java/org/apache/gluten/TestConfUtil.java
similarity index 97%
rename from
backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/TestConfUtil.java
rename to
backends-velox/src-iceberg/main/java/org/apache/gluten/TestConfUtil.java
index acd2d36289..f037b9034b 100644
---
a/backends-velox/src-iceberg/test/java/org/apache/gluten/spark34/TestConfUtil.java
+++ b/backends-velox/src-iceberg/main/java/org/apache/gluten/TestConfUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.spark34;
+package org.apache.gluten;
import com.google.common.collect.ImmutableMap;
diff --git a/gluten-core/pom.xml b/gluten-core/pom.xml
index ba0e8fb99b..43a3597150 100644
--- a/gluten-core/pom.xml
+++ b/gluten-core/pom.xml
@@ -117,7 +117,7 @@
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
<resources>
<resource>
- <directory>src/main/resources</directory>
+ <directory>${project.basedir}/src/main/resources</directory>
</resource>
<resource>
<directory>${project.build.directory}/generated-resources</directory>
diff --git a/gluten-delta/pom.xml b/gluten-delta/pom.xml
index bc936203b2..726fe97181 100755
--- a/gluten-delta/pom.xml
+++ b/gluten-delta/pom.xml
@@ -119,12 +119,6 @@
<scalafmt>
<file>${project.basedir}/../.scalafmt.conf</file>
</scalafmt>
- <includes>
- <include>src/main/scala/**/*.scala</include>
- <include>src/test/scala/**/*.scala</include>
-
<include>src-delta-${delta.binary.version}/main/scala/**/*.scala</include>
-
<include>src-delta-${delta.binary.version}/test/scala/**/*.scala</include>
- </includes>
</scala>
</configuration>
</plugin>
diff --git
a/gluten-delta/src-delta-20/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala
b/gluten-delta/src-delta20/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala
similarity index 100%
rename from
gluten-delta/src-delta-20/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala
rename to
gluten-delta/src-delta20/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala
diff --git
a/gluten-delta/src-delta-20/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala
b/gluten-delta/src-delta20/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala
similarity index 100%
rename from
gluten-delta/src-delta-20/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala
rename to
gluten-delta/src-delta20/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala
diff --git
a/gluten-delta/src-delta-23/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala
b/gluten-delta/src-delta23/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala
similarity index 100%
rename from
gluten-delta/src-delta-23/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala
rename to
gluten-delta/src-delta23/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala
diff --git
a/gluten-delta/src-delta-23/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala
b/gluten-delta/src-delta23/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala
similarity index 100%
rename from
gluten-delta/src-delta-23/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala
rename to
gluten-delta/src-delta23/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala
diff --git
a/gluten-delta/src-delta-24/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala
b/gluten-delta/src-delta24/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala
similarity index 100%
rename from
gluten-delta/src-delta-24/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala
rename to
gluten-delta/src-delta24/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala
diff --git
a/gluten-delta/src-delta-24/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala
b/gluten-delta/src-delta24/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala
similarity index 100%
rename from
gluten-delta/src-delta-24/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala
rename to
gluten-delta/src-delta24/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala
diff --git
a/gluten-delta/src-delta-33/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala
b/gluten-delta/src-delta33/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala
similarity index 100%
rename from
gluten-delta/src-delta-33/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala
rename to
gluten-delta/src-delta33/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala
diff --git
a/gluten-delta/src-delta-33/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala
b/gluten-delta/src-delta33/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala
similarity index 100%
rename from
gluten-delta/src-delta-33/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala
rename to
gluten-delta/src-delta33/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala
diff --git
a/gluten-delta/src-delta-33/main/scala/org/apache/spark/sql/perf/DeltaOptimizedWriterTransformer.scala
b/gluten-delta/src-delta33/main/scala/org/apache/spark/sql/perf/DeltaOptimizedWriterTransformer.scala
similarity index 100%
rename from
gluten-delta/src-delta-33/main/scala/org/apache/spark/sql/perf/DeltaOptimizedWriterTransformer.scala
rename to
gluten-delta/src-delta33/main/scala/org/apache/spark/sql/perf/DeltaOptimizedWriterTransformer.scala
diff --git a/pom.xml b/pom.xml
index e81cef24ef..dd77c74781 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,7 @@
<scala.version>2.12.15</scala.version>
<spark.major.version>3</spark.major.version>
<sparkbundle.version>3.4</sparkbundle.version>
+ <spark.plain.version>34</spark.plain.version>
<spark.version>3.4.4</spark.version>
<sparkshim.artifactId>spark-sql-columnar-shims-spark34</sparkshim.artifactId>
<iceberg.version>1.5.0</iceberg.version>
@@ -305,6 +306,7 @@
<id>spark-3.2</id>
<properties>
<sparkbundle.version>3.2</sparkbundle.version>
+ <spark.plain.version>32</spark.plain.version>
<sparkshim.artifactId>spark-sql-columnar-shims-spark32</sparkshim.artifactId>
<spark.version>3.2.2</spark.version>
<iceberg.version>1.3.1</iceberg.version>
@@ -319,6 +321,7 @@
<id>spark-3.3</id>
<properties>
<sparkbundle.version>3.3</sparkbundle.version>
+ <spark.plain.version>33</spark.plain.version>
<sparkshim.artifactId>spark-sql-columnar-shims-spark33</sparkshim.artifactId>
<spark.version>3.3.1</spark.version>
<iceberg.version>1.5.0</iceberg.version>
@@ -333,6 +336,7 @@
<id>spark-3.4</id>
<properties>
<sparkbundle.version>3.4</sparkbundle.version>
+ <spark.plain.version>34</spark.plain.version>
<sparkshim.artifactId>spark-sql-columnar-shims-spark34</sparkshim.artifactId>
<spark.version>3.4.4</spark.version>
<iceberg.version>1.7.1</iceberg.version>
@@ -347,6 +351,7 @@
<id>spark-3.5</id>
<properties>
<sparkbundle.version>3.5</sparkbundle.version>
+ <spark.plain.version>35</spark.plain.version>
<sparkshim.artifactId>spark-sql-columnar-shims-spark35</sparkshim.artifactId>
<spark.version>3.5.2</spark.version>
<iceberg.version>1.5.0</iceberg.version>
@@ -460,6 +465,8 @@
<sources>
<source>${project.basedir}/src-celeborn/main/scala</source>
<source>${project.basedir}/src-celeborn/main/java</source>
+
<source>${project.basedir}/src-celeborn-spark${spark.plain.version}/main/scala</source>
+
<source>${project.basedir}/src-celeborn-spark${spark.plain.version}/main/java</source>
</sources>
</configuration>
</execution>
@@ -474,6 +481,9 @@
<resource>
<directory>${project.basedir}/src-celeborn/main/resources</directory>
</resource>
+ <resource>
+
<directory>${project.basedir}/src-celeborn-spark${spark.plain.version}/main/resources</directory>
+ </resource>
</resources>
</configuration>
</execution>
@@ -487,6 +497,8 @@
<sources>
<source>${project.basedir}/src-celeborn/test/scala</source>
<source>${project.basedir}/src-celeborn/test/java</source>
+
<source>${project.basedir}/src-celeborn-spark${spark.plain.version}/test/scala</source>
+
<source>${project.basedir}/src-celeborn-spark${spark.plain.version}/test/java</source>
</sources>
</configuration>
</execution>
@@ -501,6 +513,9 @@
<resource>
<directory>${project.basedir}/src-celeborn/test/resources</directory>
</resource>
+ <resource>
+
<directory>${project.basedir}/src-celeborn-spark${spark.plain.version}/test/resources</directory>
+ </resource>
</resources>
</configuration>
</execution>
@@ -533,6 +548,8 @@
<sources>
<source>${project.basedir}/src-uniffle/main/scala</source>
<source>${project.basedir}/src-uniffle/main/java</source>
+
<source>${project.basedir}/src-uniffle-spark${spark.plain.version}/main/scala</source>
+
<source>${project.basedir}/src-uniffle-spark${spark.plain.version}/main/java</source>
</sources>
</configuration>
</execution>
@@ -547,6 +564,9 @@
<resource>
<directory>${project.basedir}/src-uniffle/main/resources</directory>
</resource>
+ <resource>
+
<directory>${project.basedir}/src-uniffle-spark${spark.plain.version}/main/resources</directory>
+ </resource>
</resources>
</configuration>
</execution>
@@ -560,6 +580,8 @@
<sources>
<source>${project.basedir}/src-uniffle/test/scala</source>
<source>${project.basedir}/src-uniffle/test/java</source>
+
<source>${project.basedir}/src-uniffle-spark${spark.plain.version}/test/scala</source>
+
<source>${project.basedir}/src-uniffle-spark${spark.plain.version}/test/java</source>
</sources>
</configuration>
</execution>
@@ -574,6 +596,9 @@
<resource>
<directory>${project.basedir}/src-uniffle/test/resources</directory>
</resource>
+ <resource>
+
<directory>${project.basedir}/src-uniffle-spark${spark.plain.version}/test/resources</directory>
+ </resource>
</resources>
</configuration>
</execution>
@@ -606,8 +631,12 @@
<sources>
<source>${project.basedir}/src-delta/main/scala</source>
<source>${project.basedir}/src-delta/main/java</source>
-
<source>${project.basedir}/src-delta-${delta.binary.version}/main/scala</source>
-
<source>${project.basedir}/src-delta-${delta.binary.version}/main/java</source>
+
<source>${project.basedir}/src-delta-spark${spark.plain.version}/main/scala</source>
+
<source>${project.basedir}/src-delta-spark${spark.plain.version}/main/java</source>
+
<source>${project.basedir}/src-delta${delta.binary.version}/main/scala</source>
+
<source>${project.basedir}/src-delta${delta.binary.version}/main/java</source>
+
<source>${project.basedir}/src-delta${delta.binary.version}-spark${spark.plain.version}/main/scala</source>
+
<source>${project.basedir}/src-delta${delta.binary.version}-spark${spark.plain.version}/main/java</source>
</sources>
</configuration>
</execution>
@@ -625,7 +654,13 @@
<directory>${project.basedir}/src-delta/main/resources</directory>
</resource>
<resource>
-
<directory>${project.basedir}/src-delta-${delta.binary.version}/main/resources</directory>
+
<directory>${project.basedir}/src-delta-spark${spark.plain.version}/main/resources</directory>
+ </resource>
+ <resource>
+
<directory>${project.basedir}/src-delta${delta.binary.version}/main/resources</directory>
+ </resource>
+ <resource>
+
<directory>${project.basedir}/src-delta${delta.binary.version}-spark${spark.plain.version}/main/resources</directory>
</resource>
</resources>
</configuration>
@@ -640,8 +675,12 @@
<sources>
<source>${project.basedir}/src-delta/test/scala</source>
<source>${project.basedir}/src-delta/test/java</source>
-
<source>${project.basedir}/src-delta-${delta.binary.version}/test/scala</source>
-
<source>${project.basedir}/src-delta-${delta.binary.version}/test/java</source>
+
<source>${project.basedir}/src-delta-spark${spark.plain.version}/test/scala</source>
+
<source>${project.basedir}/src-delta-spark${spark.plain.version}/test/java</source>
+
<source>${project.basedir}/src-delta${delta.binary.version}/test/scala</source>
+
<source>${project.basedir}/src-delta${delta.binary.version}/test/java</source>
+
<source>${project.basedir}/src-delta${delta.binary.version}-spark${spark.plain.version}/test/scala</source>
+
<source>${project.basedir}/src-delta${delta.binary.version}-spark${spark.plain.version}/test/java</source>
</sources>
</configuration>
</execution>
@@ -657,7 +696,13 @@
<directory>${project.basedir}/src-delta/test/resources</directory>
</resource>
<resource>
-
<directory>${project.basedir}/src-delta-${delta.binary.version}/test/resources</directory>
+
<directory>${project.basedir}/src-delta-spark${spark.plain.version}/test/resources</directory>
+ </resource>
+ <resource>
+
<directory>${project.basedir}/src-delta${delta.binary.version}/test/resources</directory>
+ </resource>
+ <resource>
+
<directory>${project.basedir}/src-delta${delta.binary.version}-spark${spark.plain.version}/test/resources</directory>
</resource>
</resources>
</configuration>
@@ -691,6 +736,8 @@
<sources>
<source>${project.basedir}/src-iceberg/main/scala</source>
<source>${project.basedir}/src-iceberg/main/java</source>
+
<source>${project.basedir}/src-iceberg-spark${spark.plain.version}/main/scala</source>
+
<source>${project.basedir}/src-iceberg-spark${spark.plain.version}/main/java</source>
</sources>
</configuration>
</execution>
@@ -705,6 +752,9 @@
<resource>
<directory>${project.basedir}/src-iceberg/main/resources</directory>
</resource>
+ <resource>
+
<directory>${project.basedir}/src-iceberg-spark${spark.plain.version}/main/resources</directory>
+ </resource>
</resources>
</configuration>
</execution>
@@ -718,6 +768,8 @@
<sources>
<source>${project.basedir}/src-iceberg/test/scala</source>
<source>${project.basedir}/src-iceberg/test/java</source>
+
<source>${project.basedir}/src-iceberg-spark${spark.plain.version}/test/scala</source>
+
<source>${project.basedir}/src-iceberg-spark${spark.plain.version}/test/java</source>
</sources>
</configuration>
</execution>
@@ -732,6 +784,9 @@
<resource>
<directory>${project.basedir}/src-iceberg/test/resources</directory>
</resource>
+ <resource>
+
<directory>${project.basedir}/src-iceberg-spark${spark.plain.version}/test/resources</directory>
+ </resource>
</resources>
</configuration>
</execution>
@@ -764,6 +819,8 @@
<sources>
<source>${project.basedir}/src-hudi/main/scala</source>
<source>${project.basedir}/src-hudi/main/java</source>
+
<source>${project.basedir}/src-hudi-spark${spark.plain.version}/main/scala</source>
+
<source>${project.basedir}/src-hudi-spark${spark.plain.version}/main/java</source>
</sources>
</configuration>
</execution>
@@ -778,6 +835,9 @@
<resource>
<directory>${project.basedir}/src-hudi/main/resources</directory>
</resource>
+ <resource>
+
<directory>${project.basedir}/src-hudi-spark${spark.plain.version}/main/resources</directory>
+ </resource>
</resources>
</configuration>
</execution>
@@ -791,6 +851,8 @@
<sources>
<source>${project.basedir}/src-hudi/test/scala</source>
<source>${project.basedir}/src-hudi/test/java</source>
+
<source>${project.basedir}/src-hudi-spark${spark.plain.version}/test/scala</source>
+
<source>${project.basedir}/src-hudi-spark${spark.plain.version}/test/java</source>
</sources>
</configuration>
</execution>
@@ -805,6 +867,9 @@
<resource>
<directory>${project.basedir}/src-hudi/test/resources</directory>
</resource>
+ <resource>
+
<directory>${project.basedir}/src-hudi-spark${spark.plain.version}/test/resources</directory>
+ </resource>
</resources>
</configuration>
</execution>
@@ -1680,6 +1745,66 @@
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-common-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+
<source>${project.basedir}/src-spark${spark.plain.version}/main/java</source>
+
<source>${project.basedir}/src-spark${spark.plain.version}/main/scala</source>
+ </sources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>add-common-resources</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>add-resource</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+
<directory>${project.basedir}/src-spark${spark.plain.version}/main/resources</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>add-common-test-sources</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+
<source>${project.basedir}/src-spark${spark.plain.version}/test/scala</source>
+
<source>${project.basedir}/src-spark${spark.plain.version}/test/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>add-common-test-resources</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>add-test-resource</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+
<directory>${project.basedir}/src-spark${spark.plain.version}/test/resources</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
