ARROW-17638: [Go] Extend C Data API support for Union arrays and RecordReader interface#14057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zeroshade merged 3 commits into from
Sep 7, 2022
Merged

ARROW-17638: [Go] Extend C Data API support for Union arrays and RecordReader interface #14057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b477c5c
extend c array stream to implement array.RecordReader and implement i…
zeroshade Sep 6, 2022
e8f16ef
ensure no memory leaks in the finalizer
zeroshade Sep 6, 2022
360c6e9
operates like other readers now and will release record on finish
zeroshade Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
175 changes: 167 additions & 8 deletions go/arrow/cdata/cdata.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,39 @@ func importSchema(schema *CArrowSchema) (ret arrow.Field, err error) {
st := childFields[0].Type.(*arrow.StructType)
dt = arrow.MapOf(st.Field(0).Type, st.Field(1).Type)
dt.(*arrow.MapType).KeysSorted = (schema.flags & C.ARROW_FLAG_MAP_KEYS_SORTED) != 0
case 'u': // union
var mode arrow.UnionMode
switch f[2] {
case 'd':
mode = arrow.DenseMode
case 's':
mode = arrow.SparseMode
default:
err = fmt.Errorf("%w: invalid union type", arrow.ErrInvalid)
return
}

codes := strings.Split(strings.Split(f, ":")[1], ",")
typeCodes := make([]arrow.UnionTypeCode, 0, len(codes))
for _, i := range codes {
v, e := strconv.ParseInt(i, 10, 8)
if e != nil {
err = fmt.Errorf("%w: invalid type code: %s", arrow.ErrInvalid, e)
return
}
if v < 0 {
err = fmt.Errorf("%w: negative type code in union: format string %s", arrow.ErrInvalid, f)
return
}
typeCodes = append(typeCodes, arrow.UnionTypeCode(v))
}

if len(childFields) != len(typeCodes) {
err = fmt.Errorf("%w: ArrowArray struct number of children incompatible with format string", arrow.ErrInvalid)
return
}

dt = arrow.UnionOf(mode, childFields, typeCodes)
}
}

Expand DownExpand Up@@ -311,6 +344,18 @@ func (imp *cimporter) doImportChildren() error {
if err := imp.children[0].importChild(imp, children[0]); err != nil {
return err
}
case arrow.DENSE_UNION:
dt := imp.dt.(*arrow.DenseUnionType)
for i, c := range children {
imp.children[i].dt = dt.Fields()[i].Type
imp.children[i].importChild(imp, c)
}
case arrow.SPARSE_UNION:
dt := imp.dt.(*arrow.SparseUnionType)
for i, c := range children {
imp.children[i].dt = dt.Fields()[i].Type
imp.children[i].importChild(imp, c)
}
}

return nil
Expand DownExpand Up@@ -407,6 +452,52 @@ func (imp *cimporter) doImport(src *CArrowArray) error {
}

imp.data = array.NewData(dt, int(imp.arr.length), []*memory.Buffer{nulls}, children, int(imp.arr.null_count), int(imp.arr.offset))
case *arrow.DenseUnionType:
if err := imp.checkNoNulls(); err != nil {
return err
}

bufs := []*memory.Buffer{nil, nil, nil}
if imp.arr.n_buffers == 3 {
// legacy format exported by older arrow c++ versions
bufs[1] = imp.importFixedSizeBuffer(1, 1)
bufs[2] = imp.importFixedSizeBuffer(2, int64(arrow.Int32SizeBytes))
} else {
if err := imp.checkNumBuffers(2); err != nil {
return err
}

bufs[1] = imp.importFixedSizeBuffer(0, 1)
bufs[2] = imp.importFixedSizeBuffer(1, int64(arrow.Int32SizeBytes))
}

children := make([]arrow.ArrayData, len(imp.children))
for i := range imp.children {
children[i] = imp.children[i].data
}
imp.data = array.NewData(dt, int(imp.arr.length), bufs, children, 0, int(imp.arr.offset))
case *arrow.SparseUnionType:
if err := imp.checkNoNulls(); err != nil {
return err
}

var buf *memory.Buffer
if imp.arr.n_buffers == 2 {
// legacy format exported by older Arrow C++ versions
buf = imp.importFixedSizeBuffer(1, 1)
} else {
if err := imp.checkNumBuffers(1); err != nil {
return err
}

buf = imp.importFixedSizeBuffer(0, 1)
}

