Repository navigation
Commit ad8578a
fix: preserve constant equivalence properties through projection (#27123)
## Which issue does this PR close?
Closes #26624.
## Rationale for this change
With `prefer_hash_join = false`, a query can fail physical plan
validation when a filter makes a computed sort or join key constant.
Embedding a projection into the sort-merge join loses the constant
property after sorting has already relied on it.
## What changes are included in this PR?
Preserve each projected equivalence class's constant metadata. A
projected member has the same value as its source member on every row,
and projection keeps rows in the same partitions. Its known value and
uniform or partition-local status therefore still hold. Outer joins
clear constants on the NULL-padded side before projecting their output.
Partition merges clear `Heterogeneous` constants.
Also preserve scalar-subquery leaves during indirect projection. They
read a shared subquery result without depending on the input schema. The
arithmetic `ORDER BY` reproduction needs the metadata copy; the
scalar-subquery join reproduction needs both changes.
## What is the testing strategy for this PR?
SQL cases in `joins.slt` cover arithmetic, `upper()`, left joins, and
the scalar-subquery join. A NULL-padded left join checks that matched
values sort before the NULL rows. The metadata unit test covers known,
unknown, and partition-local constants, dropped arguments, and partition
merging.
The original SQL cases and metadata test fail before the fix and pass
afterward. Validation includes the extended workspace tests, full lint
suite, and strict all-features Clippy.
## Are there any user-facing changes?
Affected queries plan and execute successfully. No public API changes.
Needs a backport to `branch-56` for the 56.0.0 regression tracker
(#24461).
---------
Co-authored-by: Andrew Lamb <[email protected]>
Co-authored-by: Claude Fable 5.1 <[email protected]>1 parent 13bd9d1 commit ad8578a
3 files changed
Lines changed: 154 additions & 4 deletions
File tree
- datafusion
- physical-expr/src/equivalence
- sqllogictest/test_files
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| 15 | + | |
15 | 16 | | |
16 | 17 | | |
17 | 18 | | |
| |||
631 | 632 | | |
632 | 633 | | |
633 | 634 | | |
634 | | - | |
635 | | - | |
| 635 | + | |
| 636 | + | |
636 | 637 | | |
637 | 638 | | |
638 | 639 | | |
| |||
742 | 743 | | |
743 | 744 | | |
744 | 745 | | |
745 | | - | |
| 746 | + | |
| 747 | + | |
| 748 | + | |
| 749 | + | |
| 750 | + | |
746 | 751 | | |
747 | 752 | | |
748 | 753 | | |
| |||
1334 | 1339 | | |
1335 | 1340 | | |
1336 | 1341 | | |
| 1342 | + | |
| 1343 | + | |
| 1344 | + | |
| 1345 | + | |
| 1346 | + | |
| 1347 | + | |
| 1348 | + | |
| 1349 | + | |
| 1350 | + | |
| 1351 | + | |
| 1352 | + | |
| 1353 | + | |
| 1354 | + | |
| 1355 | + | |
| 1356 | + | |
| 1357 | + | |
| 1358 | + | |
| 1359 | + | |
| 1360 | + | |
| 1361 | + | |
| 1362 | + | |
| 1363 | + | |
| 1364 | + | |
| 1365 | + | |
| 1366 | + | |
| 1367 | + | |
| 1368 | + | |
| 1369 | + | |
| 1370 | + | |
| 1371 | + | |
| 1372 | + | |
| 1373 | + | |
| 1374 | + | |
| 1375 | + | |
| 1376 | + | |
| 1377 | + | |
| 1378 | + | |
| 1379 | + | |
| 1380 | + | |
| 1381 | + | |
| 1382 | + | |
| 1383 | + | |
| 1384 | + | |
1337 | 1385 | | |
1338 | 1386 | | |
1339 | 1387 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3093 | 3093 | | |
3094 | 3094 | | |
3095 | 3095 | | |
3096 | | - | |
| 3096 | + | |
| 3097 | + | |
| 3098 | + | |
3097 | 3099 | | |
3098 | 3100 | | |
3099 | 3101 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6343 | 6343 | | |
6344 | 6344 | | |
6345 | 6345 | | |
| 6346 | + | |
| 6347 | + | |
| 6348 | + | |
| 6349 | + | |
| 6350 | + | |
| 6351 | + | |
| 6352 | + | |
| 6353 | + | |
| 6354 | + | |
| 6355 | + | |
| 6356 | + | |
| 6357 | + | |
| 6358 | + | |
| 6359 | + | |
| 6360 | + | |
| 6361 | + | |
| 6362 | + | |
| 6363 | + | |
| 6364 | + | |
| 6365 | + | |
| 6366 | + | |
| 6367 | + | |
| 6368 | + | |
| 6369 | + | |
| 6370 | + | |
| 6371 | + | |
| 6372 | + | |
| 6373 | + | |
| 6374 | + | |
| 6375 | + | |
| 6376 | + | |
| 6377 | + | |
| 6378 | + | |
| 6379 | + | |
| 6380 | + | |
| 6381 | + | |
| 6382 | + | |
| 6383 | + | |
| 6384 | + | |
| 6385 | + | |
| 6386 | + | |
| 6387 | + | |
| 6388 | + | |
| 6389 | + | |
| 6390 | + | |
| 6391 | + | |
| 6392 | + | |
| 6393 | + | |
| 6394 | + | |
| 6395 | + | |
| 6396 | + | |
| 6397 | + | |
| 6398 | + | |
| 6399 | + | |
| 6400 | + | |
| 6401 | + | |
| 6402 | + | |
| 6403 | + | |
| 6404 | + | |
| 6405 | + | |
| 6406 | + | |
| 6407 | + | |
| 6408 | + | |
| 6409 | + | |
| 6410 | + | |
| 6411 | + | |
| 6412 | + | |
| 6413 | + | |
| 6414 | + | |
| 6415 | + | |
| 6416 | + | |
| 6417 | + | |
| 6418 | + | |
| 6419 | + | |
| 6420 | + | |
| 6421 | + | |
| 6422 | + | |
| 6423 | + | |
| 6424 | + | |
| 6425 | + | |
| 6426 | + | |
| 6427 | + | |
| 6428 | + | |
| 6429 | + | |
| 6430 | + | |
| 6431 | + | |
| 6432 | + | |
| 6433 | + | |
| 6434 | + | |
| 6435 | + | |
| 6436 | + | |
| 6437 | + | |
| 6438 | + | |
| 6439 | + | |
| 6440 | + | |
| 6441 | + | |
| 6442 | + | |
| 6443 | + | |
| 6444 | + | |
| 6445 | + | |
0 commit comments