Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: go-avro/avro
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: realityengines/avro
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 16, 2019

  1. Make newDataFileReader public, using IoReader

    @JasonCatlin
    JasonCatlin committed Dec 16, 2019
    Copy the full SHA
    bf7332f View commit details

  2. Merge pull request #1 from realityengines/make_reader_public_2 

    Make newDataFileReader public, using IoReader
    @JasonCatlin
    JasonCatlin authored Dec 16, 2019
    Copy the full SHA
    3167d64 View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 data_file.go
  2. +1 −1 data_file_test.go
4 changes: 2 additions & 2 deletions data_file.go
View file
Original file line number Diff line number Diff line change
@@ -90,7 +90,7 @@ func NewDataFileReader(filename string, ignoreMe ...DatumReader) (*DataFileReade
return nil, err
}

reader, err := newDataFileReader(f)
reader, err := NewDataFileReader_IoReader(f)
if err != nil {
// If there's any decoding issues, try not leaking a file handle.
f.Close()
@@ -99,7 +99,7 @@ func NewDataFileReader(filename string, ignoreMe ...DatumReader) (*DataFileReade

}

func newDataFileReader(input io.Reader) (reader *DataFileReader, err error) {
func NewDataFileReader_IoReader(input io.Reader) (reader *DataFileReader, err error) {
dec := NewBinaryDecoderReader(input) // Since dec doesn't buffer, we can share it.
reader = &DataFileReader{
sharedCopyBuf: make([]byte, 4096),
2 changes: 1 addition & 1 deletion data_file_test.go
View file
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ func TestDataFileWriter(t *testing.T) {
assert(t, len(encoded), 1145)

// now make sure we can decode again
dfr, err := newDataFileReader(bytes.NewReader(encoded))
dfr, err := NewDataFileReader_IoReader(bytes.NewReader(encoded))
if err != nil {
t.Fatal(err)
}