children := make([]arrow.ArrayData, len(imp.children))
for i := range imp.children {
children[i] = imp.children[i].data
}
imp.data = array.NewData(dt, int(imp.arr.length), []*memory.Buffer{nil, buf}, children, 0, int(imp.arr.offset))
default:
return fmt.Errorf("unimplemented type %s", dt)
}
Expand DownExpand Up@@ -494,6 +585,13 @@ func (imp *cimporter) importFixedSizePrimitive() error {

func (imp *cimporter) checkNoChildren() error { return imp.checkNumChildren(0) }

func (imp *cimporter) checkNoNulls() error {
if imp.arr.null_count != 0 {
return fmt.Errorf("%w: unexpected non-zero null count for imported type %s", arrow.ErrInvalid, imp.dt)
}
return nil
}

func (imp *cimporter) checkNumChildren(n int64) error {
if int64(imp.arr.n_children) != n {
return fmt.Errorf("expected %d children, for imported type %s, ArrowArray has %d", n, imp.dt, imp.arr.n_children)
Expand DownExpand Up@@ -558,6 +656,9 @@ func initReader(rdr *nativeCRecordBatchReader, stream *CArrowArrayStream) {
rdr.stream = C.get_stream()
C.ArrowArrayStreamMove(stream, rdr.stream)
runtime.SetFinalizer(rdr, func(r *nativeCRecordBatchReader) {
if r.cur != nil {
r.cur.Release()
}
C.ArrowArrayStreamRelease(r.stream)
C.free(unsafe.Pointer(r.stream))
})
Expand All@@ -567,40 +668,98 @@ func initReader(rdr *nativeCRecordBatchReader, stream *CArrowArrayStream) {
type nativeCRecordBatchReader struct {
stream *CArrowArrayStream
schema *arrow.Schema

cur arrow.Record
err error
}

func (n *nativeCRecordBatchReader) getError(errno int) error {
return fmt.Errorf("%w: %s", syscall.Errno(errno), C.GoString(C.stream_get_last_error(n.stream)))
// No need to implement retain and release here as we used runtime.SetFinalizer when constructing
// the reader to free up the ArrowArrayStream memory when the garbage collector cleans it up.
func (n *nativeCRecordBatchReader) Retain() {}
func (n *nativeCRecordBatchReader) Release() {}

func (n *nativeCRecordBatchReader) Record() arrow.Record { return n.cur }

func (n *nativeCRecordBatchReader) Next() bool {
err := n.next()
switch {
case err == nil:
return true
case err == io.EOF:
return false
}
n.err = err
return false
}

func (n *nativeCRecordBatchReader) Read() (arrow.Record, error) {
func (n *nativeCRecordBatchReader) next() error {
if n.schema == nil {
var sc CArrowSchema
errno := C.stream_get_schema(n.stream, &sc)
if errno != 0 {
return nil, n.getError(int(errno))
return n.getError(int(errno))
}
defer C.ArrowSchemaRelease(&sc)
s, err := ImportCArrowSchema((*CArrowSchema)(&sc))
if err != nil {
return nil, err
return err
}

n.schema = s
}

if n.cur != nil {
n.cur.Release()
n.cur = nil
}

arr := C.get_arr()
defer C.free(unsafe.Pointer(arr))
errno := C.stream_get_next(n.stream, arr)
if errno != 0 {
return nil, n.getError(int(errno))
return n.getError(int(errno))
}

if C.ArrowArrayIsReleased(arr) == 1 {
return nil, io.EOF
return io.EOF
}

rec, err := ImportCRecordBatchWithSchema(arr, n.schema)
if err != nil {
return err
}

return ImportCRecordBatchWithSchema(arr, n.schema)
n.cur = rec
return nil
}

func (n *nativeCRecordBatchReader) Schema() *arrow.Schema {
if n.schema == nil {
var sc CArrowSchema
errno := C.stream_get_schema(n.stream, &sc)
if errno != 0 {
panic(n.getError(int(errno)))
}
defer C.ArrowSchemaRelease(&sc)
s, err := ImportCArrowSchema((*CArrowSchema)(&sc))
if err != nil {
panic(err)
}

n.schema = s
}
return n.schema
}

func (n *nativeCRecordBatchReader) getError(errno int) error {
return fmt.Errorf("%w: %s", syscall.Errno(errno), C.GoString(C.stream_get_last_error(n.stream)))
}

func (n *nativeCRecordBatchReader) Read() (arrow.Record, error) {
if err := n.next(); err != nil {
return nil, err
}
return n.cur, nil
}

func releaseArr(arr *CArrowArray) {
Expand Down
1 change: 0 additions & 1 deletion go/arrow/cdata/cdata_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -646,7 +646,6 @@ func TestRecordReaderStream(t *testing.T) {
}
assert.NoError(t, err)
}
defer rec.Release()

assert.EqualValues(t, 2, rec.NumCols())
assert.Equal(t, "a", rec.ColumnName(0))
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ARROW-17638: [Go] Extend C Data API support for Union arrays and RecordReader interface#14057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

zeroshade
merged 3 commits into

from

Sep 7, 2022
 Merged


ARROW-17638: [Go] Extend C Data API support for Union arrays and RecordReader interface
#14057
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b477c5c

extend c array stream to implement array.RecordReader and implement i…


zeroshade Sep 6, 2022
e8f16ef

ensure no memory leaks in the finalizer


zeroshade Sep 6, 2022
360c6e9

operates like other readers now and will release record on finish


zeroshade Sep 6, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


175 changes: 167 additions & 8 deletions
go/arrow/cdata/cdata.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,39 @@ func importSchema(schema *CArrowSchema) (ret arrow.Field, err error) {
 st := childFields[0].Type.(*arrow.StructType)
 dt = arrow.MapOf(st.Field(0).Type, st.Field(1).Type)
 dt.(*arrow.MapType).KeysSorted = (schema.flags & C.ARROW_FLAG_MAP_KEYS_SORTED) != 0
 case 'u': // union
 var mode arrow.UnionMode
 switch f[2] {
 case 'd':
 mode = arrow.DenseMode
 case 's':
 mode = arrow.SparseMode
 default:
 err = fmt.Errorf("%w: invalid union type", arrow.ErrInvalid)
 return
 }

 codes := strings.Split(strings.Split(f, ":")[1], ",")
 typeCodes := make([]arrow.UnionTypeCode, 0, len(codes))
 for _, i := range codes {
 v, e := strconv.ParseInt(i, 10, 8)
 if e != nil {
 err = fmt.Errorf("%w: invalid type code: %s", arrow.ErrInvalid, e)
 return
 }
 if v < 0 {
 err = fmt.Errorf("%w: negative type code in union: format string %s", arrow.ErrInvalid, f)
 return
 }
 typeCodes = append(typeCodes, arrow.UnionTypeCode(v))
 }

 if len(childFields) != len(typeCodes) {
 err = fmt.Errorf("%w: ArrowArray struct number of children incompatible with format string", arrow.ErrInvalid)
 return
 }

 dt = arrow.UnionOf(mode, childFields, typeCodes)
 }
	}

Expand DownExpand Up@@ -311,6 +344,18 @@ func (imp *cimporter) doImportChildren() error {
 if err := imp.children[0].importChild(imp, children[0]); err != nil {
 return err
 }
	case arrow.DENSE_UNION:
 dt := imp.dt.(*arrow.DenseUnionType)
 for i, c := range children {
 imp.children[i].dt = dt.Fields()[i].Type
 imp.children[i].importChild(imp, c)
 }
	case arrow.SPARSE_UNION:
 dt := imp.dt.(*arrow.SparseUnionType)
 for i, c := range children {
 imp.children[i].dt = dt.Fields()[i].Type
 imp.children[i].importChild(imp, c)
 }
	}

	return nil
Expand DownExpand Up@@ -407,6 +452,52 @@ func (imp *cimporter) doImport(src *CArrowArray) error {
 }

 imp.data = array.NewData(dt, int(imp.arr.length), []*memory.Buffer{nulls}, children, int(imp.arr.null_count), int(imp.arr.offset))
	case *arrow.DenseUnionType:
 if err := imp.checkNoNulls(); err != nil {
 return err
 }

 bufs := []*memory.Buffer{nil, nil, nil}
 if imp.arr.n_buffers == 3 {
 // legacy format exported by older arrow c++ versions
 bufs[1] = imp.importFixedSizeBuffer(1, 1)
 bufs[2] = imp.importFixedSizeBuffer(2, int64(arrow.Int32SizeBytes))
 } else {
 if err := imp.checkNumBuffers(2); err != nil {
 return err
 }

 bufs[1] = imp.importFixedSizeBuffer(0, 1)
 bufs[2] = imp.importFixedSizeBuffer(1, int64(arrow.Int32SizeBytes))
 }

 children := make([]arrow.ArrayData, len(imp.children))
 for i := range imp.children {
 children[i] = imp.children[i].data
 }
 imp.data = array.NewData(dt, int(imp.arr.length), bufs, children, 0, int(imp.arr.offset))
	case *arrow.SparseUnionType:
 if err := imp.checkNoNulls(); err != nil {
 return err
 }

 var buf *memory.Buffer
 if imp.arr.n_buffers == 2 {
 // legacy format exported by older Arrow C++ versions
 buf = imp.importFixedSizeBuffer(1, 1)
 } else {
 if err := imp.checkNumBuffers(1); err != nil {
 return err
 }

 buf = imp.importFixedSizeBuffer(0, 1)
 }

 children := make([]arrow.ArrayData, len(imp.children))
 for i := range imp.children {
 children[i] = imp.children[i].data
 }
 imp.data = array.NewData(dt, int(imp.arr.length), []*memory.Buffer{nil, buf}, children, 0, int(imp.arr.offset))
	default:
 return fmt.Errorf("unimplemented type %s", dt)
	}
Expand DownExpand Up@@ -494,6 +585,13 @@ func (imp *cimporter) importFixedSizePrimitive() error {

func (imp *cimporter) checkNoChildren() error { return imp.checkNumChildren(0) }

func (imp *cimporter) checkNoNulls() error {
	if imp.arr.null_count != 0 {
 return fmt.Errorf("%w: unexpected non-zero null count for imported type %s", arrow.ErrInvalid, imp.dt)
	}
	return nil
}

func (imp *cimporter) checkNumChildren(n int64) error {
	if int64(imp.arr.n_children) != n {
 return fmt.Errorf("expected %d children, for imported type %s, ArrowArray has %d", n, imp.dt, imp.arr.n_children)
Expand DownExpand Up@@ -558,6 +656,9 @@ func initReader(rdr *nativeCRecordBatchReader, stream *CArrowArrayStream) {
	rdr.stream = C.get_stream()
	C.ArrowArrayStreamMove(stream, rdr.stream)
	runtime.SetFinalizer(rdr, func(r *nativeCRecordBatchReader) {
 if r.cur != nil {
 r.cur.Release()
 }
 C.ArrowArrayStreamRelease(r.stream)
 C.free(unsafe.Pointer(r.stream))
	})
Expand All@@ -567,40 +668,98 @@ func initReader(rdr *nativeCRecordBatchReader, stream *CArrowArrayStream) {
type nativeCRecordBatchReader struct {
	stream *CArrowArrayStream
	schema *arrow.Schema

	cur arrow.Record
	err error
}

func (n *nativeCRecordBatchReader) getError(errno int) error {
	return fmt.Errorf("%w: %s", syscall.Errno(errno), C.GoString(C.stream_get_last_error(n.stream)))
// No need to implement retain and release here as we used runtime.SetFinalizer when constructing
// the reader to free up the ArrowArrayStream memory when the garbage collector cleans it up.
func (n *nativeCRecordBatchReader) Retain() {}
func (n *nativeCRecordBatchReader) Release() {}

func (n *nativeCRecordBatchReader) Record() arrow.Record { return n.cur }

func (n *nativeCRecordBatchReader) Next() bool {
	err := n.next()
	switch {
	case err == nil:
 return true
	case err == io.EOF:
 return false
	}
	n.err = err
	return false
}

func (n *nativeCRecordBatchReader) Read() (arrow.Record, error) {
func (n *nativeCRecordBatchReader) next() error {
	if n.schema == nil {
 var sc CArrowSchema
 errno := C.stream_get_schema(n.stream, &sc)
 if errno != 0 {
 return nil, n.getError(int(errno))
 return n.getError(int(errno))
 }
 defer C.ArrowSchemaRelease(&sc)
 s, err := ImportCArrowSchema((*CArrowSchema)(&sc))
 if err != nil {
 return nil, err
 return err
 }

 n.schema = s
	}

	if n.cur != nil {
 n.cur.Release()
 n.cur = nil
	}

	arr := C.get_arr()
	defer C.free(unsafe.Pointer(arr))
	errno := C.stream_get_next(n.stream, arr)
	if errno != 0 {
 return nil, n.getError(int(errno))
 return n.getError(int(errno))
	}

	if C.ArrowArrayIsReleased(arr) == 1 {
 return nil, io.EOF
 return io.EOF
	}

	rec, err := ImportCRecordBatchWithSchema(arr, n.schema)
	if err != nil {
 return err
	}

	return ImportCRecordBatchWithSchema(arr, n.schema)
	n.cur = rec
	return nil
}

func (n *nativeCRecordBatchReader) Schema() *arrow.Schema {
	if n.schema == nil {
 var sc CArrowSchema
 errno := C.stream_get_schema(n.stream, &sc)
 if errno != 0 {
 panic(n.getError(int(errno)))
 }
 defer C.ArrowSchemaRelease(&sc)
 s, err := ImportCArrowSchema((*CArrowSchema)(&sc))
 if err != nil {
 panic(err)
 }

 n.schema = s
	}
	return n.schema
}

func (n *nativeCRecordBatchReader) getError(errno int) error {
	return fmt.Errorf("%w: %s", syscall.Errno(errno), C.GoString(C.stream_get_last_error(n.stream)))
}

func (n *nativeCRecordBatchReader) Read() (arrow.Record, error) {
	if err := n.next(); err != nil {
 return nil, err
	}
	return n.cur, nil
}

func releaseArr(arr *CArrowArray) {
Expand Down

1 change: 0 additions & 1 deletion
go/arrow/cdata/cdata_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -646,7 +646,6 @@ func TestRecordReaderStream(t *testing.T) {
 }
 assert.NoError(t, err)
 }
 defer rec.Release()

 assert.EqualValues(t, 2, rec.NumCols())
 assert.Equal(t, "a", rec.ColumnName(0))
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-17638: [Go] Extend C Data API support for Union arrays and RecordReader interface#14057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

zeroshade
merged 3 commits into

from

Sep 7, 2022
 Merged


ARROW-17638: [Go] Extend C Data API support for Union arrays and RecordReader interface
#14057
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b477c5c

extend c array stream to implement array.RecordReader and implement i…


zeroshade Sep 6, 2022
e8f16ef

ensure no memory leaks in the finalizer


zeroshade Sep 6, 2022
360c6e9

operates like other readers now and will release record on finish


zeroshade Sep 6, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


175 changes: 167 additions & 8 deletions
go/arrow/cdata/cdata.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,39 @@ func importSchema(schema *CArrowSchema) (ret arrow.Field, err error) {
 st := childFields[0].Type.(*arrow.StructType)
 dt = arrow.MapOf(st.Field(0).Type, st.Field(1).Type)
 dt.(*arrow.MapType).KeysSorted = (schema.flags & C.ARROW_FLAG_MAP_KEYS_SORTED) != 0
 case 'u': // union
 var mode arrow.UnionMode
 switch f[2] {
 case 'd':
 mode = arrow.DenseMode
 case 's':
 mode = arrow.SparseMode
 default:
 err = fmt.Errorf("%w: invalid union type", arrow.ErrInvalid)
 return
 }

 codes := strings.Split(strings.Split(f, ":")[1], ",")
 typeCodes := make([]arrow.UnionTypeCode, 0, len(codes))
 for _, i := range codes {
 v, e := strconv.ParseInt(i, 10, 8)
 if e != nil {
 err = fmt.Errorf("%w: invalid type code: %s", arrow.ErrInvalid, e)
 return
 }
 if v < 0 {
 err = fmt.Errorf("%w: negative type code in union: format string %s", arrow.ErrInvalid, f)
 return
 }
 typeCodes = append(typeCodes, arrow.UnionTypeCode(v))
 }

 if len(childFields) != len(typeCodes) {
 err = fmt.Errorf("%w: ArrowArray struct number of children incompatible with format string", arrow.ErrInvalid)
 return
 }

 dt = arrow.UnionOf(mode, childFields, typeCodes)
 }
	}

Expand DownExpand Up@@ -311,6 +344,18 @@ func (imp *cimporter) doImportChildren() error {
 if err := imp.children[0].importChild(imp, children[0]); err != nil {
 return err
 }
	case arrow.DENSE_UNION:
 dt := imp.dt.(*arrow.DenseUnionType)
 for i, c := range children {
 imp.children[i].dt = dt.Fields()[i].Type
 imp.children[i].importChild(imp, c)
 }
	case arrow.SPARSE_UNION:
 dt := imp.dt.(*arrow.SparseUnionType)
 for i, c := range children {
 imp.children[i].dt = dt.Fields()[i].Type
 imp.children[i].importChild(imp, c)
 }
	}

	return nil
Expand DownExpand Up@@ -407,6 +452,52 @@ func (imp *cimporter) doImport(src *CArrowArray) error {
 }

 imp.data = array.NewData(dt, int(imp.arr.length), []*memory.Buffer{nulls}, children, int(imp.arr.null_count), int(imp.arr.offset))
	case *arrow.DenseUnionType:
 if err := imp.checkNoNulls(); err != nil {
 return err
 }

 bufs := []*memory.Buffer{nil, nil, nil}
 if imp.arr.n_buffers == 3 {
 // legacy format exported by older arrow c++ versions
 bufs[1] = imp.importFixedSizeBuffer(1, 1)
 bufs[2] = imp.importFixedSizeBuffer(2, int64(arrow.Int32SizeBytes))
 } else {
 if err := imp.checkNumBuffers(2); err != nil {
 return err
 }

 bufs[1] = imp.importFixedSizeBuffer(0, 1)
 bufs[2] = imp.importFixedSizeBuffer(1, int64(arrow.Int32SizeBytes))
 }

 children := make([]arrow.ArrayData, len(imp.children))
 for i := range imp.children {
 children[i] = imp.children[i].data
 }
 imp.data = array.NewData(dt, int(imp.arr.length), bufs, children, 0, int(imp.arr.offset))
	case *arrow.SparseUnionType:
 if err := imp.checkNoNulls(); err != nil {
 return err
 }

 var buf *memory.Buffer
 if imp.arr.n_buffers == 2 {
 // legacy format exported by older Arrow C++ versions
 buf = imp.importFixedSizeBuffer(1, 1)
 } else {
 if err := imp.checkNumBuffers(1); err != nil {
 return err
 }

 buf = imp.importFixedSizeBuffer(0, 1)
 }

 children := make([]arrow.ArrayData, len(imp.children))
 for i := range imp.children {
 children[i] = imp.children[i].data
 }
 imp.data = array.NewData(dt, int(imp.arr.length), []*memory.Buffer{nil, buf}, children, 0, int(imp.arr.offset))
	default:
 return fmt.Errorf("unimplemented type %s", dt)
	}
Expand DownExpand Up@@ -494,6 +585,13 @@ func (imp *cimporter) importFixedSizePrimitive() error {

func (imp *cimporter) checkNoChildren() error { return imp.checkNumChildren(0) }

func (imp *cimporter) checkNoNulls() error {
	if imp.arr.null_count != 0 {
 return fmt.Errorf("%w: unexpected non-zero null count for imported type %s", arrow.ErrInvalid, imp.dt)
	}
	return nil
}

func (imp *cimporter) checkNumChildren(n int64) error {
	if int64(imp.arr.n_children) != n {
 return fmt.Errorf("expected %d children, for imported type %s, ArrowArray has %d", n, imp.dt, imp.arr.n_children)
Expand DownExpand Up@@ -558,6 +656,9 @@ func initReader(rdr *nativeCRecordBatchReader, stream *CArrowArrayStream) {
	rdr.stream = C.get_stream()
	C.ArrowArrayStreamMove(stream, rdr.stream)
	runtime.SetFinalizer(rdr, func(r *nativeCRecordBatchReader) {
 if r.cur != nil {
 r.cur.Release()
 }
 C.ArrowArrayStreamRelease(r.stream)
 C.free(unsafe.Pointer(r.stream))
	})
Expand All@@ -567,40 +668,98 @@ func initReader(rdr *nativeCRecordBatchReader, stream *CArrowArrayStream) {
type nativeCRecordBatchReader struct {
	stream *CArrowArrayStream
	schema *arrow.Schema

	cur arrow.Record
	err error
}

func (n *nativeCRecordBatchReader) getError(errno int) error {
	return fmt.Errorf("%w: %s", syscall.Errno(errno), C.GoString(C.stream_get_last_error(n.stream)))
// No need to implement retain and release here as we used runtime.SetFinalizer when constructing
// the reader to free up the ArrowArrayStream memory when the garbage collector cleans it up.
func (n *nativeCRecordBatchReader) Retain() {}
func (n *nativeCRecordBatchReader) Release() {}

func (n *nativeCRecordBatchReader) Record() arrow.Record { return n.cur }

func (n *nativeCRecordBatchReader) Next() bool {
	err := n.next()
	switch {
	case err == nil:
 return true
	case err == io.EOF:
 return false
	}
	n.err = err
	return false
}

func (n *nativeCRecordBatchReader) Read() (arrow.Record, error) {
func (n *nativeCRecordBatchReader) next() error {
	if n.schema == nil {
 var sc CArrowSchema
 errno := C.stream_get_schema(n.stream, &sc)
 if errno != 0 {
 return nil, n.getError(int(errno))
 return n.getError(int(errno))
 }
 defer C.ArrowSchemaRelease(&sc)
 s, err := ImportCArrowSchema((*CArrowSchema)(&sc))
 if err != nil {
 return nil, err
 return err
 }

 n.schema = s
	}

	if n.cur != nil {
 n.cur.Release()
 n.cur = nil
	}

	arr := C.get_arr()
	defer C.free(unsafe.Pointer(arr))
	errno := C.stream_get_next(n.stream, arr)
	if errno != 0 {
 return nil, n.getError(int(errno))
 return n.getError(int(errno))
	}

	if C.ArrowArrayIsReleased(arr) == 1 {
 return nil, io.EOF
 return io.EOF
	}

	rec, err := ImportCRecordBatchWithSchema(arr, n.schema)
	if err != nil {
 return err
	}

	return ImportCRecordBatchWithSchema(arr, n.schema)
	n.cur = rec
	return nil
}

func (n *nativeCRecordBatchReader) Schema() *arrow.Schema {
	if n.schema == nil {
 var sc CArrowSchema
 errno := C.stream_get_schema(n.stream, &sc)
 if errno != 0 {
 panic(n.getError(int(errno)))
 }
 defer C.ArrowSchemaRelease(&sc)
 s, err := ImportCArrowSchema((*CArrowSchema)(&sc))
 if err != nil {
 panic(err)
 }

 n.schema = s
	}
	return n.schema
}

func (n *nativeCRecordBatchReader) getError(errno int) error {
	return fmt.Errorf("%w: %s", syscall.Errno(errno), C.GoString(C.stream_get_last_error(n.stream)))
}

func (n *nativeCRecordBatchReader) Read() (arrow.Record, error) {
	if err := n.next(); err != nil {
 return nil, err
	}
	return n.cur, nil
}

func releaseArr(arr *CArrowArray) {
Expand Down

1 change: 0 additions & 1 deletion
go/arrow/cdata/cdata_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -646,7 +646,6 @@ func TestRecordReaderStream(t *testing.T) {
 }
 assert.NoError(t, err)
 }
 defer rec.Release()

 assert.EqualValues(t, 2, rec.NumCols())
 assert.Equal(t, "a", rec.ColumnName(0))
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-17638: [Go] Extend C Data API support for Union arrays and RecordReader interface#14057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

zeroshade
merged 3 commits into

from

Sep 7, 2022
 Merged


ARROW-17638: [Go] Extend C Data API support for Union arrays and RecordReader interface
#14057
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b477c5c

extend c array stream to implement array.RecordReader and implement i…


zeroshade Sep 6, 2022
e8f16ef

ensure no memory leaks in the finalizer


zeroshade Sep 6, 2022
360c6e9

operates like other readers now and will release record on finish


zeroshade Sep 6, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


175 changes: 167 additions & 8 deletions
go/arrow/cdata/cdata.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,39 @@ func importSchema(schema *CArrowSchema) (ret arrow.Field, err error) {
 st := childFields[0].Type.(*arrow.StructType)
 dt = arrow.MapOf(st.Field(0).Type, st.Field(1).Type)
 dt.(*arrow.MapType).KeysSorted = (schema.flags & C.ARROW_FLAG_MAP_KEYS_SORTED) != 0
 case 'u': // union
 var mode arrow.UnionMode
 switch f[2] {
 case 'd':
 mode = arrow.DenseMode
 case 's':
 mode = arrow.SparseMode
 default:
 err = fmt.Errorf("%w: invalid union type", arrow.ErrInvalid)
 return
 }

 codes := strings.Split(strings.Split(f, ":")[1], ",")
 typeCodes := make([]arrow.UnionTypeCode, 0, len(codes))
 for _, i := range codes {
 v, e := strconv.ParseInt(i, 10, 8)
 if e != nil {
 err = fmt.Errorf("%w: invalid type code: %s", arrow.ErrInvalid, e)
 return
 }
 if v < 0 {
 err = fmt.Errorf("%w: negative type code in union: format string %s", arrow.ErrInvalid, f)
 return
 }
 typeCodes = append(typeCodes, arrow.UnionTypeCode(v))
 }

 if len(childFields) != len(typeCodes) {
 err = fmt.Errorf("%w: ArrowArray struct number of children incompatible with format string", arrow.ErrInvalid)
 return
 }

 dt = arrow.UnionOf(mode, childFields, typeCodes)
 }
	}

Expand DownExpand Up@@ -311,6 +344,18 @@ func (imp *cimporter) doImportChildren() error {
 if err := imp.children[0].importChild(imp, children[0]); err != nil {
 return err
 }
	case arrow.DENSE_UNION:
 dt := imp.dt.(*arrow.DenseUnionType)
 for i, c := range children {
 imp.children[i].dt = dt.Fields()[i].Type
 imp.children[i].importChild(imp, c)
 }
	case arrow.SPARSE_UNION:
 dt := imp.dt.(*arrow.SparseUnionType)
 for i, c := range children {
 imp.children[i].dt = dt.Fields()[i].Type
 imp.children[i].importChild(imp, c)
 }
	}

	return nil
Expand DownExpand Up@@ -407,6 +452,52 @@ func (imp *cimporter) doImport(src *CArrowArray) error {
 }

 imp.data = array.NewData(dt, int(imp.arr.length), []*memory.Buffer{nulls}, children, int(imp.arr.null_count), int(imp.arr.offset))
	case *arrow.DenseUnionType:
 if err := imp.checkNoNulls(); err != nil {
 return err
 }

 bufs := []*memory.Buffer{nil, nil, nil}
 if imp.arr.n_buffers == 3 {
 // legacy format exported by older arrow c++ versions
 bufs[1] = imp.importFixedSizeBuffer(1, 1)
 bufs[2] = imp.importFixedSizeBuffer(2, int64(arrow.Int32SizeBytes))
 } else {
 if err := imp.checkNumBuffers(2); err != nil {
 return err
 }

 bufs[1] = imp.importFixedSizeBuffer(0, 1)
 bufs[2] = imp.importFixedSizeBuffer(1, int64(arrow.Int32SizeBytes))
 }

 children := make([]arrow.ArrayData, len(imp.children))
 for i := range imp.children {
 children[i] = imp.children[i].data
 }
 imp.data = array.NewData(dt, int(imp.arr.length), bufs, children, 0, int(imp.arr.offset))
	case *arrow.SparseUnionType:
 if err := imp.checkNoNulls(); err != nil {
 return err
 }

 var buf *memory.Buffer
 if imp.arr.n_buffers == 2 {
 // legacy format exported by older Arrow C++ versions
 buf = imp.importFixedSizeBuffer(1, 1)
 } else {
 if err := imp.checkNumBuffers(1); err != nil {
 return err
 }

 buf = imp.importFixedSizeBuffer(0, 1)
 }

 children := make([]arrow.ArrayData, len(imp.children))
 for i := range imp.children {
 children[i] = imp.children[i].data
 }
 imp.data = array.NewData(dt, int(imp.arr.length), []*memory.Buffer{nil, buf}, children, 0, int(imp.arr.offset))
	default:
 return fmt.Errorf("unimplemented type %s", dt)
	}
Expand DownExpand Up@@ -494,6 +585,13 @@ func (imp *cimporter) importFixedSizePrimitive() error {

func (imp *cimporter) checkNoChildren() error { return imp.checkNumChildren(0) }

func (imp *cimporter) checkNoNulls() error {
	if imp.arr.null_count != 0 {
 return fmt.Errorf("%w: unexpected non-zero null count for imported type %s", arrow.ErrInvalid, imp.dt)
	}
	return nil
}

func (imp *cimporter) checkNumChildren(n int64) error {
	if int64(imp.arr.n_children) != n {
 return fmt.Errorf("expected %d children, for imported type %s, ArrowArray has %d", n, imp.dt, imp.arr.n_children)
Expand DownExpand Up@@ -558,6 +656,9 @@ func initReader(rdr *nativeCRecordBatchReader, stream *CArrowArrayStream) {
	rdr.stream = C.get_stream()
	C.ArrowArrayStreamMove(stream, rdr.stream)
	runtime.SetFinalizer(rdr, func(r *nativeCRecordBatchReader) {
 if r.cur != nil {
 r.cur.Release()
 }
 C.ArrowArrayStreamRelease(r.stream)
 C.free(unsafe.Pointer(r.stream))
	})
Expand All@@ -567,40 +668,98 @@ func initReader(rdr *nativeCRecordBatchReader, stream *CArrowArrayStream) {
type nativeCRecordBatchReader struct {
	stream *CArrowArrayStream
	schema *arrow.Schema

	cur arrow.Record
	err error
}

func (n *nativeCRecordBatchReader) getError(errno int) error {
	return fmt.Errorf("%w: %s", syscall.Errno(errno), C.GoString(C.stream_get_last_error(n.stream)))
// No need to implement retain and release here as we used runtime.SetFinalizer when constructing
// the reader to free up the ArrowArrayStream memory when the garbage collector cleans it up.
func (n *nativeCRecordBatchReader) Retain() {}
func (n *nativeCRecordBatchReader) Release() {}

func (n *nativeCRecordBatchReader) Record() arrow.Record { return n.cur }

func (n *nativeCRecordBatchReader) Next() bool {
	err := n.next()
	switch {
	case err == nil:
 return true
	case err == io.EOF:
 return false
	}
	n.err = err
	return false
}

func (n *nativeCRecordBatchReader) Read() (arrow.Record, error) {
func (n *nativeCRecordBatchReader) next() error {
	if n.schema == nil {
 var sc CArrowSchema
 errno := C.stream_get_schema(n.stream, &sc)
 if errno != 0 {
 return nil, n.getError(int(errno))
 return n.getError(int(errno))
 }
 defer C.ArrowSchemaRelease(&sc)
 s, err := ImportCArrowSchema((*CArrowSchema)(&sc))
 if err != nil {
 return nil, err
 return err
 }

 n.schema = s
	}

	if n.cur != nil {
 n.cur.Release()
 n.cur = nil
	}

	arr := C.get_arr()
	defer C.free(unsafe.Pointer(arr))
	errno := C.stream_get_next(n.stream, arr)
	if errno != 0 {
 return nil, n.getError(int(errno))
 return n.getError(int(errno))
	}

	if C.ArrowArrayIsReleased(arr) == 1 {
 return nil, io.EOF
 return io.EOF
	}

	rec, err := ImportCRecordBatchWithSchema(arr, n.schema)
	if err != nil {
 return err
	}

	return ImportCRecordBatchWithSchema(arr, n.schema)
	n.cur = rec
	return nil
}

func (n *nativeCRecordBatchReader) Schema() *arrow.Schema {
	if n.schema == nil {
 var sc CArrowSchema
 errno := C.stream_get_schema(n.stream, &sc)
 if errno != 0 {
 panic(n.getError(int(errno)))
 }
 defer C.ArrowSchemaRelease(&sc)
 s, err := ImportCArrowSchema((*CArrowSchema)(&sc))
 if err != nil {
 panic(err)
 }

 n.schema = s
	}
	return n.schema
}

func (n *nativeCRecordBatchReader) getError(errno int) error {
	return fmt.Errorf("%w: %s", syscall.Errno(errno), C.GoString(C.stream_get_last_error(n.stream)))
}

func (n *nativeCRecordBatchReader) Read() (arrow.Record, error) {
	if err := n.next(); err != nil {
 return nil, err
	}
	return n.cur, nil
}

func releaseArr(arr *CArrowArray) {
Expand Down

1 change: 0 additions & 1 deletion
go/arrow/cdata/cdata_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -646,7 +646,6 @@ func TestRecordReaderStream(t *testing.T) {
 }
 assert.NoError(t, err)
 }
 defer rec.Release()

 assert.EqualValues(t, 2, rec.NumCols())
 assert.Equal(t, "a", rec.ColumnName(0))
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ARROW-17638: [Go] Extend C Data API support for Union arrays and RecordReader interface#14057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

zeroshade
merged 3 commits into

from

Sep 7, 2022
 Merged


ARROW-17638: [Go] Extend C Data API support for Union arrays and RecordReader interface
#14057
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b477c5c

extend c array stream to implement array.RecordReader and implement i…


zeroshade Sep 6, 2022
e8f16ef

ensure no memory leaks in the finalizer


zeroshade Sep 6, 2022
360c6e9

operates like other readers now and will release record on finish


zeroshade Sep 6, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


175 changes: 167 additions & 8 deletions
go/arrow/cdata/cdata.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,39 @@ func importSchema(schema *CArrowSchema) (ret arrow.Field, err error) {
 st := childFields[0].Type.(*arrow.StructType)
 dt = arrow.MapOf(st.Field(0).Type, st.Field(1).Type)
 dt.(*arrow.MapType).KeysSorted = (schema.flags & C.ARROW_FLAG_MAP_KEYS_SORTED) != 0
 case 'u': // union
 var mode arrow.UnionMode
 switch f[2] {
 case 'd':
 mode = arrow.DenseMode
 case 's':
 mode = arrow.SparseMode
 default:
 err = fmt.Errorf("%w: invalid union type", arrow.ErrInvalid)
 return
 }

 codes := strings.Split(strings.Split(f, ":")[1], ",")
 typeCodes := make([]arrow.UnionTypeCode, 0, len(codes))
 for _, i := range codes {
 v, e := strconv.ParseInt(i, 10, 8)
 if e != nil {
 err = fmt.Errorf("%w: invalid type code: %s", arrow.ErrInvalid, e)
 return
 }
 if v < 0 {
 err = fmt.Errorf("%w: negative type code in union: format string %s", arrow.ErrInvalid, f)
 return
 }
 typeCodes = append(typeCodes, arrow.UnionTypeCode(v))
 }

 if len(childFields) != len(typeCodes) {
 err = fmt.Errorf("%w: ArrowArray struct number of children incompatible with format string", arrow.ErrInvalid)
 return
 }

 dt = arrow.UnionOf(mode, childFields, typeCodes)
 }
	}

Expand DownExpand Up@@ -311,6 +344,18 @@ func (imp *cimporter) doImportChildren() error {
 if err := imp.children[0].importChild(imp, children[0]); err != nil {
 return err
 }
	case arrow.DENSE_UNION:
 dt := imp.dt.(*arrow.DenseUnionType)
 for i, c := range children {
 imp.children[i].dt = dt.Fields()[i].Type
 imp.children[i].importChild(imp, c)
 }
	case arrow.SPARSE_UNION:
 dt := imp.dt.(*arrow.SparseUnionType)
 for i, c := range children {
 imp.children[i].dt = dt.Fields()[i].Type
 imp.children[i].importChild(imp, c)
 }
	}

	return nil
Expand DownExpand Up@@ -407,6 +452,52 @@ func (imp *cimporter) doImport(src *CArrowArray) error {
 }

 imp.data = array.NewData(dt, int(imp.arr.length), []*memory.Buffer{nulls}, children, int(imp.arr.null_count), int(imp.arr.offset))
	case *arrow.DenseUnionType:
 if err := imp.checkNoNulls(); err != nil {
 return err
 }

 bufs := []*memory.Buffer{nil, nil, nil}
 if imp.arr.n_buffers == 3 {
 // legacy format exported by older arrow c++ versions
 bufs[1] = imp.importFixedSizeBuffer(1, 1)
 bufs[2] = imp.importFixedSizeBuffer(2, int64(arrow.Int32SizeBytes))
 } else {
 if err := imp.checkNumBuffers(2); err != nil {
 return err
 }

 bufs[1] = imp.importFixedSizeBuffer(0, 1)
 bufs[2] = imp.importFixedSizeBuffer(1, int64(arrow.Int32SizeBytes))
 }

 children := make([]arrow.ArrayData, len(imp.children))
 for i := range imp.children {
 children[i] = imp.children[i].data
 }
 imp.data = array.NewData(dt, int(imp.arr.length), bufs, children, 0, int(imp.arr.offset))
	case *arrow.SparseUnionType:
 if err := imp.checkNoNulls(); err != nil {
 return err
 }

 var buf *memory.Buffer
 if imp.arr.n_buffers == 2 {
 // legacy format exported by older Arrow C++ versions
 buf = imp.importFixedSizeBuffer(1, 1)
 } else {
 if err := imp.checkNumBuffers(1); err != nil {
 return err
 }

 buf = imp.importFixedSizeBuffer(0, 1)
 }

 children := make([]arrow.ArrayData, len(imp.children))
 for i := range imp.children {
 children[i] = imp.children[i].data
 }
 imp.data = array.NewData(dt, int(imp.arr.length), []*memory.Buffer{nil, buf}, children, 0, int(imp.arr.offset))
	default:
 return fmt.Errorf("unimplemented type %s", dt)
	}
Expand DownExpand Up@@ -494,6 +585,13 @@ func (imp *cimporter) importFixedSizePrimitive() error {

func (imp *cimporter) checkNoChildren() error { return imp.checkNumChildren(0) }

func (imp *cimporter) checkNoNulls() error {
	if imp.arr.null_count != 0 {
 return fmt.Errorf("%w: unexpected non-zero null count for imported type %s", arrow.ErrInvalid, imp.dt)
	}
	return nil
}

func (imp *cimporter) checkNumChildren(n int64) error {
	if int64(imp.arr.n_children) != n {
 return fmt.Errorf("expected %d children, for imported type %s, ArrowArray has %d", n, imp.dt, imp.arr.n_children)
Expand DownExpand Up@@ -558,6 +656,9 @@ func initReader(rdr *nativeCRecordBatchReader, stream *CArrowArrayStream) {
	rdr.stream = C.get_stream()
	C.ArrowArrayStreamMove(stream, rdr.stream)
	runtime.SetFinalizer(rdr, func(r *nativeCRecordBatchReader) {
 if r.cur != nil {
 r.cur.Release()
 }
 C.ArrowArrayStreamRelease(r.stream)
 C.free(unsafe.Pointer(r.stream))
	})
Expand All@@ -567,40 +668,98 @@ func initReader(rdr *nativeCRecordBatchReader, stream *CArrowArrayStream) {
type nativeCRecordBatchReader struct {
	stream *CArrowArrayStream
	schema *arrow.Schema

	cur arrow.Record
	err error
}

func (n *nativeCRecordBatchReader) getError(errno int) error {
	return fmt.Errorf("%w: %s", syscall.Errno(errno), C.GoString(C.stream_get_last_error(n.stream)))
// No need to implement retain and release here as we used runtime.SetFinalizer when constructing
// the reader to free up the ArrowArrayStream memory when the garbage collector cleans it up.
func (n *nativeCRecordBatchReader) Retain() {}
func (n *nativeCRecordBatchReader) Release() {}

func (n *nativeCRecordBatchReader) Record() arrow.Record { return n.cur }

func (n *nativeCRecordBatchReader) Next() bool {
	err := n.next()
	switch {
	case err == nil:
 return true
	case err == io.EOF:
 return false
	}
	n.err = err
	return false
}

func (n *nativeCRecordBatchReader) Read() (arrow.Record, error) {
func (n *nativeCRecordBatchReader) next() error {
	if n.schema == nil {
 var sc CArrowSchema
 errno := C.stream_get_schema(n.stream, &sc)
 if errno != 0 {
 return nil, n.getError(int(errno))
 return n.getError(int(errno))
 }
 defer C.ArrowSchemaRelease(&sc)
 s, err := ImportCArrowSchema((*CArrowSchema)(&sc))
 if err != nil {
 return nil, err
 return err
 }

 n.schema = s
	}

	if n.cur != nil {
 n.cur.Release()
 n.cur = nil
	}

	arr := C.get_arr()
	defer C.free(unsafe.Pointer(arr))
	errno := C.stream_get_next(n.stream, arr)
	if errno != 0 {
 return nil, n.getError(int(errno))
 return n.getError(int(errno))
	}

	if C.ArrowArrayIsReleased(arr) == 1 {
 return nil, io.EOF
 return io.EOF
	}

	rec, err := ImportCRecordBatchWithSchema(arr, n.schema)
	if err != nil {
 return err
	}

	return ImportCRecordBatchWithSchema(arr, n.schema)
	n.cur = rec
	return nil
}

func (n *nativeCRecordBatchReader) Schema() *arrow.Schema {
	if n.schema == nil {
 var sc CArrowSchema
 errno := C.stream_get_schema(n.stream, &sc)
 if errno != 0 {
 panic(n.getError(int(errno)))
 }
 defer C.ArrowSchemaRelease(&sc)
 s, err := ImportCArrowSchema((*CArrowSchema)(&sc))
 if err != nil {
 panic(err)
 }

 n.schema = s
	}
	return n.schema
}

func (n *nativeCRecordBatchReader) getError(errno int) error {
	return fmt.Errorf("%w: %s", syscall.Errno(errno), C.GoString(C.stream_get_last_error(n.stream)))
}

func (n *nativeCRecordBatchReader) Read() (arrow.Record, error) {
	if err := n.next(); err != nil {
 return nil, err
	}
	return n.cur, nil
}

func releaseArr(arr *CArrowArray) {
Expand Down

1 change: 0 additions & 1 deletion
go/arrow/cdata/cdata_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -646,7 +646,6 @@ func TestRecordReaderStream(t *testing.T) {
 }
 assert.NoError(t, err)
 }
 defer rec.Release()

 assert.EqualValues(t, 2, rec.NumCols())
 assert.Equal(t, "a", rec.ColumnName(0))
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-17638: [Go] Extend C Data API support for Union arrays and RecordReader interface#14057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

zeroshade
merged 3 commits into

from

Sep 7, 2022
 Merged


ARROW-17638: [Go] Extend C Data API support for Union arrays and RecordReader interface
#14057
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b477c5c

extend c array stream to implement array.RecordReader and implement i…


zeroshade Sep 6, 2022
e8f16ef

ensure no memory leaks in the finalizer


zeroshade Sep 6, 2022
360c6e9

operates like other readers now and will release record on finish


zeroshade Sep 6, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


175 changes: 167 additions & 8 deletions
go/arrow/cdata/cdata.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,39 @@ func importSchema(schema *CArrowSchema) (ret arrow.Field, err error) {
 st := childFields[0].Type.(*arrow.StructType)
 dt = arrow.MapOf(st.Field(0).Type, st.Field(1).Type)
 dt.(*arrow.MapType).KeysSorted = (schema.flags & C.ARROW_FLAG_MAP_KEYS_SORTED) != 0
 case 'u': // union
 var mode arrow.UnionMode
 switch f[2] {
 case 'd':
 mode = arrow.DenseMode
 case 's':
 mode = arrow.SparseMode
 default:
 err = fmt.Errorf("%w: invalid union type", arrow.ErrInvalid)
 return
 }

 codes := strings.Split(strings.Split(f, ":")[1], ",")
 typeCodes := make([]arrow.UnionTypeCode, 0, len(codes))
 for _, i := range codes {
 v, e := strconv.ParseInt(i, 10, 8)
 if e != nil {
 err = fmt.Errorf("%w: invalid type code: %s", arrow.ErrInvalid, e)
 return
 }
 if v < 0 {
 err = fmt.Errorf("%w: negative type code in union: format string %s", arrow.ErrInvalid, f)
 return
 }
 typeCodes = append(typeCodes, arrow.UnionTypeCode(v))
 }

 if len(childFields) != len(typeCodes) {
 err = fmt.Errorf("%w: ArrowArray struct number of children incompatible with format string", arrow.ErrInvalid)
 return
 }

 dt = arrow.UnionOf(mode, childFields, typeCodes)
 }
	}

Expand DownExpand Up@@ -311,6 +344,18 @@ func (imp *cimporter) doImportChildren() error {
 if err := imp.children[0].importChild(imp, children[0]); err != nil {
 return err
 }
	case arrow.DENSE_UNION:
 dt := imp.dt.(*arrow.DenseUnionType)
 for i, c := range children {
 imp.children[i].dt = dt.Fields()[i].Type
 imp.children[i].importChild(imp, c)
 }
	case arrow.SPARSE_UNION:
 dt := imp.dt.(*arrow.SparseUnionType)
 for i, c := range children {
 imp.children[i].dt = dt.Fields()[i].Type
 imp.children[i].importChild(imp, c)
 }
	}

	return nil
Expand DownExpand Up@@ -407,6 +452,52 @@ func (imp *cimporter) doImport(src *CArrowArray) error {
 }

 imp.data = array.NewData(dt, int(imp.arr.length), []*memory.Buffer{nulls}, children, int(imp.arr.null_count), int(imp.arr.offset))
	case *arrow.DenseUnionType:
 if err := imp.checkNoNulls(); err != nil {
 return err
 }

 bufs := []*memory.Buffer{nil, nil, nil}
 if imp.arr.n_buffers == 3 {
 // legacy format exported by older arrow c++ versions
 bufs[1] = imp.importFixedSizeBuffer(1, 1)
 bufs[2] = imp.importFixedSizeBuffer(2, int64(arrow.Int32SizeBytes))
 } else {
 if err := imp.checkNumBuffers(2); err != nil {
 return err
 }

 bufs[1] = imp.importFixedSizeBuffer(0, 1)
 bufs[2] = imp.importFixedSizeBuffer(1, int64(arrow.Int32SizeBytes))
 }

 children := make([]arrow.ArrayData, len(imp.children))
 for i := range imp.children {
 children[i] = imp.children[i].data
 }
 imp.data = array.NewData(dt, int(imp.arr.length), bufs, children, 0, int(imp.arr.offset))
	case *arrow.SparseUnionType:
 if err := imp.checkNoNulls(); err != nil {
 return err
 }

 var buf *memory.Buffer
 if imp.arr.n_buffers == 2 {
 // legacy format exported by older Arrow C++ versions
 buf = imp.importFixedSizeBuffer(1, 1)
 } else {
 if err := imp.checkNumBuffers(1); err != nil {
 return err
 }

 buf = imp.importFixedSizeBuffer(0, 1)
 }

 children := make([]arrow.ArrayData, len(imp.children))
 for i := range imp.children {
 children[i] = imp.children[i].data
 }
 imp.data = array.NewData(dt, int(imp.arr.length), []*memory.Buffer{nil, buf}, children, 0, int(imp.arr.offset))
	default:
 return fmt.Errorf("unimplemented type %s", dt)
	}
Expand DownExpand Up@@ -494,6 +585,13 @@ func (imp *cimporter) importFixedSizePrimitive() error {

func (imp *cimporter) checkNoChildren() error { return imp.checkNumChildren(0) }

func (imp *cimporter) checkNoNulls() error {
	if imp.arr.null_count != 0 {
 return fmt.Errorf("%w: unexpected non-zero null count for imported type %s", arrow.ErrInvalid, imp.dt)
	}
	return nil
}

func (imp *cimporter) checkNumChildren(n int64) error {
	if int64(imp.arr.n_children) != n {
 return fmt.Errorf("expected %d children, for imported type %s, ArrowArray has %d", n, imp.dt, imp.arr.n_children)
Expand DownExpand Up@@ -558,6 +656,9 @@ func initReader(rdr *nativeCRecordBatchReader, stream *CArrowArrayStream) {
	rdr.stream = C.get_stream()
	C.ArrowArrayStreamMove(stream, rdr.stream)
	runtime.SetFinalizer(rdr, func(r *nativeCRecordBatchReader) {
 if r.cur != nil {
 r.cur.Release()
 }
 C.ArrowArrayStreamRelease(r.stream)
 C.free(unsafe.Pointer(r.stream))
	})
Expand All@@ -567,40 +668,98 @@ func initReader(rdr *nativeCRecordBatchReader, stream *CArrowArrayStream) {
type nativeCRecordBatchReader struct {
	stream *CArrowArrayStream
	schema *arrow.Schema

	cur arrow.Record
	err error
}

func (n *nativeCRecordBatchReader) getError(errno int) error {
	return fmt.Errorf("%w: %s", syscall.Errno(errno), C.GoString(C.stream_get_last_error(n.stream)))
// No need to implement retain and release here as we used runtime.SetFinalizer when constructing
// the reader to free up the ArrowArrayStream memory when the garbage collector cleans it up.
func (n *nativeCRecordBatchReader) Retain() {}
func (n *nativeCRecordBatchReader) Release() {}

func (n *nativeCRecordBatchReader) Record() arrow.Record { return n.cur }

func (n *nativeCRecordBatchReader) Next() bool {
	err := n.next()
	switch {
	case err == nil:
 return true
	case err == io.EOF:
 return false
	}
	n.err = err
	return false
}

func (n *nativeCRecordBatchReader) Read() (arrow.Record, error) {
func (n *nativeCRecordBatchReader) next() error {
	if n.schema == nil {
 var sc CArrowSchema
 errno := C.stream_get_schema(n.stream, &sc)
 if errno != 0 {
 return nil, n.getError(int(errno))
 return n.getError(int(errno))
 }
 defer C.ArrowSchemaRelease(&sc)
 s, err := ImportCArrowSchema((*CArrowSchema)(&sc))
 if err != nil {
 return nil, err
 return err
 }

 n.schema = s
	}

	if n.cur != nil {
 n.cur.Release()
 n.cur = nil
	}

	arr := C.get_arr()
	defer C.free(unsafe.Pointer(arr))
	errno := C.stream_get_next(n.stream, arr)
	if errno != 0 {
 return nil, n.getError(int(errno))
 return n.getError(int(errno))
	}

	if C.ArrowArrayIsReleased(arr) == 1 {
 return nil, io.EOF
 return io.EOF
	}

	rec, err := ImportCRecordBatchWithSchema(arr, n.schema)
	if err != nil {
 return err
	}

	return ImportCRecordBatchWithSchema(arr, n.schema)
	n.cur = rec
	return nil
}

func (n *nativeCRecordBatchReader) Schema() *arrow.Schema {
	if n.schema == nil {
 var sc CArrowSchema
 errno := C.stream_get_schema(n.stream, &sc)
 if errno != 0 {
 panic(n.getError(int(errno)))
 }
 defer C.ArrowSchemaRelease(&sc)
 s, err := ImportCArrowSchema((*CArrowSchema)(&sc))
 if err != nil {
 panic(err)
 }

 n.schema = s
	}
	return n.schema
}

func (n *nativeCRecordBatchReader) getError(errno int) error {
	return fmt.Errorf("%w: %s", syscall.Errno(errno), C.GoString(C.stream_get_last_error(n.stream)))
}

func (n *nativeCRecordBatchReader) Read() (arrow.Record, error) {
	if err := n.next(); err != nil {
 return nil, err
	}
	return n.cur, nil
}

func releaseArr(arr *CArrowArray) {
Expand Down

1 change: 0 additions & 1 deletion
go/arrow/cdata/cdata_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -646,7 +646,6 @@ func TestRecordReaderStream(t *testing.T) {
 }
 assert.NoError(t, err)
 }
 defer rec.Release()

 assert.EqualValues(t, 2, rec.NumCols())
 assert.Equal(t, "a", rec.ColumnName(0))
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-17638: [Go] Extend C Data API support for Union arrays and RecordReader interface#14057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

zeroshade
merged 3 commits into

from

Sep 7, 2022
 Merged


ARROW-17638: [Go] Extend C Data API support for Union arrays and RecordReader interface
#14057
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b477c5c

extend c array stream to implement array.RecordReader and implement i…


zeroshade Sep 6, 2022
e8f16ef

ensure no memory leaks in the finalizer


zeroshade Sep 6, 2022
360c6e9

operates like other readers now and will release record on finish


zeroshade Sep 6, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


175 changes: 167 additions & 8 deletions
go/arrow/cdata/cdata.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,39 @@ func importSchema(schema *CArrowSchema) (ret arrow.Field, err error) {
 st := childFields[0].Type.(*arrow.StructType)
 dt = arrow.MapOf(st.Field(0).Type, st.Field(1).Type)
 dt.(*arrow.MapType).KeysSorted = (schema.flags & C.ARROW_FLAG_MAP_KEYS_SORTED) != 0
 case 'u': // union
 var mode arrow.UnionMode
 switch f[2] {
 case 'd':
 mode = arrow.DenseMode
 case 's':
 mode = arrow.SparseMode
 default:
 err = fmt.Errorf("%w: invalid union type", arrow.ErrInvalid)
 return
 }

 codes := strings.Split(strings.Split(f, ":")[1], ",")
 typeCodes := make([]arrow.UnionTypeCode, 0, len(codes))
 for _, i := range codes {
 v, e := strconv.ParseInt(i, 10, 8)
 if e != nil {
 err = fmt.Errorf("%w: invalid type code: %s", arrow.ErrInvalid, e)
 return
 }
 if v < 0 {
 err = fmt.Errorf("%w: negative type code in union: format string %s", arrow.ErrInvalid, f)
 return
 }
 typeCodes = append(typeCodes, arrow.UnionTypeCode(v))
 }

 if len(childFields) != len(typeCodes) {
 err = fmt.Errorf("%w: ArrowArray struct number of children incompatible with format string", arrow.ErrInvalid)
 return
 }

 dt = arrow.UnionOf(mode, childFields, typeCodes)
 }
	}

Expand DownExpand Up@@ -311,6 +344,18 @@ func (imp *cimporter) doImportChildren() error {
 if err := imp.children[0].importChild(imp, children[0]); err != nil {
 return err
 }
	case arrow.DENSE_UNION:
 dt := imp.dt.(*arrow.DenseUnionType)
 for i, c := range children {
 imp.children[i].dt = dt.Fields()[i].Type
 imp.children[i].importChild(imp, c)
 }
	case arrow.SPARSE_UNION:
 dt := imp.dt.(*arrow.SparseUnionType)
 for i, c := range children {
 imp.children[i].dt = dt.Fields()[i].Type
 imp.children[i].importChild(imp, c)
 }
	}

	return nil
Expand DownExpand Up@@ -407,6 +452,52 @@ func (imp *cimporter) doImport(src *CArrowArray) error {
 }

 imp.data = array.NewData(dt, int(imp.arr.length), []*memory.Buffer{nulls}, children, int(imp.arr.null_count), int(imp.arr.offset))
	case *arrow.DenseUnionType:
 if err := imp.checkNoNulls(); err != nil {
 return err
 }

 bufs := []*memory.Buffer{nil, nil, nil}
 if imp.arr.n_buffers == 3 {
 // legacy format exported by older arrow c++ versions
 bufs[1] = imp.importFixedSizeBuffer(1, 1)
 bufs[2] = imp.importFixedSizeBuffer(2, int64(arrow.Int32SizeBytes))
 } else {
 if err := imp.checkNumBuffers(2); err != nil {
 return err
 }

 bufs[1] = imp.importFixedSizeBuffer(0, 1)
 bufs[2] = imp.importFixedSizeBuffer(1, int64(arrow.Int32SizeBytes))
 }

 children := make([]arrow.ArrayData, len(imp.children))
 for i := range imp.children {
 children[i] = imp.children[i].data
 }
 imp.data = array.NewData(dt, int(imp.arr.length), bufs, children, 0, int(imp.arr.offset))
	case *arrow.SparseUnionType:
 if err := imp.checkNoNulls(); err != nil {
 return err
 }

 var buf *memory.Buffer
 if imp.arr.n_buffers == 2 {
 // legacy format exported by older Arrow C++ versions
 buf = imp.importFixedSizeBuffer(1, 1)
 } else {
 if err := imp.checkNumBuffers(1); err != nil {
 return err
 }

 buf = imp.importFixedSizeBuffer(0, 1)
 }

 children := make([]arrow.ArrayData, len(imp.children))
 for i := range imp.children {
 children[i] = imp.children[i].data
 }
 imp.data = array.NewData(dt, int(imp.arr.length), []*memory.Buffer{nil, buf}, children, 0, int(imp.arr.offset))
	default:
 return fmt.Errorf("unimplemented type %s", dt)
	}
Expand DownExpand Up@@ -494,6 +585,13 @@ func (imp *cimporter) importFixedSizePrimitive() error {

func (imp *cimporter) checkNoChildren() error { return imp.checkNumChildren(0) }

func (imp *cimporter) checkNoNulls() error {
	if imp.arr.null_count != 0 {
 return fmt.Errorf("%w: unexpected non-zero null count for imported type %s", arrow.ErrInvalid, imp.dt)
	}
	return nil
}

func (imp *cimporter) checkNumChildren(n int64) error {
	if int64(imp.arr.n_children) != n {
 return fmt.Errorf("expected %d children, for imported type %s, ArrowArray has %d", n, imp.dt, imp.arr.n_children)
Expand DownExpand Up@@ -558,6 +656,9 @@ func initReader(rdr *nativeCRecordBatchReader, stream *CArrowArrayStream) {
	rdr.stream = C.get_stream()
	C.ArrowArrayStreamMove(stream, rdr.stream)
	runtime.SetFinalizer(rdr, func(r *nativeCRecordBatchReader) {
 if r.cur != nil {
 r.cur.Release()
 }
 C.ArrowArrayStreamRelease(r.stream)
 C.free(unsafe.Pointer(r.stream))
	})
Expand All@@ -567,40 +668,98 @@ func initReader(rdr *nativeCRecordBatchReader, stream *CArrowArrayStream) {
type nativeCRecordBatchReader struct {
	stream *CArrowArrayStream
	schema *arrow.Schema

	cur arrow.Record
	err error
}

func (n *nativeCRecordBatchReader) getError(errno int) error {
	return fmt.Errorf("%w: %s", syscall.Errno(errno), C.GoString(C.stream_get_last_error(n.stream)))
// No need to implement retain and release here as we used runtime.SetFinalizer when constructing
// the reader to free up the ArrowArrayStream memory when the garbage collector cleans it up.
func (n *nativeCRecordBatchReader) Retain() {}
func (n *nativeCRecordBatchReader) Release() {}

func (n *nativeCRecordBatchReader) Record() arrow.Record { return n.cur }

func (n *nativeCRecordBatchReader) Next() bool {
	err := n.next()
	switch {
	case err == nil:
 return true
	case err == io.EOF:
 return false
	}
	n.err = err
	return false
}

func (n *nativeCRecordBatchReader) Read() (arrow.Record, error) {
func (n *nativeCRecordBatchReader) next() error {
	if n.schema == nil {
 var sc CArrowSchema
 errno := C.stream_get_schema(n.stream, &sc)
 if errno != 0 {
 return nil, n.getError(int(errno))
 return n.getError(int(errno))
 }
 defer C.ArrowSchemaRelease(&sc)
 s, err := ImportCArrowSchema((*CArrowSchema)(&sc))
 if err != nil {
 return nil, err
 return err
 }

 n.schema = s
	}

	if n.cur != nil {
 n.cur.Release()
 n.cur = nil
	}

	arr := C.get_arr()
	defer C.free(unsafe.Pointer(arr))
	errno := C.stream_get_next(n.stream, arr)
	if errno != 0 {
 return nil, n.getError(int(errno))
 return n.getError(int(errno))
	}

	if C.ArrowArrayIsReleased(arr) == 1 {
 return nil, io.EOF
 return io.EOF
	}

	rec, err := ImportCRecordBatchWithSchema(arr, n.schema)
	if err != nil {
 return err
	}

	return ImportCRecordBatchWithSchema(arr, n.schema)
	n.cur = rec
	return nil
}

func (n *nativeCRecordBatchReader) Schema() *arrow.Schema {
	if n.schema == nil {
 var sc CArrowSchema
 errno := C.stream_get_schema(n.stream, &sc)
 if errno != 0 {
 panic(n.getError(int(errno)))
 }
 defer C.ArrowSchemaRelease(&sc)
 s, err := ImportCArrowSchema((*CArrowSchema)(&sc))
 if err != nil {
 panic(err)
 }

 n.schema = s
	}
	return n.schema
}

func (n *nativeCRecordBatchReader) getError(errno int) error {
	return fmt.Errorf("%w: %s", syscall.Errno(errno), C.GoString(C.stream_get_last_error(n.stream)))
}

func (n *nativeCRecordBatchReader) Read() (arrow.Record, error) {
	if err := n.next(); err != nil {
 return nil, err
	}
	return n.cur, nil
}

func releaseArr(arr *CArrowArray) {
Expand Down

1 change: 0 additions & 1 deletion
go/arrow/cdata/cdata_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -646,7 +646,6 @@ func TestRecordReaderStream(t *testing.T) {
 }
 assert.NoError(t, err)
 }
 defer rec.Release()

 assert.EqualValues(t, 2, rec.NumCols())
 assert.Equal(t, "a", rec.ColumnName(0))
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ARROW-17638: [Go] Extend C Data API support for Union arrays and RecordReader interface#14057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

zeroshade
merged 3 commits into

from

Sep 7, 2022
 Merged


ARROW-17638: [Go] Extend C Data API support for Union arrays and RecordReader interface
#14057
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b477c5c

extend c array stream to implement array.RecordReader and implement i…


zeroshade Sep 6, 2022
e8f16ef

ensure no memory leaks in the finalizer


zeroshade Sep 6, 2022
360c6e9

operates like other readers now and will release record on finish


zeroshade Sep 6, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


175 changes: 167 additions & 8 deletions
go/arrow/cdata/cdata.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,39 @@ func importSchema(schema *CArrowSchema) (ret arrow.Field, err error) {
 st := childFields[0].Type.(*arrow.StructType)
 dt = arrow.MapOf(st.Field(0).Type, st.Field(1).Type)
 dt.(*arrow.MapType).KeysSorted = (schema.flags & C.ARROW_FLAG_MAP_KEYS_SORTED) != 0
 case 'u': // union
 var mode arrow.UnionMode
 switch f[2] {
 case 'd':
 mode = arrow.DenseMode
 case 's':
 mode = arrow.SparseMode
 default:
 err = fmt.Errorf("%w: invalid union type", arrow.ErrInvalid)
 return
 }

 codes := strings.Split(strings.Split(f, ":")[1], ",")
 typeCodes := make([]arrow.UnionTypeCode, 0, len(codes))
 for _, i := range codes {
 v, e := strconv.ParseInt(i, 10, 8)
 if e != nil {
 err = fmt.Errorf("%w: invalid type code: %s", arrow.ErrInvalid, e)
 return
 }
 if v < 0 {
 err = fmt.Errorf("%w: negative type code in union: format string %s", arrow.ErrInvalid, f)
 return
 }
 typeCodes = append(typeCodes, arrow.UnionTypeCode(v))
 }

 if len(childFields) != len(typeCodes) {
 err = fmt.Errorf("%w: ArrowArray struct number of children incompatible with format string", arrow.ErrInvalid)
 return
 }

 dt = arrow.UnionOf(mode, childFields, typeCodes)
 }
	}

Expand DownExpand Up@@ -311,6 +344,18 @@ func (imp *cimporter) doImportChildren() error {
 if err := imp.children[0].importChild(imp, children[0]); err != nil {
 return err
 }
	case arrow.DENSE_UNION:
 dt := imp.dt.(*arrow.DenseUnionType)
 for i, c := range children {
 imp.children[i].dt = dt.Fields()[i].Type
 imp.children[i].importChild(imp, c)
 }
	case arrow.SPARSE_UNION:
 dt := imp.dt.(*arrow.SparseUnionType)
 for i, c := range children {
 imp.children[i].dt = dt.Fields()[i].Type
 imp.children[i].importChild(imp, c)
 }
	}

	return nil
Expand DownExpand Up@@ -407,6 +452,52 @@ func (imp *cimporter) doImport(src *CArrowArray) error {
 }

 imp.data = array.NewData(dt, int(imp.arr.length), []*memory.Buffer{nulls}, children, int(imp.arr.null_count), int(imp.arr.offset))
	case *arrow.DenseUnionType:
 if err := imp.checkNoNulls(); err != nil {
 return err
 }

 bufs := []*memory.Buffer{nil, nil, nil}
 if imp.arr.n_buffers == 3 {
 // legacy format exported by older arrow c++ versions
 bufs[1] = imp.importFixedSizeBuffer(1, 1)
 bufs[2] = imp.importFixedSizeBuffer(2, int64(arrow.Int32SizeBytes))
 } else {
 if err := imp.checkNumBuffers(2); err != nil {
 return err
 }

 bufs[1] = imp.importFixedSizeBuffer(0, 1)
 bufs[2] = imp.importFixedSizeBuffer(1, int64(arrow.Int32SizeBytes))
 }

 children := make([]arrow.ArrayData, len(imp.children))
 for i := range imp.children {
 children[i] = imp.children[i].data
 }
 imp.data = array.NewData(dt, int(imp.arr.length), bufs, children, 0, int(imp.arr.offset))
	case *arrow.SparseUnionType:
 if err := imp.checkNoNulls(); err != nil {
 return err
 }

 var buf *memory.Buffer
 if imp.arr.n_buffers == 2 {
 // legacy format exported by older Arrow C++ versions
 buf = imp.importFixedSizeBuffer(1, 1)
 } else {
 if err := imp.checkNumBuffers(1); err != nil {
 return err
 }

 buf = imp.importFixedSizeBuffer(0, 1)
 }

 children := make([]arrow.ArrayData, len(imp.children))
 for i := range imp.children {
 children[i] = imp.children[i].data
 }
 imp.data = array.NewData(dt, int(imp.arr.length), []*memory.Buffer{nil, buf}, children, 0, int(imp.arr.offset))
	default:
 return fmt.Errorf("unimplemented type %s", dt)
	}
Expand DownExpand Up@@ -494,6 +585,13 @@ func (imp *cimporter) importFixedSizePrimitive() error {

func (imp *cimporter) checkNoChildren() error { return imp.checkNumChildren(0) }

func (imp *cimporter) checkNoNulls() error {
	if imp.arr.null_count != 0 {
 return fmt.Errorf("%w: unexpected non-zero null count for imported type %s", arrow.ErrInvalid, imp.dt)
	}
	return nil
}

func (imp *cimporter) checkNumChildren(n int64) error {
	if int64(imp.arr.n_children) != n {
 return fmt.Errorf("expected %d children, for imported type %s, ArrowArray has %d", n, imp.dt, imp.arr.n_children)
Expand DownExpand Up@@ -558,6 +656,9 @@ func initReader(rdr *nativeCRecordBatchReader, stream *CArrowArrayStream) {
	rdr.stream = C.get_stream()
	C.ArrowArrayStreamMove(stream, rdr.stream)
	runtime.SetFinalizer(rdr, func(r *nativeCRecordBatchReader) {
 if r.cur != nil {
 r.cur.Release()
 }
 C.ArrowArrayStreamRelease(r.stream)
 C.free(unsafe.Pointer(r.stream))
	})
Expand All@@ -567,40 +668,98 @@ func initReader(rdr *nativeCRecordBatchReader, stream *CArrowArrayStream) {
type nativeCRecordBatchReader struct {
	stream *CArrowArrayStream
	schema *arrow.Schema

	cur arrow.Record
	err error
}

func (n *nativeCRecordBatchReader) getError(errno int) error {
	return fmt.Errorf("%w: %s", syscall.Errno(errno), C.GoString(C.stream_get_last_error(n.stream)))
// No need to implement retain and release here as we used runtime.SetFinalizer when constructing
// the reader to free up the ArrowArrayStream memory when the garbage collector cleans it up.
func (n *nativeCRecordBatchReader) Retain() {}
func (n *nativeCRecordBatchReader) Release() {}

func (n *nativeCRecordBatchReader) Record() arrow.Record { return n.cur }

func (n *nativeCRecordBatchReader) Next() bool {
	err := n.next()
	switch {
	case err == nil:
 return true
	case err == io.EOF:
 return false
	}
	n.err = err
	return false
}

func (n *nativeCRecordBatchReader) Read() (arrow.Record, error) {
func (n *nativeCRecordBatchReader) next() error {
	if n.schema == nil {
 var sc CArrowSchema
 errno := C.stream_get_schema(n.stream, &sc)
 if errno != 0 {
 return nil, n.getError(int(errno))
 return n.getError(int(errno))
 }
 defer C.ArrowSchemaRelease(&sc)
 s, err := ImportCArrowSchema((*CArrowSchema)(&sc))
 if err != nil {
 return nil, err
 return err
 }

 n.schema = s
	}

	if n.cur != nil {
 n.cur.Release()
 n.cur = nil
	}

	arr := C.get_arr()
	defer C.free(unsafe.Pointer(arr))
	errno := C.stream_get_next(n.stream, arr)
	if errno != 0 {
 return nil, n.getError(int(errno))
 return n.getError(int(errno))
	}

	if C.ArrowArrayIsReleased(arr) == 1 {
 return nil, io.EOF
 return io.EOF
	}

	rec, err := ImportCRecordBatchWithSchema(arr, n.schema)
	if err != nil {
 return err
	}

	return ImportCRecordBatchWithSchema(arr, n.schema)
	n.cur = rec
	return nil
}

func (n *nativeCRecordBatchReader) Schema() *arrow.Schema {
	if n.schema == nil {
 var sc CArrowSchema
 errno := C.stream_get_schema(n.stream, &sc)
 if errno != 0 {
 panic(n.getError(int(errno)))
 }
 defer C.ArrowSchemaRelease(&sc)
 s, err := ImportCArrowSchema((*CArrowSchema)(&sc))
 if err != nil {
 panic(err)
 }

 n.schema = s
	}
	return n.schema
}

func (n *nativeCRecordBatchReader) getError(errno int) error {
	return fmt.Errorf("%w: %s", syscall.Errno(errno), C.GoString(C.stream_get_last_error(n.stream)))
}

func (n *nativeCRecordBatchReader) Read() (arrow.Record, error) {
	if err := n.next(); err != nil {
 return nil, err
	}
	return n.cur, nil
}

func releaseArr(arr *CArrowArray) {
Expand Down

1 change: 0 additions & 1 deletion
go/arrow/cdata/cdata_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -646,7 +646,6 @@ func TestRecordReaderStream(t *testing.T) {
 }
 assert.NoError(t, err)
 }
 defer rec.Release()

 assert.EqualValues(t, 2, rec.NumCols())
 assert.Equal(t, "a", rec.ColumnName(0))
Expand Down