[GLUTEN-13003][MINOR] Drop dead Spark 3.3 and 3.2 residue from tests, helpers and comments - #13005
Open
LuciferYang wants to merge 2 commits into
Open
[GLUTEN-13003][MINOR] Drop dead Spark 3.3 and 3.2 residue from tests, helpers and comments#13005LuciferYang wants to merge 2 commits into
LuciferYang wants to merge 2 commits into
Conversation
… helpers and comments
|
Run Gluten Clickhouse CI on x86 |
Contributor
There was a problem hiding this comment.
🔵 Needs a closer look
The broad cleanup spans source, tests, documentation, and many deleted fixtures, warranting final human verification.
Pull request overview
This pull request removes obsolete Spark 3.2/3.3 residue from tests, helpers, comments, documentation, and Bolt fixtures.
Changes:
- Removes unreachable version branches and unused helpers/settings.
- Updates stale compatibility comments and documentation.
- Deletes uncompiled Spark 3.2/3.3 test settings and approved plans.
File summaries
| File | Reviewed change / note |
|---|---|
shims/spark41/src/main/java/org/apache/spark/sql/execution/vectorized/WritableColumnVectorShim.java |
Updates version rationale comments. |
shims/spark40/src/main/java/org/apache/spark/sql/execution/vectorized/WritableColumnVectorShim.java |
Updates version rationale comments. Nit (1 vote): make the subject explicit; “Their set” is grammatically incorrect. |
shims/spark35/src/main/java/org/apache/spark/sql/execution/vectorized/WritableColumnVectorShim.java |
Updates version rationale comments. Nit (1 vote): make the subject explicit; “Their set” is grammatically incorrect. |
shims/spark34/src/main/java/org/apache/spark/sql/execution/vectorized/WritableColumnVectorShim.java |
Updates version rationale comments. Nit (1 vote): make the subject explicit; “Their set” is grammatically incorrect. |
gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala |
Removes obsolete commented test configuration. |
gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/bolt/BoltTestSettings.scala |
Removes obsolete commented test configuration. |
gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/bolt/BoltSQLQueryTestSettings.scala |
Deletes uncompiled Spark 3.3 settings. |
gluten-substrait/src/test/scala/org/apache/spark/sql/GlutenQueryTest.scala |
Removes unused test helpers. |
gluten-substrait/src/main/scala/org/apache/gluten/execution/SparkDataSourceRDDPartition.scala |
Corrects class documentation. |
gluten-substrait/src/main/scala/org/apache/gluten/backendsapi/BackendSettingsApi.scala |
Removes the unused decimal-rescaling setting. |
docs/get-started/VeloxIceberg.md |
Corrects supported Spark version documentation. |
backends-velox/src/test/scala/org/apache/spark/sql/execution/VeloxLocalCacheSuite.scala |
Removes a duplicate version argument. |
backends-velox/src/test/scala/org/apache/gluten/execution/VeloxHashJoinSuite.scala |
Removes a dead Spark 3.3 branch. |
backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala |
Removes a stale Spark comment. |
backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxBackend.scala |
Removes an obsolete override. |
backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHSparkPlanExecApi.scala |
Removes a stale Spark comment. |
backends-bolt/src/test/scala/org/apache/spark/sql/execution/BoltParquetWriteForHiveSuite.scala |
Removes dead tests and unreachable version branches. |
backends-bolt/src/test/scala/org/apache/spark/sql/execution/BoltLocalCacheSuite.scala |
Removes a duplicate version argument. |
backends-bolt/src/test/scala/org/apache/gluten/functions/ArithmeticAnsiValidateSuite.scala |
Removes an unreachable version branch. |
backends-bolt/src/test/scala/org/apache/gluten/execution/MiscOperatorSuite.scala |
Removes Spark 3.2-only behavior. |
backends-bolt/src/test/resources/tpch-approved-plan/v1/spark33/6.txt |
Deletes the obsolete Spark 3.3 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1/spark32/6.txt |
Deletes the obsolete Spark 3.2 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1/spark32/4.txt |
Deletes the obsolete Spark 3.2 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-ras/spark33/6.txt |
Deletes the obsolete Spark 3.3 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-ras/spark32/6.txt |
Deletes the obsolete Spark 3.2 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-ras/spark32/4.txt |
Deletes the obsolete Spark 3.2 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-bhj/spark33/6.txt |
Deletes the obsolete Spark 3.3 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-bhj/spark33/4.txt |
Deletes the obsolete Spark 3.3 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-bhj/spark33/17.txt |
Deletes the obsolete Spark 3.3 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-bhj/spark33/13.txt |
Deletes the obsolete Spark 3.3 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-bhj/spark32/6.txt |
Deletes the obsolete Spark 3.2 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-bhj/spark32/4.txt |
Deletes the obsolete Spark 3.2 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-bhj/spark32/22.txt |
Deletes the obsolete Spark 3.2 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-bhj/spark32/17.txt |
Deletes the obsolete Spark 3.2 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-bhj/spark32/13.txt |
Deletes the obsolete Spark 3.2 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/6.txt |
Deletes the obsolete Spark 3.3 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/4.txt |
Deletes the obsolete Spark 3.3 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/17.txt |
Deletes the obsolete Spark 3.3 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/13.txt |
Deletes the obsolete Spark 3.3 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/6.txt |
Deletes the obsolete Spark 3.2 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/4.txt |
Deletes the obsolete Spark 3.2 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/22.txt |
Deletes the obsolete Spark 3.2 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/17.txt |
Deletes the obsolete Spark 3.2 approved plan. |
backends-bolt/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/13.txt |
Deletes the obsolete Spark 3.2 approved plan. |
backends-bolt/src/main/scala/org/apache/gluten/extension/CudfNodeValidationRule.scala |
Uses the supported TreeNode.exists API. |
backends-bolt/src/main/scala/org/apache/gluten/execution/RowToBoltColumnarExec.scala |
Removes a stale comment. |
backends-bolt/src/main/scala/org/apache/gluten/backendsapi/bolt/BoltBackend.scala |
Removes an obsolete override. |
Review details
- Files reviewed: 61/192 changed files
- Comments generated: 0
- Review effort level: Lite
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changes are proposed in this pull request?
Residue from #12902 that guards on Spark 3.3 or 3.2, in code that no supported version reaches. Most of it is in
backends-bolt, because #12454 branched before #12954 and merged between #12954 and #12981, so it carried the old patterns back in after the first cleanup and before the second one, which touched no bolt file.Never registered on any supported version:
BoltParquetWriteForHiveSuite.scala:409usedtestWithMaxSparkVersion(..., "3.3"), so the case ran nowhere and was not reported as skipped either, since the helper just declines to calltest(). #12981 deleted the same case from the velox copy of that suite, and for a reason that applies here too: what made the codec stick was Gluten's ownHiveFileFormatoverride, which lived only inshims/spark32andshims/spark33, and no copy of that file is left in the tree.Branches that cannot be taken: five
isSparkVersionGE("3.4")guards in that same file,ArithmeticAnsiValidateSuite.scala:64,MiscOperatorSuite.scala:962in bolt onstartsWith("3.2"), and the deadstartsWith("3.3.")half of a disjunction inVeloxHashJoinSuite.scala:120, where thestartsWith("3.4.")half stays because it still varies.Helpers and settings with no callers:
ignoreWithSpecifiedSparkVersionandtestWithRangeSparkVersioninGlutenQueryTest.scala, andBackendSettingsApi.rescaleDecimalArithmeticwith its two overrides. That last one is named after the decimal rescale path #12991 removes, and it had no reader before that either.An obsolete workaround:
CudfNodeValidationRule.scala:35walked the plan withfind { ... }.isDefinedunder a comment sayingSpark3.2 does not have exists.TreeNode.existsis on every supported version and already used inValidators.scalaandImplementJoinAggregate.scala.Files nothing compiles:
gluten-ut/spark33/holds two bolt test-settings files and nopom.xml, andbackends-bolt/src/test/resources/tpch-approved-plan/*/spark33/holds 84 approved plans, with another 84 under*/spark32/.gluten-ut/pom.xmllists onlyspark34/35/40/41, so none of the Scala is built, thoughscala_code_format.ymltriggers ongluten-ut/**and still formats it. That is the bulk of the diffstat.Worth flagging separately, because it is a bolt question rather than something to settle here: the only reader of
tpch-approved-plananywhere isVeloxTPCHSuite.scala:105, and it resolves the path relative to the running module. There is no bolt TPC-H suite, so thespark34andspark35copies underbackends-bolthave no reader either. They stay, since a bolt suite may be the intent. AlsoBoltParquetWriteForHiveSuite.scala:285evaluates"zstd".equalsIgnoreCase(column.getCodec.toString)and discards it: the missingassertis pre-existing, but with the 3.3-only case gone nothing in that file checks the written codec any more.Four comments that had become wrong rather than merely old:
SparkDataSourceRDDPartitionsaid it exists to stay compatible with 3.3 and earlier, when what actually distinguishes it from Spark's class is that it holds the several input partitions Gluten groups into one split; the four copies ofWritableColumnVectorShimnamed a 3.3 abstract-method addition as the reason the file is per-version, when the copies now split {3.4, 3.5} against {4.0, 4.1} over something else. Also// Since spark 3.3.0in two backends,// For spark 3.2.in one, a commented-outenableSuiteunder// following UT is removed in spark3.3.1, a duplicated"3.5", "3.5"argument in two cache suites left over from a merge fix in #9297, andAll the spark version is supportedinVeloxIceberg.md.Deliberately left alone: the
// new added in spark-3.3 and need fix later, random failure may caused by memory freenotes in the gluten-ut settings and theFor Spark 3.3 + Delta 2.3notes in the clickhouse tests. Only the version prefix has aged; the rest of each sentence is still the reason the exclusion or the expected file count is there, and rewording someone else's note across sixteen files buys nothing.How was this patch tested?
clean test-compileon Spark 3.4, 3.5, 4.0 and 4.1 with-Pbackends-velox -Pspark-ut -Piceberg -Pdelta, Scala 2.13, and the 3.5 run adds-Pbackends-clickhouse, that being the only profile clickhouse builds on.spotless:applyproduced no changes beyond the edits.The bolt files needed a detour, since bolt does not compile on main right now: I stacked #12999 on top of this branch, ran
test-compile -Pbackends-bolt -Pspark-uton 3.4 and 3.5, then dropped it, so what is pushed here is this change alone.No suite was run. Every collapsed branch keeps the arm a supported version already took, and the deleted files are not on any compile or test path. The bolt paths cannot be run here in any case: bolt's native library needs Linux plus GCC 10-12 or Clang 16 per
docs/bolt-quick-start.md.Was this patch authored or co-authored using generative AI tooling?
Generated-by: Claude claude-opus-5
Related issue: #13003