Repository navigation
Commit 0ed1bb2
committed
[fix](build) Keep Arrow 17 and 24 in shared thirdparty
### What problem does this PR solve?
Issue Number: None
Related PR: #66546
Problem Summary: Current branch-4.1 includes the Arrow 24 upgrade and can consume the same thirdparty installation as master. Installing Arrow 24 and Paimon against the legacy root prefix overwrites the Arrow 17 ABI expected by pre-upgrade branch-4.1 revisions and can leave mixed or stale artifacts after interrupted rebuilds. Keep Arrow 17 and Paimon 17 in the unversioned compatibility prefix, install the Arrow 24 and Paimon 24 ABI-coupled stack in a versioned prefix selected by the current branch, fingerprint and validate both stacks independently, and rebuild only the invalid stack. Preserve branch-4.1-specific build and test layout while backporting the shared-stack lifecycle coverage.
### Release note
None
### Check List (For Author)
- Test: Manual test
- PASS: ./thirdparty/test/arrow-paimon-lifecycle-test.sh
- PASS: bash -n on all changed shell scripts
- PASS: ./build-support/clang-format.sh
- PASS: ./build-support/check-format.sh
- PASS: non-patch git diff --check and Arrow 17 patch byte-identity checks
- Not run: full BE build; the filesystem is 99% used and this worktree does not have a valid dual-stack thirdparty installation, so rebuilding both stacks risks exhausting disk space
- Behavior changed: Yes. Current branch-4.1 selects versioned Arrow 24/Paimon 24 while preserving the root Arrow 17/Paimon 17 compatibility stack.
- Does this need documentation: No1 parent 2c3ae38 commit 0ed1bb2
12 files changed
Lines changed: 1229 additions & 120 deletions
File tree
- be
- cmake
- thirdparty
- patches
- test
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
148 | 148 | | |
149 | 149 | | |
150 | 150 | | |
151 | | - | |
152 | 151 | | |
153 | 152 | | |
154 | 153 | | |
| |||
170 | 169 | | |
171 | 170 | | |
172 | 171 | | |
173 | | - | |
174 | | - | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
175 | 197 | | |
176 | 198 | | |
177 | 199 | | |
| |||
517 | 539 | | |
518 | 540 | | |
519 | 541 | | |
| 542 | + | |
| 543 | + | |
| 544 | + | |
| 545 | + | |
| 546 | + | |
| 547 | + | |
520 | 548 | | |
521 | 549 | | |
522 | 550 | | |
| |||
662 | 690 | | |
663 | 691 | | |
664 | 692 | | |
665 | | - | |
666 | | - | |
667 | | - | |
668 | | - | |
| 693 | + | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
669 | 697 | | |
670 | 698 | | |
671 | 699 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
31 | | - | |
| 32 | + | |
32 | 33 | | |
33 | 34 | | |
34 | 35 | | |
| |||
39 | 40 | | |
40 | 41 | | |
41 | 42 | | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
42 | 49 | | |
43 | | - | |
| 50 | + | |
44 | 51 | | |
45 | | - | |
| 52 | + | |
46 | 53 | | |
47 | 54 | | |
48 | 55 | | |
49 | | - | |
| 56 | + | |
50 | 57 | | |
51 | 58 | | |
52 | 59 | | |
| |||
100 | 107 | | |
101 | 108 | | |
102 | 109 | | |
103 | | - | |
104 | | - | |
105 | | - | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
106 | 113 | | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | | - | |
113 | | - | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
114 | 121 | | |
115 | 122 | | |
116 | 123 | | |
| |||
189 | 196 | | |
190 | 197 | | |
191 | 198 | | |
192 | | - | |
193 | | - | |
194 | | - | |
195 | | - | |
196 | | - | |
197 | | - | |
198 | | - | |
199 | | - | |
200 | | - | |
201 | | - | |
202 | | - | |
203 | | - | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
204 | 211 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
451 | 451 | | |
452 | 452 | | |
453 | 453 | | |
454 | | - | |
455 | | - | |
| 454 | + | |
| 455 | + | |
456 | 456 | | |
457 | 457 | | |
458 | 458 | | |
459 | 459 | | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
460 | 475 | | |
461 | 476 | | |
462 | 477 | | |
| |||
486 | 501 | | |
487 | 502 | | |
488 | 503 | | |
489 | | - | |
| 504 | + | |
490 | 505 | | |
491 | 506 | | |
492 | 507 | | |
| |||
495 | 510 | | |
496 | 511 | | |
497 | 512 | | |
498 | | - | |
499 | | - | |
500 | | - | |
501 | | - | |
| 513 | + | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
502 | 519 | | |
503 | 520 | | |
504 | 521 | | |
| |||
0 commit comments