Skip to content

[Data] Improve read_text trailing newline semantics#53860

Merged
bveeramani merged 2 commits intomasterfrom
text-fix
Jun 16, 2025
Merged

[Data] Improve read_text trailing newline semantics#53860
bveeramani merged 2 commits intomasterfrom
text-fix

Conversation

@bveeramani
Copy link
Copy Markdown
Member

@bveeramani bveeramani commented Jun 16, 2025

Why are these changes needed?

read_text currently treats a trailing newline as an empty line, which can lead to unexpected results. This isn’t consistent with how standard Python methods like str.splitlines() behave. Since trailing newlines are common in text files, this PR updates the behavior to ignore them.

Related issue number

Checks

  • I've signed off every commit(by using the -s flag, i.e., git commit -s) in this PR.
  • I've run scripts/format.sh to lint the changes in this PR.
  • I've included any doc changes needed for https://docs.ray.io/en/master/.
    • I've added any new APIs to the API Reference. For example, if I added a
      method in Tune, I've added it in doc/source/tune/api/ under the
      corresponding .rst file.
  • I've made sure the tests are passing. Note that there might be a few flaky tests, see the recent failures at https://flakey-tests.ray.io/
  • Testing Strategy
    • Unit tests
    • Release tests
    • This PR is not tested :(

Signed-off-by: Balaji Veeramani <bveeramani@berkeley.edu>
Copilot AI review requested due to automatic review settings June 16, 2025 19:38
@bveeramani bveeramani requested a review from a team as a code owner June 16, 2025 19:38
Signed-off-by: Balaji Veeramani <bveeramani@berkeley.edu>
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR updates read_text to use Python’s splitlines() for newline splitting and adjusts tests to match the new empty‐line behavior, plus simplifies the partitioned‐filter test.

  • Switched from .split("\n") to .splitlines() in _read_stream to improve newline handling.
  • Updated expectations in test_text.py for empty‐line counts and removed counter logic in partitioned‐filter tests.
  • Added pytest.mark.parametrize on PartitionStyle for the partitioned‐read test.

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File Description
python/ray/data/_internal/datasource/text_datasource.py Use splitlines() instead of split("\n") in _read_stream.
python/ray/data/tests/test_text.py Adjusted empty‐line count assertions, removed counter-based checks, and parameterized the partition style.
Comments suppressed due to low confidence (2)

python/ray/data/tests/test_text.py:68

  • Add a test case for reading files that end with a trailing newline under drop_empty_lines=False to verify how splitlines() handles the final empty line, ensuring the behavior is as intended.
assert ds.count() == 4

python/ray/data/_internal/datasource/text_datasource.py:31

  • Update the docstring for _read_stream to note that it now uses splitlines() and does not preserve trailing empty lines, clarifying the behavior change when drop_empty_lines=False.
def _read_stream(self, f: "pyarrow.NativeFile", path: str) -> Iterator[Block]:

builder = DelegatingBlockBuilder()

lines = data.decode(self.encoding).split("\n")
lines = data.decode(self.encoding).splitlines()
Copy link

Copilot AI Jun 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using splitlines() here will omit trailing empty lines (e.g., from files ending with a newline), which changes the semantics of drop_empty_lines=False compared to split('\n'). Consider explicitly preserving trailing empty lines if you intend to match the previous behavior, or document this change clearly.

Suggested change
lines = data.decode(self.encoding).splitlines()
lines = data.decode(self.encoding).split('\n')

Copilot uses AI. Check for mistakes.
@bveeramani bveeramani changed the title [Data] Improve read_text newline handling [Data] Improve read_text trailing newline semantics Jun 16, 2025
@bveeramani bveeramani enabled auto-merge (squash) June 16, 2025 22:09
@github-actions github-actions bot added the go add ONLY when ready to merge, run all tests label Jun 16, 2025
@bveeramani bveeramani merged commit c67fafc into master Jun 16, 2025
7 checks passed
@bveeramani bveeramani deleted the text-fix branch June 16, 2025 23:40
elliot-barn pushed a commit that referenced this pull request Jun 18, 2025
<!-- Thank you for your contribution! Please review
https://github.com/ray-project/ray/blob/master/CONTRIBUTING.rst before
opening a pull request. -->

<!-- Please add a reviewer to the assignee section when you create a PR.
If you don't have the access to it, we will shortly find a reviewer and
assign them to your PR. -->

## Why are these changes needed?

<!-- Please give a short summary of the change and the problem this
solves. -->

`read_text` currently treats a trailing newline as an empty line, which
can lead to unexpected results. This isn’t consistent with how standard
Python methods like `str.splitlines()` behave. Since trailing newlines
are common in text files, this PR updates the behavior to ignore them.

## Related issue number

<!-- For example: "Closes #1234" -->

## Checks

- [ ] I've signed off every commit(by using the -s flag, i.e., `git
commit -s`) in this PR.
- [ ] I've run `scripts/format.sh` to lint the changes in this PR.
- [ ] I've included any doc changes needed for
https://docs.ray.io/en/master/.
- [ ] I've added any new APIs to the API Reference. For example, if I
added a
method in Tune, I've added it in `doc/source/tune/api/` under the
           corresponding `.rst` file.
- [ ] I've made sure the tests are passing. Note that there might be a
few flaky tests, see the recent failures at https://flakey-tests.ray.io/
- Testing Strategy
   - [ ] Unit tests
   - [ ] Release tests
   - [ ] This PR is not tested :(

---------

Signed-off-by: Balaji Veeramani <bveeramani@berkeley.edu>
Signed-off-by: elliot-barn <elliot.barnwell@anyscale.com>
minerharry pushed a commit to minerharry/ray that referenced this pull request Jun 27, 2025
)

<!-- Thank you for your contribution! Please review
https://github.com/ray-project/ray/blob/master/CONTRIBUTING.rst before
opening a pull request. -->

<!-- Please add a reviewer to the assignee section when you create a PR.
If you don't have the access to it, we will shortly find a reviewer and
assign them to your PR. -->

## Why are these changes needed?

<!-- Please give a short summary of the change and the problem this
solves. -->

`read_text` currently treats a trailing newline as an empty line, which
can lead to unexpected results. This isn’t consistent with how standard
Python methods like `str.splitlines()` behave. Since trailing newlines
are common in text files, this PR updates the behavior to ignore them.

## Related issue number

<!-- For example: "Closes ray-project#1234" -->

## Checks

- [ ] I've signed off every commit(by using the -s flag, i.e., `git
commit -s`) in this PR.
- [ ] I've run `scripts/format.sh` to lint the changes in this PR.
- [ ] I've included any doc changes needed for
https://docs.ray.io/en/master/.
- [ ] I've added any new APIs to the API Reference. For example, if I
added a
method in Tune, I've added it in `doc/source/tune/api/` under the
           corresponding `.rst` file.
- [ ] I've made sure the tests are passing. Note that there might be a
few flaky tests, see the recent failures at https://flakey-tests.ray.io/
- Testing Strategy
   - [ ] Unit tests
   - [ ] Release tests
   - [ ] This PR is not tested :(

---------

Signed-off-by: Balaji Veeramani <bveeramani@berkeley.edu>
elliot-barn pushed a commit that referenced this pull request Jul 2, 2025
<!-- Thank you for your contribution! Please review
https://github.com/ray-project/ray/blob/master/CONTRIBUTING.rst before
opening a pull request. -->

<!-- Please add a reviewer to the assignee section when you create a PR.
If you don't have the access to it, we will shortly find a reviewer and
assign them to your PR. -->

## Why are these changes needed?

<!-- Please give a short summary of the change and the problem this
solves. -->

`read_text` currently treats a trailing newline as an empty line, which
can lead to unexpected results. This isn’t consistent with how standard
Python methods like `str.splitlines()` behave. Since trailing newlines
are common in text files, this PR updates the behavior to ignore them.

## Related issue number

<!-- For example: "Closes #1234" -->

## Checks

- [ ] I've signed off every commit(by using the -s flag, i.e., `git
commit -s`) in this PR.
- [ ] I've run `scripts/format.sh` to lint the changes in this PR.
- [ ] I've included any doc changes needed for
https://docs.ray.io/en/master/.
- [ ] I've added any new APIs to the API Reference. For example, if I
added a
method in Tune, I've added it in `doc/source/tune/api/` under the
           corresponding `.rst` file.
- [ ] I've made sure the tests are passing. Note that there might be a
few flaky tests, see the recent failures at https://flakey-tests.ray.io/
- Testing Strategy
   - [ ] Unit tests
   - [ ] Release tests
   - [ ] This PR is not tested :(

---------

Signed-off-by: Balaji Veeramani <bveeramani@berkeley.edu>
Signed-off-by: elliot-barn <elliot.barnwell@anyscale.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

go add ONLY when ready to merge, run all tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants