Skip to content

[pull] main from apache:main#94

Merged
pull[bot] merged 1 commit intoburaksenn:mainfrom
apache:main
Apr 10, 2026
Merged

[pull] main from apache:main#94
pull[bot] merged 1 commit intoburaksenn:mainfrom
apache:main

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Apr 10, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

…te module (#21457)

## Which issue does this PR close?

Closes #21433

## Rationale for this change

As noted by @alamb in
#21182 (comment),
`file_scan_config.rs` has grown large after the sort pushdown
optimization. This PR extracts the sort pushdown helpers into their own
module to improve readability and maintainability.

## What changes are included in this PR?

Move sort pushdown logic from `file_scan_config.rs` (3591 → 3066 lines)
into a new `sort_pushdown.rs` module (576 lines):

- `rebuild_with_source`, `try_sort_file_groups_by_statistics`
- `sort_files_within_groups_by_statistics`,
`any_file_has_nulls_in_sort_columns`
- `validate_orderings`, `is_ordering_valid_for_file_groups`
- `get_projected_output_ordering`,
`ordered_column_indices_from_projection`
- `SortedFileGroups` struct

`try_pushdown_sort` stays in the `DataSource` impl — it calls into the
new module.

## Are these changes tested?

Pure refactor, all existing tests pass (120 passed).

## Are there any user-facing changes?

No.
@pull pull bot locked and limited conversation to collaborators Apr 10, 2026
@pull pull bot added the ⤵️ pull label Apr 10, 2026
@pull pull bot merged commit 4389f14 into buraksenn:main Apr 10, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant