[UniForm][Prototype][DON'T REVIEW] Support conflict resolution end to end#6901
Open
ChengJiX wants to merge 8 commits into
Open
[UniForm][Prototype][DON'T REVIEW] Support conflict resolution end to end#6901ChengJiX wants to merge 8 commits into
ChengJiX wants to merge 8 commits into
Conversation
…ath (delta-io#6830) <!-- Thanks for sending a pull request! Here are some tips for you: 1. If this is your first time, please read our contributor guidelines: https://github.com/delta-io/delta/blob/master/CONTRIBUTING.md 2. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP] Your PR title ...'. 3. Be sure to keep the PR description updated to reflect all changes. 4. Please write your PR title to summarize what this PR proposes. 5. If possible, provide a concise example to reproduce the issue for a faster review. 6. If applicable, include the corresponding issue number in the PR title and link it in the body. --> #### Which Delta project/connector is this regarding? - [x] Spark - [ ] Standalone - [ ] Flink - [ ] Kernel - [ ] Other (fill in here) ## Description Move the changelog tests to `spark-unified/test` as we had a circular dependency in the tests from sparkV2 to spark-unified and from spark-unified to sparkV2. Fixes the `ClassCastException` at `AbstractDeltaCatalog.scala:1118`. ## How was this patch tested? See "How I build" at the bottom for the full command. Ran `DeltaChangelogTestBase.java`. Result on Spark 4.2-preview4: ``` [info] Passed: Total 21, Failed 0, Errors 0, Passed 21 [success] Total time: 76 s ``` Furthermore ran my tests in private repo CI https://github.com/SanJSp/delta/actions/runs/26287328831/job/77378150469?pr=2 ## Does this PR introduce _any_ user-facing changes? No. The two small Java edits in `DeltaChangelogScanBuilder.java` and `DeltaChangelogBatch.java` affect the V2 changelog code path's error-reporting (which error class surfaces to the user when row tracking is misconfigured), but the V2 changelog path remains gated behind `spark.databricks.delta.changelogV2.enabled` and is not used in any released code path today. <details><summary>How I build</summary> ## Quick reference: minimal cherry-pick to build + test against Spark 4.2 Verified: **21 / 21 changelog tests pass** with this setup. Without PR delta-io#6657, compile fails on Spark 4.2 ABI shifts. Without this PR (delta-io#6830), tests fail at the first `spark.sql(...)` call with `ClassCastException` from `SupportsPathIdentifier`, followed by `NoSuchMethodError: CatalogStorageFormat.copy(6 args)` once that cast is fixed. ```bash # Start from upstream master git fetch delta_oss_upstream git checkout -b test-changelog-spark42 delta_oss_upstream/master # Pull PR delta-io#6657 (Spark 4.2 ABI shims, 25+ commits from Murali + Vishnu) git fetch delta_oss_upstream pull/6657/head:pr-6657 git merge --no-ff --no-edit pr-6657 # Pull PR delta-io#6830 (this PR — changelog test classpath + 3 fixes + CI scoping) git fetch delta_oss_upstream pull/6830/head:pr-6830 git merge --no-ff --no-edit pr-6830 # Local-only edits in project/CrossSparkVersions.scala (do NOT commit; the # maven proxy does not mirror Apache snapshots, so the SNAPSHOT pin from # PR delta-io#6657 has to be swapped for a released preview): sed -i 's|fullVersion = "4.2.0-SNAPSHOT"|fullVersion = "4.2.0-preview4"|' \ project/CrossSparkVersions.scala sed -i 's|val MASTER: Option\[SparkVersionSpec\] = None|val MASTER: Option[SparkVersionSpec] = Some(spark42Snapshot)|' \ project/CrossSparkVersions.scala sed -i 's|val ALL_SPECS = Seq(spark40, spark41)$|val ALL_SPECS = Seq(spark40, spark41, spark42Snapshot)|' \ project/CrossSparkVersions.scala # Build + test JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 \ PATH=/usr/lib/jvm/java-17-openjdk-amd64/bin:$PATH \ MAVEN_PROXY_URL=https://maven-proxy.dev.databricks.com \ MAVEN_MIRROR_URL=https://maven-proxy.dev.databricks.com \ DEFAULT_ARTIFACT_REPOSITORY=https://maven-proxy.dev.databricks.com \ ./build/sbt -DsparkVersion=master \ "set every scalastyleFailOnError := false" \ "spark/testOnly io.delta.spark.internal.v2.read.changelog.*" ``` Expected: ``` [info] Passed: Total 21, Failed 0, Errors 0, Passed 21 [success] Total time: ~80 s ``` The `DeltaChangelogTestBase.java` conflict from the PR delta-io#6657 merge has to be resolved with `git rm` (PR delta-io#6830 deletes the file from `sparkV2/test`, PR delta-io#6657 modifies it): ```bash # If the merge of pr-6830 reports a CONFLICT (modify/delete) on DeltaChangelogTestBase.java: git rm spark/v2/src/test/scala-shims/spark-4.2/io/delta/spark/internal/v2/read/changelog/DeltaChangelogTestBase.java git commit --no-edit ``` --- </details>
<!-- Thanks for sending a pull request! Here are some tips for you: 1. If this is your first time, please read our contributor guidelines: https://github.com/delta-io/delta/blob/master/CONTRIBUTING.md 2. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP] Your PR title ...'. 3. Be sure to keep the PR description updated to reflect all changes. 4. Please write your PR title to summarize what this PR proposes. 5. If possible, provide a concise example to reproduce the issue for a faster review. 6. If applicable, include the corresponding issue number in the PR title and link it in the body. --> #### Which Delta project/connector is this regarding? <!-- Please add the component selected below to the beginning of the pull request title For example: [Spark] Title of my pull request --> - [ ] Spark - [ ] Standalone - [ ] Flink - [ ] Kernel - [x] Other (Iceberg) ## Description <!-- - Describe what this PR changes. - Describe why we need the change. If this PR resolves an issue be sure to include "Resolves #XXX" to correctly link and close the issue upon merge. --> This bump Iceberg from 1.10.1 to 1.11.0 and also updates custom classes to their respective version from upstream ## How was this patch tested? existing tests <!-- If tests were added, say they were added here. Please make sure to test the changes thoroughly including negative and positive cases if possible. If the changes were tested in any way other than unit tests, please clarify how you tested step by step (ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future). If the changes were not tested, please explain why. --> ## Does this PR introduce _any_ user-facing changes? <!-- If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible. If possible, please also clarify if this is a user-facing change compared to the released Delta Lake versions or within the unreleased branches such as master. If no, write 'No'. --> No
ChengJiX
requested review from
TimothyW553,
huan233usc,
murali-db,
raveeram-db and
tdas
as code owners
ChengJiX
changed the title
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
3 participants
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.
Which Delta project/connector is this regarding?
Description
How was this patch tested?
Does this PR introduce any user-facing changes?