You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@arrow.apache.org by "candiduslynx (via GitHub)" <gi...@apache.org> on 2023/06/07 16:59:50 UTC
[GitHub] [arrow] candiduslynx commented on a diff in pull request #35973: GH-35015: [Go] Fix parquet memleak
candiduslynx commented on code in PR #35973:
URL: https://github.com/apache/arrow/pull/35973#discussion_r1221912871
##########
go/arrow/memory/checked_allocator.go:
##########
@@ -160,14 +160,24 @@ func (a *CheckedAllocator) AssertSize(t TestingT, sz int) {
break
}
callersMsg.WriteString("\t")
- callersMsg.WriteString(frame.Function)
- callersMsg.WriteString(fmt.Sprintf(" line %d", frame.Line))
+ if fn := frame.Func; fn != nil {
+ callersMsg.WriteString(fmt.Sprintf("%s+%x", fn.Name(), frame.PC-fn.Entry()))
+ } else {
+ callersMsg.WriteString(fmt.Sprintf("%s, line %d", frame.Function, frame.Line))
Review Comment:
sad option for telling the line only
##########
go/arrow/array/extension.go:
##########
@@ -74,28 +74,12 @@ func NewExtensionArrayWithStorage(dt arrow.ExtensionType, storage arrow.Array) a
panic(fmt.Errorf("arrow/array: storage type %s for extension type %s, does not match expected type %s", storage.DataType(), dt.ExtensionName(), dt.StorageType()))
}
- base := ExtensionArrayBase{}
Review Comment:
basically, it was a copied code
##########
go/arrow/memory/buffer.go:
##########
@@ -35,7 +35,7 @@ type Buffer struct {
// NewBufferBytes creates a fixed-size buffer from the specified data.
func NewBufferBytes(data []byte) *Buffer {
- return &Buffer{refCount: 0, buf: data, length: len(data)}
+ return &Buffer{refCount: 1, buf: data, length: len(data)}
Review Comment:
for housekeeping
##########
go/parquet/file/record_reader.go:
##########
@@ -783,19 +783,19 @@ func newByteArrayRecordReader(descr *schema.Column, info LevelInfo, dtype arrow.
}}
}
-func (fr *byteArrayRecordReader) ReserveValues(extra int64, hasNullable bool) error {
- fr.bldr.Reserve(int(extra))
- return fr.primitiveRecordReader.ReserveValues(extra, hasNullable)
+func (br *byteArrayRecordReader) ReserveValues(extra int64, hasNullable bool) error {
Review Comment:
just renamed the receiver to have the same name across all methods
##########
go/arrow/memory/checked_allocator.go:
##########
@@ -160,14 +160,24 @@ func (a *CheckedAllocator) AssertSize(t TestingT, sz int) {
break
}
callersMsg.WriteString("\t")
- callersMsg.WriteString(frame.Function)
- callersMsg.WriteString(fmt.Sprintf(" line %d", frame.Line))
+ if fn := frame.Func; fn != nil {
+ callersMsg.WriteString(fmt.Sprintf("%s+%x", fn.Name(), frame.PC-fn.Entry()))
+ } else {
+ callersMsg.WriteString(fmt.Sprintf("%s, line %d", frame.Function, frame.Line))
+ }
+ callersMsg.WriteString("\n\t\t")
+ callersMsg.WriteString(frame.File + ":" + strconv.Itoa(frame.Line))
callersMsg.WriteString("\n")
if !more {
break
}
}
- t.Errorf("LEAK of %d bytes FROM %s line %d\n%v", info.sz, f.Name(), info.line, callersMsg.String())
+ file, line := f.FileLine(info.pc)
+ t.Errorf("LEAK of %d bytes FROM\n\t%s+%x\n\t\t%s:%d\n%v",
Review Comment:
this gives a proper fill filename, so the leak is easier to find (IntelliJ IDEA even allows clicking on a link to line)
##########
go/parquet/pqarrow/column_readers.go:
##########
@@ -117,12 +111,25 @@ func (lr *leafReader) LoadBatch(nrecords int64) (err error) {
}
}
}
- lr.out, err = transferColumnData(lr.recordRdr, lr.field.Type, lr.descr, lr.rctx.mem)
+ lr.out, err = transferColumnData(lr.recordRdr, lr.field.Type, lr.descr)
Review Comment:
mem param was unused
##########
go/parquet/pqarrow/column_readers.go:
##########
@@ -443,14 +454,16 @@ func chunksToSingle(chunked *arrow.Chunked) (arrow.ArrayData, error) {
case 0:
return array.NewData(chunked.DataType(), 0, []*memory.Buffer{nil, nil}, nil, 0, 0), nil
case 1:
- return chunked.Chunk(0).Data(), nil
+ data := chunked.Chunk(0).Data()
+ data.Retain() // we pass control to the caller
Review Comment:
we want the caller to have the full control of the data (so, releasing the array after the chunksToSingle should have no effect on the returned data.
For 0 len it was already true (we constructed a new data), so this retain comes in naturally
##########
go/parquet/pqarrow/column_readers.go:
##########
@@ -525,8 +538,9 @@ func transferZeroCopy(rdr file.RecordReader, dt arrow.DataType) arrow.ArrayData
}
}()
- return array.NewData(dt, rdr.ValuesWritten(), []*memory.Buffer{
- bitmap, values}, nil, int(rdr.NullCount()), 0)
+ return array.NewData(dt, rdr.ValuesWritten(),
+ []*memory.Buffer{bitmap, values},
Review Comment:
put `[]*memory.Buffer{bitmap, values},` on a separate line
##########
go/parquet/pqarrow/encode_arrow_test.go:
##########
@@ -320,6 +320,7 @@ func writeTableToBuffer(t *testing.T, mem memory.Allocator, tbl arrow.Table, row
}
func simpleRoundTrip(t *testing.T, tbl arrow.Table, rowGroupSize int64) {
+ t.Helper()
Review Comment:
so that we see the real failing test
##########
go/arrow/memory/checked_allocator.go:
##########
@@ -160,14 +160,24 @@ func (a *CheckedAllocator) AssertSize(t TestingT, sz int) {
break
}
callersMsg.WriteString("\t")
- callersMsg.WriteString(frame.Function)
- callersMsg.WriteString(fmt.Sprintf(" line %d", frame.Line))
+ if fn := frame.Func; fn != nil {
+ callersMsg.WriteString(fmt.Sprintf("%s+%x", fn.Name(), frame.PC-fn.Entry()))
Review Comment:
offset in bytes from func start, if we have fn (we don't for inlined funcs
##########
go/parquet/pqarrow/encode_arrow_test.go:
##########
@@ -338,6 +339,7 @@ func simpleRoundTrip(t *testing.T, tbl arrow.Table, rowGroupSize int64) {
chunked, err := crdr.NextBatch(tbl.NumRows())
require.NoError(t, err)
+ defer chunked.Release()
Review Comment:
lazy, but only in test
##########
go/parquet/pqarrow/helpers.go:
##########
@@ -0,0 +1,43 @@
+// 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 (
+ "github.com/apache/arrow/go/v13/arrow"
+)
+
+func releaseArrays(arrays []arrow.Array) {
Review Comment:
Helpers that allowed not to define a lot of the same funcs.
This might be useful elsewhere, but for now it's here
##########
go/parquet/pqarrow/encode_dictionary_test.go:
##########
@@ -543,6 +543,7 @@ func (ar *ArrowReadDictSuite) TestIncrementalReads() {
for i := 0; i < numReads; i++ {
chunk, err := col.NextBatch(int64(batchSize))
ar.Require().NoError(err)
+ defer chunk.Release()
Review Comment:
lazy, but only in tests
##########
go/arrow/memory/checked_allocator.go:
##########
@@ -160,14 +160,24 @@ func (a *CheckedAllocator) AssertSize(t TestingT, sz int) {
break
}
callersMsg.WriteString("\t")
- callersMsg.WriteString(frame.Function)
- callersMsg.WriteString(fmt.Sprintf(" line %d", frame.Line))
+ if fn := frame.Func; fn != nil {
+ callersMsg.WriteString(fmt.Sprintf("%s+%x", fn.Name(), frame.PC-fn.Entry()))
+ } else {
+ callersMsg.WriteString(fmt.Sprintf("%s, line %d", frame.Function, frame.Line))
+ }
+ callersMsg.WriteString("\n\t\t")
+ callersMsg.WriteString(frame.File + ":" + strconv.Itoa(frame.Line))
Review Comment:
this gives a proper fill filename, so the leak is easier to find (IntelliJ IDEA even allows clicking on a link to line)
##########
go/parquet/pqarrow/column_readers.go:
##########
@@ -296,11 +306,11 @@ func (sr *structReader) BuildArray(lenBound int64) (*arrow.Chunked, error) {
buffers := make([]*memory.Buffer, 1)
if validityIO.NullCount > 0 {
buffers[0] = nullBitmap
+ defer nullBitmap.Release()
}
-
data := array.NewData(sr.filtered.Type, int(validityIO.Read), buffers, childArrData, int(validityIO.NullCount), 0)
defer data.Release()
- arr := array.MakeFromData(data)
+ arr := array.NewStructData(data)
Review Comment:
call directly
##########
go/parquet/pqarrow/column_readers.go:
##########
@@ -443,14 +454,16 @@ func chunksToSingle(chunked *arrow.Chunked) (arrow.ArrayData, error) {
case 0:
return array.NewData(chunked.DataType(), 0, []*memory.Buffer{nil, nil}, nil, 0, 0), nil
case 1:
- return chunked.Chunk(0).Data(), nil
+ data := chunked.Chunk(0).Data()
+ data.Retain() // we pass control to the caller
+ return data, nil
default: // if an item reader yields a chunked array, this is not yet implemented
return nil, arrow.ErrNotImplemented
}
}
// create a chunked arrow array from the raw record data
-func transferColumnData(rdr file.RecordReader, valueType arrow.DataType, descr *schema.Column, mem memory.Allocator) (*arrow.Chunked, error) {
+func transferColumnData(rdr file.RecordReader, valueType arrow.DataType, descr *schema.Column) (*arrow.Chunked, error) {
Review Comment:
mem param was unused
##########
go/parquet/pqarrow/encode_arrow_test.go:
##########
@@ -1180,7 +1181,7 @@ func prepareListOfListTable(dt arrow.DataType, size, nullCount int, nullablePare
func (ps *ParquetIOTestSuite) TestSingleEmptyListsColumnReadWrite() {
mem := memory.NewCheckedAllocator(memory.DefaultAllocator)
- //defer mem.AssertSize(ps.T(), 0) // FIXME: known leak
+ defer mem.AssertSize(ps.T(), 0)
Review Comment:
return of the original mem check
##########
go/parquet/pqarrow/encode_arrow_test.go:
##########
@@ -1040,10 +1044,7 @@ func (ps *ParquetIOTestSuite) TestSingleColumnRequiredWrite() {
}
}
-func (ps *ParquetIOTestSuite) roundTripTable(_ memory.Allocator, expected arrow.Table, storeSchema bool) {
- mem := memory.NewCheckedAllocator(memory.DefaultAllocator) // FIXME: currently overriding allocator to isolate leaks between roundTripTable and caller
- //defer mem.AssertSize(ps.T(), 0) // FIXME: known leak
-
+func (ps *ParquetIOTestSuite) roundTripTable(mem memory.Allocator, expected arrow.Table, storeSchema bool) {
Review Comment:
return of the original `mem`
##########
go/parquet/pqarrow/encode_dictionary_test.go:
##########
@@ -400,7 +400,7 @@ func (ar *ArrowReadDictSuite) writeSimple() {
pqarrow.DefaultWriterProps()))
}
-func (ArrowReadDictSuite) NullProbabilities() []float64 {
+func (*ArrowReadDictSuite) NullProbabilities() []float64 {
Review Comment:
Go asks to stick to one of the receivers type: either value or pointer (no mixing)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org