fix(parquet): make column reader cleanup idempotent #924
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package file | ||
|
|
||
| import ( | ||
| "errors" | ||
| "testing" | ||
|
|
||
| "github.com/apache/arrow-go/v18/parquet" | ||
| "github.com/apache/arrow-go/v18/parquet/compress" | ||
| format "github.com/apache/arrow-go/v18/parquet/internal/gen-go/parquet" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| type closeTrackingPage struct { | ||
| releaseCalls int | ||
| } | ||
|
|
||
| func (p *closeTrackingPage) Type() PageType { return PageTypeDataPage } | ||
| func (p *closeTrackingPage) Data() []byte { return nil } | ||
| func (p *closeTrackingPage) Encoding() format.Encoding { return format.Encoding_PLAIN } | ||
| func (p *closeTrackingPage) NumValues() int32 { return 0 } | ||
| func (p *closeTrackingPage) Release() { p.releaseCalls++ } | ||
|
|
||
| type closeTrackingPageReader struct { | ||
| closeCalls int | ||
| closeErr error | ||
| } | ||
|
|
||
| func (r *closeTrackingPageReader) SetMaxPageHeaderSize(int) {} | ||
| func (r *closeTrackingPageReader) Page() Page { return nil } | ||
| func (r *closeTrackingPageReader) Next() bool { return false } | ||
| func (r *closeTrackingPageReader) Err() error { return nil } | ||
| func (r *closeTrackingPageReader) Reset(parquet.BufferedReader, int64, compress.Compression, *CryptoContext) { | ||
| } | ||
| func (r *closeTrackingPageReader) GetDictionaryPage() (*DictionaryPage, error) { return nil, nil } | ||
| func (r *closeTrackingPageReader) SeekToPageWithRow(int64) error { return nil } | ||
| func (r *closeTrackingPageReader) Close() error { | ||
| r.closeCalls++ | ||
| return r.closeErr | ||
| } | ||
|
|
||
| func TestColumnChunkReaderCloseIsIdempotent(t *testing.T) { | ||
| page := &closeTrackingPage{} | ||
| rdr := &closeTrackingPageReader{} | ||
| reader := &columnChunkReader{curPage: page, rdr: rdr} | ||
|
|
||
| require.NoError(t, reader.Close()) | ||
| require.NoError(t, reader.Close()) | ||
| require.Equal(t, 1, page.releaseCalls) | ||
| require.Equal(t, 1, rdr.closeCalls) | ||
| require.Nil(t, reader.curPage) | ||
| require.Nil(t, reader.rdr) | ||
| } | ||
|
|
||
| func TestColumnChunkReaderSetPageReaderReleasesBeforeReplacement(t *testing.T) { | ||
| page := &closeTrackingPage{} | ||
| oldRdr := &closeTrackingPageReader{} | ||
| newRdr := &closeTrackingPageReader{} | ||
| reader := &columnChunkReader{curPage: page, rdr: oldRdr} | ||
|
|
||
| require.NoError(t, reader.setPageReader(newRdr)) | ||
| require.Equal(t, 1, page.releaseCalls) | ||
| require.Equal(t, 1, oldRdr.closeCalls) | ||
| require.Equal(t, 0, newRdr.closeCalls) | ||
| require.Same(t, newRdr, reader.rdr) | ||
| require.Nil(t, reader.curPage) | ||
|
|
||
| require.NoError(t, reader.Close()) | ||
| require.Equal(t, 1, newRdr.closeCalls) | ||
| } | ||
|
|
||
| func TestColumnChunkReaderSetPageReaderPropagatesCloseError(t *testing.T) { | ||
| closeErr := errors.New("page reader close failed") | ||
| page := &closeTrackingPage{} | ||
| oldRdr := &closeTrackingPageReader{closeErr: closeErr} | ||
| newRdr := &closeTrackingPageReader{} | ||
| reader := &columnChunkReader{curPage: page, rdr: oldRdr} | ||
|
|
||
| require.ErrorIs(t, reader.setPageReader(newRdr), closeErr) | ||
| require.ErrorIs(t, reader.err, closeErr) | ||
| require.Equal(t, 1, page.releaseCalls) | ||
| require.Equal(t, 1, oldRdr.closeCalls) | ||
| require.Equal(t, 0, newRdr.closeCalls) | ||
| require.Nil(t, reader.curPage) | ||
| require.Nil(t, reader.rdr) | ||
| require.NoError(t, reader.Close()) | ||
| require.Equal(t, 1, oldRdr.closeCalls) | ||
| } |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package pqarrow | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "context" | ||
| "errors" | ||
| "testing" | ||
|
|
||
| "github.com/apache/arrow-go/v18/arrow" | ||
| "github.com/apache/arrow-go/v18/arrow/array" | ||
| "github.com/apache/arrow-go/v18/arrow/memory" | ||
| "github.com/apache/arrow-go/v18/parquet" | ||
| "github.com/apache/arrow-go/v18/parquet/file" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| type pageReaderReplacementErrorRecordReader struct { | ||
| file.RecordReader | ||
| err error | ||
| seekCalls int | ||
| } | ||
|
|
||
| func (r *pageReaderReplacementErrorRecordReader) SetPageReaderWithError(pr file.PageReader) error { | ||
| if pr != nil { | ||
| _ = pr.Close() | ||
| } | ||
| return r.err | ||
| } | ||
|
|
||
| func (r *pageReaderReplacementErrorRecordReader) SeekToRow(row int64) error { | ||
| r.seekCalls++ | ||
| return r.RecordReader.SeekToRow(row) | ||
| } | ||
|
|
||
| func (r *pageReaderReplacementErrorRecordReader) Release() { | ||
| r.SetPageReader(nil) | ||
| r.RecordReader.Release() | ||
| } | ||
|
|
||
| func TestLeafReaderSeekToRowPropagatesPageReaderReplacementError(t *testing.T) { | ||
| mem := memory.NewCheckedAllocator(memory.DefaultAllocator) | ||
| defer mem.AssertSize(t, 0) | ||
|
|
||
| builder := array.NewInt32Builder(mem) | ||
| builder.AppendValues([]int32{1, 2}, nil) | ||
| values := builder.NewInt32Array() | ||
| builder.Release() | ||
| defer values.Release() | ||
|
|
||
| field := arrow.Field{Name: "value", Type: arrow.PrimitiveTypes.Int32} | ||
| schema := arrow.NewSchema([]arrow.Field{field}, nil) | ||
| column := arrow.NewColumnFromArr(field, values) | ||
| tbl := array.NewTable(schema, []arrow.Column{column}, -1) | ||
| column.Release() | ||
| defer tbl.Release() | ||
|
|
||
| var buf bytes.Buffer | ||
| require.NoError(t, WriteTable(tbl, &buf, tbl.NumRows(), nil, NewArrowWriterProperties(WithAllocator(mem)))) | ||
|
|
||
| pfile, err := file.NewParquetReader(bytes.NewReader(buf.Bytes()), file.WithReadProps(parquet.NewReaderProperties(mem))) | ||
| require.NoError(t, err) | ||
| defer pfile.Close() | ||
|
|
||
| reader, err := NewFileReader(pfile, ArrowReadProperties{}, mem) | ||
| require.NoError(t, err) | ||
|
|
||
| columnReader, err := reader.GetColumn(context.Background(), 0) | ||
| require.NoError(t, err) | ||
| defer columnReader.Release() | ||
|
|
||
| leaf, ok := columnReader.colReaderImpl.(*leafReader) | ||
| require.True(t, ok) | ||
|
|
||
| closeErr := errors.New("page reader close failed") | ||
| wrapped := &pageReaderReplacementErrorRecordReader{ | ||
| RecordReader: leaf.recordRdr, | ||
| err: closeErr, | ||
| } | ||
| leaf.recordRdr = wrapped | ||
|
|
||
| require.ErrorIs(t, columnReader.SeekToRow(0), closeErr) | ||
| require.Zero(t, wrapped.seekCalls) | ||
| } |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Optional: add a pqarrow-level test that a replacement close-error surfaces via
LoadBatch/SeekToRow; the propagation is currently only covered at the primitive level.