Commit ced237d
authored
Fix OSS Delta RTAS on Spark 4.x+ [databricks] (#15411)
Fixes #15394
### Description
On OSS Spark 4.0 with Delta Lake 4.0, `CREATE OR REPLACE TABLE ... USING
DELTA AS SELECT ...` succeeds on CPU but fails on GPU with:
```text
[UNSUPPORTED_FEATURE.TABLE_OPERATION] Table ... does not support truncate in batch mode
```
Spark 4 plans RTAS as an unconditional `OverwriteByExpression`. Its
table capability check therefore requires the staged table to support
`TRUNCATE`.
The RAPIDS staged Delta table advertised only `V1_BATCH_WRITE`, and its
write builder did not implement `SupportsTruncate`. In addition, the
Delta provider's `OverwriteByExpressionExecV1` handling recognized
regular `DeltaTableV2` tables but not the RAPIDS staged Delta table used
by atomic RTAS.
In this PR:
- Added `TRUNCATE` to the capabilities advertised by
`GpuStagedDeltaTableV2`.
- Implemented `SupportsTruncate` in the staged Delta V1 write builder.
- Tags and converts `OverwriteByExpressionExecV1` for RAPIDS staged
Delta tables to `GpuOverwriteByExpressionExecV1`.
- Applied the staged-table handling to the Delta 3.3, 4.0, and 4.1
provider implementations.
- Preserved the existing behavior for regular `DeltaTableV2` tables and
continues to reject unrelated table implementations.
- Limits the existing Delta issue #4671 RTAS xfails to the affected
Spark 3.5 releases instead of also applying them to Spark 4.
- Added an integration regression test.
### Testing
#### OSS Spark 4.0 / Delta Lake 4.0
Focused integration test:
```text
TEST=test_delta_rtas_truncate_capability
```
Result: `1 passed, 39635 deselected`.
Broader focused RTAS selection:
```text
TEST="test_delta_rtas_truncate_capability or test_delta_rtas_sql"
```
Result: `3 passed, 1 skipped, 39632 deselected`.
### Checklists
Documentation
- [ ] Updated for new or modified user-facing features or behaviors
- [x] No user-facing change
Testing
- [x] 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
- [x] Not required
---------
Signed-off-by: Niranjan Artal <nartal@nvidia.com>1 parent 5efcd17 commit ced237d
5 files changed
Lines changed: 143 additions & 8 deletions
File tree
- delta-lake
- common/src/main/delta-33x-41x/scala/com/nvidia/spark/rapids/delta
- delta-33x/src/main/scala/com/nvidia/spark/rapids/delta/delta33x
- delta-40x/src/main/scala/com/nvidia/spark/rapids/delta/delta40x
- delta-41x/src/main/scala/com/nvidia/spark/rapids/delta/delta41x
- integration_tests/src/main/python
Lines changed: 5 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| |||
471 | 471 | | |
472 | 472 | | |
473 | 473 | | |
474 | | - | |
| 474 | + | |
475 | 475 | | |
476 | 476 | | |
477 | 477 | | |
| |||
482 | 482 | | |
483 | 483 | | |
484 | 484 | | |
485 | | - | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
486 | 488 | | |
487 | 489 | | |
488 | 490 | | |
| |||
Lines changed: 29 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
| 29 | + | |
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| |||
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
55 | 70 | | |
56 | 71 | | |
57 | 72 | | |
| |||
109 | 124 | | |
110 | 125 | | |
111 | 126 | | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
112 | 140 | | |
Lines changed: 29 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
| 32 | + | |
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
58 | 73 | | |
59 | 74 | | |
60 | 75 | | |
| |||
119 | 134 | | |
120 | 135 | | |
121 | 136 | | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
122 | 150 | | |
Lines changed: 29 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
| 32 | + | |
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
58 | 73 | | |
59 | 74 | | |
60 | 75 | | |
| |||
119 | 134 | | |
120 | 135 | | |
121 | 136 | | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
122 | 150 | | |
Lines changed: 51 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
745 | 745 | | |
746 | 746 | | |
747 | 747 | | |
748 | | - | |
| 748 | + | |
| 749 | + | |
749 | 750 | | |
750 | 751 | | |
751 | 752 | | |
| |||
816 | 817 | | |
817 | 818 | | |
818 | 819 | | |
819 | | - | |
| 820 | + | |
| 821 | + | |
820 | 822 | | |
821 | 823 | | |
822 | 824 | | |
823 | 825 | | |
824 | 826 | | |
825 | 827 | | |
| 828 | + | |
| 829 | + | |
| 830 | + | |
| 831 | + | |
| 832 | + | |
| 833 | + | |
| 834 | + | |
| 835 | + | |
| 836 | + | |
| 837 | + | |
| 838 | + | |
| 839 | + | |
| 840 | + | |
| 841 | + | |
| 842 | + | |
| 843 | + | |
| 844 | + | |
| 845 | + | |
| 846 | + | |
| 847 | + | |
| 848 | + | |
| 849 | + | |
| 850 | + | |
| 851 | + | |
| 852 | + | |
| 853 | + | |
| 854 | + | |
| 855 | + | |
| 856 | + | |
| 857 | + | |
| 858 | + | |
| 859 | + | |
| 860 | + | |
| 861 | + | |
| 862 | + | |
| 863 | + | |
| 864 | + | |
| 865 | + | |
| 866 | + | |
| 867 | + | |
| 868 | + | |
| 869 | + | |
| 870 | + | |
| 871 | + | |
| 872 | + | |
| 873 | + | |
| 874 | + | |
826 | 875 | | |
827 | 876 | | |
828 | 877 | | |
| |||
0 commit comments