[MINOR][CH] Remove orphan Spark 3.2 / Delta 2.0 source directories#12524
Conversation
The `<delta.binary.version>20</delta.binary.version>` property lived only in the `spark-3.2` Maven profile, which was removed by apache#11351. Since then, `src-delta20/` under both `backends-clickhouse/` and `gluten-delta/` has been unreachable dead code: - No profile currently sets `delta.binary.version=20` (spark-3.3 -> 23, spark-3.4 -> 24, spark-3.5 -> 33, spark-4.0/4.1 -> 40). - No CI job, doc, or script activates the directories. - Every deleted class has a live replacement in `src-delta23/` and `src-delta33/` (and, for `gluten-delta`, `src-delta24/` / `src-delta40/` as well), so no user-visible symbol is lost. Verified with a clean rebuild on spark-3.3 + backends-clickhouse + delta.
|
@jackylee-ch Could you help find someone to review this? Thank ~ |
|
Run Gluten Clickhouse CI on x86 |
There was a problem hiding this comment.
Pull request overview
This PR removes now-unreachable Spark 3.2 / Delta 2.0 (“delta20”) source directories from the ClickHouse backend and gluten-delta module, following the prior removal of the Spark 3.2 Maven profile. The change reduces maintenance surface area by deleting dead code paths that are no longer selectable via any build profile.
Changes:
- Delete
backends-clickhouse/src-delta20/implementation and tests (Delta 2.0–specific overrides and ClickHouse/Delta integration shims). - Delete
gluten-delta/src-delta20/Delta 2.0 SparkPlan transformer stubs and DV scan placeholder. - Remove the Delta 2.0 shim ServiceLoader entry tied to the deleted delta20 implementation.
Reviewed changes
Copilot reviewed 28 out of 28 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| gluten-delta/src-delta20/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala | Remove unused Delta 2.0 SparkPlan transformer source (dead by build profile). |
| gluten-delta/src-delta20/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala | Remove unused Delta 2.0 SparkPlan transformer source (dead by build profile). |
| gluten-delta/src-delta20/main/scala/org/apache/gluten/delta/DeltaDeletionVectorScanInfo.scala | Remove unused Delta 2.0 DV scan helper stub. |
| backends-clickhouse/src-delta20/test/scala/org/apache/spark/gluten/delta/DeltaStatsUtils.scala | Remove unused Delta 2.0 ClickHouse backend test utility. |
| backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/source/DeltaMergeTreeFileFormat.scala | Remove unused Delta 2.0 MergeTree file format adapter. |
| backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/metadata/AddFileTags.scala | Remove unused Delta 2.0 AddFile tag/parts conversion utilities. |
| backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseSparkCatalog.scala | Remove unused Delta 2.0 Spark catalog extension integration. |
| backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseDataSource.scala | Remove unused Delta 2.0 DataSource v1 integration. |
| backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/execution/CHDeltaColumnarWrite.scala | Remove unused Delta 2.0 CH delta columnar write stub. |
| backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/Snapshot.scala | Remove unused Delta 2.0 Snapshot override implementation. |
| backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/rules/CHOptimizeMetadataOnlyDeltaQuery.scala | Remove unused Delta 2.0 metadata-only optimize rule stub. |
| backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/files/MergeTreeDelayedCommitProtocol.scala | Remove unused Delta 2.0 delayed commit protocol implementation. |
| backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/DeltaLog.scala | Remove unused Delta 2.0 DeltaLog override implementation. |
| backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/DeltaAdapter.scala | Remove unused Delta 2.0 adapter shim implementation. |
| backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/commands/VacuumCommand.scala | Remove unused Delta 2.0 Vacuum command override implementation. |
| backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/commands/UpdateCommand.scala | Remove unused Delta 2.0 Update command implementation. |
| backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/commands/OptimizeTableCommandOverwrites.scala | Remove unused Delta 2.0 Optimize command overwrite helpers. |
| backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/commands/OptimizeTableCommand.scala | Remove unused Delta 2.0 Optimize command implementation. |
| backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/commands/MergeIntoCommand.scala | Remove unused Delta 2.0 MergeInto command implementation. |
| backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/commands/DeleteCommand.scala | Remove unused Delta 2.0 Delete command implementation. |
| backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala | Remove unused Delta 2.0 ClickHouse optimistic transaction implementation. |
| backends-clickhouse/src-delta20/main/scala/org/apache/spark/sql/delta/catalog/ClickHouseTableV2.scala | Remove unused Delta 2.0 ClickHouseTableV2 implementation. |
| backends-clickhouse/src-delta20/main/scala/org/apache/gluten/sql/shims/delta20/Delta20Shims.scala | Remove unused Delta 2.0 shim class. |
| backends-clickhouse/src-delta20/main/scala/org/apache/gluten/sql/shims/delta20/Delta20ShimProvider.scala | Remove unused Delta 2.0 shim provider. |
| backends-clickhouse/src-delta20/main/scala/org/apache/gluten/parser/GlutenClickhouseSqlParser.scala | Remove unused Delta 2.0 ClickHouse SQL parser implementation. |
| backends-clickhouse/src-delta20/main/scala/org/apache/gluten/parser/GlutenCacheFilesSqlParser.scala | Remove unused Delta 2.0 cache-files SQL parser implementation. |
| backends-clickhouse/src-delta20/main/scala/io/delta/tables/ClickhouseTable.scala | Remove unused Delta 2.0 ClickhouseTable wrapper. |
| backends-clickhouse/src-delta20/main/resources/META-INF/services/org.apache.gluten.sql.shims.DeltaShimProvider | Remove ServiceLoader entry for the deleted Delta 2.0 shim provider. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
@zzcclp @loneylee @taiyang-li @lgbo-ustc. could you help to confirm the change for clickhouse backend? |
|
Thanks @zzcclp @zhztheplayer for help. |
|
Thanks @jackylee-ch @zzcclp @zhztheplayer |
What changes were proposed in this pull request?
The
<delta.binary.version>20</delta.binary.version>property lived only in thespark-3.2Maven profile, which was removed by #11351. Since then,src-delta20/under bothbackends-clickhouse/andgluten-delta/has been unreachable dead code:delta.binary.version=20(spark-3.3→ 23,spark-3.4→ 24,spark-3.5→ 33,spark-4.0/spark-4.1→ 40).src-delta23/andsrc-delta33/(and, forgluten-delta,src-delta24//src-delta40/as well), so no user-visible symbol is lost.This PR deletes 28 files, 6499 LOC:
backends-clickhouse/src-delta20/(25 files)gluten-delta/src-delta20/(3 files)How was this patch tested?
Verified with a clean rebuild on
spark-3.3+backends-clickhouse+deltaprofile (the minimum supported Spark version). Baselineupstream/mainbuilds green pre-deletion; post-deletion also builds green.