mirror of
https://github.com/langchain-ai/datafusion.git
synced 2026-07-19 15:24:21 -04:00
Eren Avsarogullari
4d06c40d8d
## Which issue does this PR close? <!-- We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123. --> - Closes #20225. ## Rationale for this change <!-- Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed. Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes. --> ## What changes are included in this PR? <!-- There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR. --> When there is not enough memory to continue external sort, either increasing the `memory limit` or decreasing `sort_spill_reservation_bytes` need to be applied. It can be useful to guide the user with clearer error message by highlighting required configs for the consistency because expected settings are as follows: ``` SET datafusion.runtime.memory_limit = '10G' SET datafusion.execution.sort_spill_reservation_bytes = 10485760 ``` Current: ``` Not enough memory to continue external sort. Consider increasing the memory limit, or decreasing sort_spill_reservation_bytes ``` New: ``` Not enough memory to continue external sort. Consider increasing the memory limit config: 'datafusion.runtime.memory_limit', or decreasing the config: 'datafusion.execution.sort_spill_reservation_bytes'. ``` ## Are these changes tested? <!-- We typically require tests for all PRs in order to: 1. Prevent the code from being accidentally broken by subsequent changes 2. Serve as another way to document the expected behavior of the code If tests are not included in your PR, please explain why (for example, are they covered by existing tests)? --> A new UT case has been added to cover this use-case and it has been tested locally successfully. **For updated snapshot files:** Following integration tests have been successful by DataFusion Test Pipeline: ``` test test_cli_top_memory_consumers::case_1 ... ok test test_cli_top_memory_consumers::case_2 ... ok test test_cli_top_memory_consumers::case_3 ... ok ``` **Ref:** https://github.com/apache/datafusion/actions/runs/21811797863/job/62925363536?pr=20226 ## Are there any user-facing changes? <!-- If there are user-facing changes then we may require documentation to be updated before approving the PR. --> Yes, improving legacy `ExternalSorter` `ResourcesExhausted` Error Message. <!-- If there are any breaking changes to public APIs, please add the `api change` label. -->