Repository navigation
Commit 94fb806
committed
[fix](fe) Align Paimon MERGE input layout on branch-4.2
### What problem does this PR solve?
Issue Number: N/A
Related PR: #70103, #69343
Problem Summary: The backported Paimon merge planner adds its target-presence
marker to the left join input, but PaimonMergeCommand still places the source
on the left. Unmatched source rows therefore select MATCHED and write NULL
target keys instead of inserting. Reuse MergeUtils to keep the target on the
left and preserve the source with RIGHT OUTER JOIN when INSERT is present.
Add command-level tests for both join layouts. Keep logical splits when the
compatibility case asserts Rust execution and use the 4.2 MERGE diagnostics
in nullable-key error expectations.
### Release note
Fix Paimon MERGE INTO incorrectly classifying unmatched source rows as matched
on branch-4.2, including NULL key writes to non-nullable primary keys.
### Check List (For Author)
- Test: FE/JNI build and Checkstyle; 490 FE unit tests passed, 2 environment-gated
tests skipped; 47 regression framework unit tests passed; all 6 affected
Paimon regression suites passed against existing golden outputs using the
PR's successful CI ASAN BE and the repository's Spark/Paimon fixtures.
- Behavior changed: Yes, unmatched Paimon MERGE source rows select INSERT.
- Does this need documentation: No, restores the intended MERGE semantics.1 parent 2d91fb8 commit 94fb806
4 files changed
Lines changed: 68 additions & 10 deletions
File tree
- fe/fe-core/src
- main/java/org/apache/doris/nereids/trees/plans/commands
- test/java/org/apache/doris/nereids/trees/plans/commands
- regression-test/suites/external_table_p0/paimon
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
26 | 25 | | |
27 | 26 | | |
28 | 27 | | |
29 | 28 | | |
30 | | - | |
31 | 29 | | |
32 | 30 | | |
33 | 31 | | |
34 | 32 | | |
35 | 33 | | |
36 | 34 | | |
37 | | - | |
| 35 | + | |
38 | 36 | | |
39 | 37 | | |
40 | 38 | | |
| |||
100 | 98 | | |
101 | 99 | | |
102 | 100 | | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
| 101 | + | |
107 | 102 | | |
108 | 103 | | |
109 | 104 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
61 | | - | |
| 61 | + | |
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
89 | | - | |
| 89 | + | |
90 | 90 | | |
91 | 91 | | |
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
95 | 95 | | |
96 | 96 | | |
97 | | - | |
| 97 | + | |
98 | 98 | | |
99 | 99 | | |
100 | 100 | | |
| |||
0 commit comments