Commit 7fde30a
authored
fix: handle invalid byte ranges in calculate_range for single-line files (#19607)
## 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 #19605.
## 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.
-->
The `calculate_range` function creates invalid byte ranges (where `start
> end`) when reading single-line CSV/JSON files that are split into
multiple partitions. This causes an error like:
```
ObjectStore(Generic { store: "S3", source: Inconsistent { start: 1149247, end: 1149246 } })
```
When `find_first_newline` doesn't find a newline (single-line file), it
returns the remaining file length. This causes `start + start_delta` to
exceed `end + end_delta`, creating an invalid range. The current check
only handles `range.start == range.end`, not `range.start > range.end`.
## 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.
-->
1. Added an early termination check after computing `start_delta`: if
the first newline after `start` is beyond the partition boundary (`start
+ start_delta > end`), return `TerminateEarly` since no complete records
exist in this partition.
2. Changed the final range validation from `==` to `>=` as a safety net
for edge cases.
3. Added a regression test that reproduces the bug with a single-line
file split into partitions.
## 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)?
-->
Yes, added `test_calculate_range_single_line_file` which:
- Creates a single-line JSON file without new-lines
- Simulates partition 2 (middle to end of file)
- Verifies that `calculate_range` returns `TerminateEarly` instead of an
invalid range
## Are there any user-facing changes?
<!--
If there are user-facing changes then we may require documentation to be
updated before approving the PR.
-->
<!--
If there are any breaking changes to public APIs, please add the `api
change` label.
-->
No1 parent 09455f1 commit 7fde30a
1 file changed
+32
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
350 | 350 | | |
351 | 351 | | |
352 | 352 | | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
353 | 357 | | |
354 | 358 | | |
355 | 359 | | |
| |||
358 | 362 | | |
359 | 363 | | |
360 | 364 | | |
361 | | - | |
| 365 | + | |
362 | 366 | | |
363 | 367 | | |
364 | 368 | | |
| |||
723 | 727 | | |
724 | 728 | | |
725 | 729 | | |
| 730 | + | |
| 731 | + | |
| 732 | + | |
| 733 | + | |
| 734 | + | |
| 735 | + | |
| 736 | + | |
| 737 | + | |
| 738 | + | |
| 739 | + | |
| 740 | + | |
| 741 | + | |
| 742 | + | |
| 743 | + | |
| 744 | + | |
| 745 | + | |
| 746 | + | |
| 747 | + | |
| 748 | + | |
| 749 | + | |
| 750 | + | |
| 751 | + | |
| 752 | + | |
| 753 | + | |
| 754 | + | |
| 755 | + | |
| 756 | + | |
726 | 757 | | |
0 commit comments