Repository navigation
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changed
TextLineScanner.Scannow stops whenReadStringreaches EOF without returning any bytes. The regression tests cover empty input, newline-terminated input, and legitimate blank lines.Reproduction
Before this change, scanning either an empty reader or
"one\n"yielded a synthetic final empty line:""produced[]string{""}instead of no lines."one\n"produced[]string{"one", ""}instead of[]string{"one"}.The new regression test failed on both cases before the production change.
Root cause
bufio.Reader.ReadStringreturns("", io.EOF)when no data remains, butScanreturnedtruefor every EOF result. That made an empty EOF look like a real line.Fix
Return
trueat EOF only whenReadStringalso returned bytes. This preserves a final unterminated line and empty lines represented by newline delimiters.Verification
go test ./core/iox -run 'TestScanner|TestBadScanner' -count=1— passgo test ./core/iox -count=1— passgo test -race ./core/iox -count=1— passgo vet ./core/iox— passgofmt -l core/iox/textlinescanner.go core/iox/textlinescanner_test.go— no outputgit diff --check— passA full
go test ./...was attempted but did not complete on this host: an unrelatedcore/logxaccess-permission assertion fails when run as root, and later packages exhausted the available disk while compiling Kubernetes dependencies.