Commit 54591a9
committed
[spark] Fire PaimonMergeInto for data-evolution tables on Spark 4.1 useV2Write=true
Round 8's MergeInto guard unconditionally hands Spark 4.1's RewriteMergeIntoTable
ownership over any SparkTableWithRowLevelOps (useV2Write=true) target. That is
correct for simple V2 row-level tables (row-tracking only), but Spark 4.1's
rule fails the `rewritable` / `aligned` / `needSchemaEvolution` gate for the
more complex data-evolution + blob-field Blob tables. When it silently skips
those plans, the original MergeIntoTable falls through to the physical planner
which throws UNSUPPORTED_FEATURE.TABLE_OPERATION — breaking the 3 Blob merge
tests:
- Blob: merge-into rejects updating raw-data BLOB column
- Blob: merge-into updates non-blob column on descriptor blob table
- Blob: merge-into updates descriptor blob column with external storage end-to-end
Narrow the skip to SparkTableWithRowLevelOps tables that DO NOT have data
evolution enabled. For DE tables Paimon's rule continues to fire and converts
MergeIntoTable to MergeIntoPaimonDataEvolutionTable exactly as Round 3
already did.1 parent b921c30 commit 54591a9
1 file changed
Lines changed: 16 additions & 5 deletions
File tree
- paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/catalyst/analysis
Lines changed: 16 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
51 | 66 | | |
52 | 67 | | |
53 | 68 | | |
54 | 69 | | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
| 70 | + | |
60 | 71 | | |
61 | 72 | | |
62 | 73 | | |
| |||
0 commit comments