Fix UC setup cache key collisions and local Spark-version switching#6866
Open
yili-db wants to merge 6 commits into
Open
Fix UC setup cache key collisions and local Spark-version switching#6866yili-db wants to merge 6 commits into
yili-db wants to merge 6 commits into
Conversation
5 tasks
yili-db
force-pushed
the
stack/bump_uc_sha
branch
5 times, most recently
from
a2812f4 to
c36c0e2
Compare
5 tasks
yili-db
force-pushed
the
stack/bump_uc_sha
branch
from
c36c0e2 to
a81610d
Compare
Collaborator
Author
|
This is achieving the same goal as #6824. But this PR produces better functionality in terms of cache usability and Spark version switch in local dev workflow. |
yili-db
force-pushed
the
stack/bump_uc_sha
branch
from
a81610d to
a36e7a1
Compare
yili-db
force-pushed
the
stack/bump_uc_sha
branch
2 times, most recently
from
5910829 to
9501147
Compare
yili-db
requested review from
TimothyW553,
huan233usc and
raveeram-db
as code owners
5 tasks
yili-db
force-pushed
the
stack/bump_uc_sha
branch
2 times, most recently
from
e89fa4b to
11a3e61
Compare
3 tasks
openinx
pushed a commit
that referenced
this pull request
May 26, 2026
## 🥞 Stacked PR Use this [link](https://github.com/delta-io/delta/pull/6870/files) to review incremental changes. - [**stack/spark42-preview**](#6870) [[Files changed](https://github.com/delta-io/delta/pull/6870/files)] - [stack/bump_uc_sha](#6866) [[Files changed](https://github.com/delta-io/delta/pull/6866/files/046318c601ad27e6edbb069fba558bff95b047e5..11a3e61ca79e90de45ee2252c2cefc06d6ec5ebb)] - [stack/DeltaCatalogClient_create](#6826) [[Files changed](https://github.com/delta-io/delta/pull/6826/files/11a3e61ca79e90de45ee2252c2cefc06d6ec5ebb..8a63fe4049beb49bf93f4d1b3a308b56ca5a273f)] - [stack/DeltaCatalogClient_replace](#6859) [[Files changed](https://github.com/delta-io/delta/pull/6859/files/8a63fe4049beb49bf93f4d1b3a308b56ca5a273f..0c5b785015d413cd9c026cd1091cf7f3d457f5f6)] --------- #### Which Delta project/connector is this regarding? - [x] Spark - [ ] Standalone - [ ] Flink - [ ] Kernel - [ ] Other (fill in here) ## Description [Build] Pin Spark 4.2 lane to 4.2.0-preview5 - `CrossSparkVersions.scala`: `4.2.0-SNAPSHOT` -> `4.2.0-preview5`; drop jitpack. - `get_spark_version_info.py`: `--released-spark-versions` explicitly excludes `-SNAPSHOT` / `-preview` markers. - `test_cross_spark_publish.py`: bump pinned version; widen version regex to accept `-previewN`; mirror the explicit pre-release marker check. - `spark_test.yaml`: comment "snapshot" -> "preview". - `DeltaChangelogTestBase.java`: widen the existing SNAPSHOT-only skip to also skip `-preview` (known `DeltaCatalog`/`AbstractDeltaCatalog` classpath bug in sparkV2). - `DeltaParquetFormatVersionSuite.scala`: widen the SPARK-56414 SNAPSHOT-only `assume` to also skip `-preview` (Delta's `DeltaFileFormatWriter` does not yet merge per-write options). ## How was this patch tested? CI ## Does this PR introduce _any_ user-facing changes? No Signed-off-by: Yi Li <yi.li@databricks.com>
yili-db
force-pushed
the
stack/bump_uc_sha
branch
from
11a3e61 to
8bf766a
Compare
yili-db
changed the title
yili-db
force-pushed
the
stack/bump_uc_sha
branch
2 times, most recently
from
1912aa8 to
3a4f0c7
Compare
yili-db
force-pushed
the
stack/bump_uc_sha
branch
from
3a4f0c7 to
a7e06b4
Compare
5 tasks
yili-db
force-pushed
the
stack/bump_uc_sha
branch
3 times, most recently
from
3a93266 to
61d8d7a
Compare
Signed-off-by: Yi Li <yi.li@databricks.com>
Signed-off-by: Yi Li <yi.li@databricks.com>
Signed-off-by: Yi Li <yi.li@databricks.com>
Signed-off-by: Yi Li <yi.li@databricks.com>
yili-db
force-pushed
the
stack/bump_uc_sha
branch
from
61d8d7a to
32d1c1f
Compare
Signed-off-by: Yi Li <yi.li@databricks.com>
Signed-off-by: Yi Li <yi.li@databricks.com>
yili-db
force-pushed
the
stack/bump_uc_sha
branch
from
32d1c1f to
d6ef81b
Compare
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
1 participant
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.
🥞 Stacked PR
Use this link to review incremental changes.
Which Delta project/connector is this regarding?
Description
Fix UC setup cache key collisions and local Spark-version switching
Cache key usability:
SPARK_VERSIONinsetup-unitycatalog/action.ymlso 4.0 and 4.1 stop fighting over one entrydelta-sbt-cache-cross-sparkkey so script bumps invalidate the cross-Spark sbt cacheLocal dev (switching Spark versions doesn't break):
ensurePinnedUnityCatalogcanary from client/server (Spark-independent) to the spark artifact, so switching active Spark version re-triggers publish instead of short-circuitingpublishLocalConfiguration/publishM2ConfigurationwithwithOverwrite(true)per project so re-publishing for a different Spark version doesn't fail on existing client/server/hadoop artifactsHow was this patch tested?
CI
Does this PR introduce any user-facing changes?
No