Skip to content

Merge release/26.08 into main - #15423

Merged
nvliyuan merged 2 commits into
NVIDIA:mainfrom
sameerz:fix-auto-merge-conflict-15412
Jul 30, 2026
Merged

Merge release/26.08 into main#15423
nvliyuan merged 2 commits into
NVIDIA:mainfrom
sameerz:fix-auto-merge-conflict-15412

Conversation

@sameerz

@sameerz sameerz commented Jul 29, 2026

Copy link
Copy Markdown
Collaborator

Contributes to #15107

Description

Address merge conflict in #15412

Checklists

Documentation

  • Updated for new or modified user-facing features or behaviors
  • No user-facing change

Testing

  • Added or modified tests to cover new code paths
  • Covered by existing tests
    (Please provide the names of the existing tests in the PR description.)
  • Not required

Performance

  • Tests ran and results are added in the PR description
  • Issue filed with a link in the PR description
  • Not required

Signed-off-by: Sameer Raheja <sraheja@.nvidia.com>
@sameerz
sameerz requested a review from a team as a code owner July 29, 2026 17:42
@sameerz sameerz added the documentation Improvements or additions to documentation label Jul 29, 2026
Comment on lines +59 to +66
ExprChecks.unaryProjectInputMatchesOutput(TypeSig.all, TypeSig.all),
(check, conf, parent, rule) =>
new UnaryExprMeta[CheckOverflowInTableWrite](check, conf, parent, rule) {
override def convertToGpu(child: Expression): GpuExpression = child match {
case cast: GpuCast => GpuCheckOverflowInTableWrite(cast, check.columnName)
case _ =>
throw new IllegalStateException("Expression child is not of type GpuCast")
}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Unsupported casts crash planning

When CheckOverflowInTableWrite wraps a cast that is disabled or unsupported on GPU, the unrestricted parent rule proceeds to conversion with a non-GpuCast child and throws IllegalStateException, causing the Delta write to fail during planning instead of falling back to CPU.

Knowledge Base Used:

@greptile-apps

greptile-apps Bot commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

Greptile Summary

This release-branch merge primarily completes the project rename and adds DBR 17.3 Delta write support.

  • Renames user-facing references and repository links from RAPIDS Accelerator/spark-rapids to NVIDIA cuDF plugin/cudf-spark.
  • Registers GPU handling for DBR 17.3 Delta table-write overflow checks.
  • Updates integration tests, configuration metadata, type checks, and synchronized Maven build files.

Confidence Score: 5/5

The PR appears safe to merge.

No blocking failure remains.

Important Files Changed

Filename Overview
delta-lake/delta-spark400db173/src/main/scala/com/databricks/sql/transaction/tahoe/rapids/GpuCheckOverflowInTableWrite.scala Adds the DBR 17.3 GPU expression that preserves Delta-specific overflow error reporting during table-write casts.
delta-lake/delta-spark400db173/src/main/scala/com/nvidia/spark/rapids/delta/DeltaSpark400DB173Provider.scala Registers the new overflow-check expression rule with the DBR 17.3 Delta provider.
sql-plugin/src/main/scala/com/nvidia/spark/rapids/RapidsConf.scala Updates configuration metadata and documentation associated with the release merge.
sql-plugin/src/main/scala/com/nvidia/spark/rapids/TypeChecks.scala Updates expression type-checking support without leaving an eligible follow-up defect.
integration_tests/src/main/python/delta_lake_merge_test.py Updates Delta merge integration coverage for the merged release behavior.
integration_tests/src/main/python/orc_test.py Updates ORC integration coverage as part of the release merge.
pom.xml Merges build metadata changes that are synchronized with the Scala 2.13 build.
scala2.13/pom.xml Keeps the Scala 2.13 Maven configuration aligned with the primary build.

Reviews (2): Last reviewed commit: "Merge branch 'main' into fix-auto-merge-..." | Re-trigger Greptile

@sameerz

sameerz commented Jul 29, 2026

Copy link
Copy Markdown
Collaborator Author

build

@nvliyuan
nvliyuan merged commit 9af44c6 into NVIDIA:main Jul 30, 2026
55 of 56 checks passed
nvliyuan added a commit that referenced this pull request Jul 30, 2026
Resolves the latest merge conflicts in #15412 after #15423 merged.

### Description

Merge the current `release/26.08` head into the current `main` head.

The initial conflicts were the root and Scala 2.13 project versions.
Both were resolved by retaining main's `26.10.0-SNAPSHOT` version
instead of the release branch's `26.08.0-SNAPSHOT` version.

The branch was refreshed again after additional PRs landed on
`release/26.08`. The current diff includes all release updates added
after #15423, including:
- #15413 — preserve Spark 4.2 BroadcastHashJoin `isSkewJoin`
- #15422 — fix Iceberg REST S3 path regression coverage
- #15368 — OSS Delta deletion-vector updates
- #15411 — fix OSS Delta RTAS on Spark 4.x+
- #15416 — match Spark 4.2 `date_trunc` overflow behavior

### Checklists

Documentation
- [ ] Updated for new or modified user-facing features or behaviors
- [x] No user-facing change

Testing
- [ ] Added or modified tests to cover new code paths
- [x] Covered by existing tests
      (The included release commits retain their original tests.)
- [ ] Not required

Performance
- [ ] Tests ran and results are added in the PR description
- [ ] Issue filed with a link in the PR description
- [x] Not required

### Validation

- `git diff --check`
- Parsed both initially resolved POM files as XML
- `python3 -m py_compile` for the modified Iceberg, Delta, and date-time
integration tests

IMPORTANT: Merge this PR using **Create a merge commit** so the release
commit ancestry is preserved and #15412 can close automatically.

---------

Signed-off-by: Sameer Raheja <sraheja@.nvidia.com>
Signed-off-by: Rahul Prabhu <raprabhu@nvidia.com>
Signed-off-by: Chong Gao <chongg@nvidia.com>
Signed-off-by: Firestarman <firestarmanllc@gmail.com>
Signed-off-by: Ray Liu <liurenjie2008@gmail.com>
Signed-off-by: liyuan <yuali@nvidia.com>
Signed-off-by: Jihoon Son <ghoonson@gmail.com>
Signed-off-by: Niranjan Artal <nartal@nvidia.com>
Co-authored-by: Sameer Raheja <sameerz@users.noreply.github.com>
Co-authored-by: Sameer Raheja <sraheja@.nvidia.com>
Co-authored-by: Gary Shen <gashen@nvidia.com>
Co-authored-by: Rahul Prabhu <100436830+sdrp713@users.noreply.github.com>
Co-authored-by: Chong Gao <chongg@nvidia.com>
Co-authored-by: Chong Gao <res_life@163.com>
Co-authored-by: Liangcai Li <firestarmanllc@gmail.com>
Co-authored-by: Renjie Liu <liurenjie2008@gmail.com>
Co-authored-by: Jihoon Son <ghoonson@gmail.com>
Co-authored-by: Niranjan Artal <50492963+nartal1@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants