ARROW-12052: [Rust] Add Child Data to Arrow's C FFI implementation. …#9778

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

Closed
ritchie46 wants to merge 12 commits into from
Closed

ARROW-12052: [Rust] Add Child Data to Arrow's C FFI implementation. … #9778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
80f6406
Add Child Data to Arrow's C FFI implementation. This commit adds the …
ritchie46 Mar 23, 2021
8376922
clippy
ritchie46 Mar 23, 2021
be102d2
process remarks
ritchie46 Mar 25, 2021
44efefb
test round trip with pyarrow
ritchie46 Mar 25, 2021
24e88b5
process comments nevi-me
ritchie46 Mar 28, 2021
dd50114
set nullable to true
ritchie46 Mar 28, 2021
7101de3
update test list ffi
ritchie46 Mar 29, 2021
4fe20df
default to nullable data types
ritchie46 Mar 29, 2021
ef14a99
pass nullable flag to C++
ritchie46 Mar 29, 2021
d7c599c
use schema information to parameterize list dtypes/fields
ritchie46 Mar 29, 2021
104dc1f
group imports
ritchie46 Mar 29, 2021
acd93b8
clippy
ritchie46 Apr 2, 2021
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
11 changes: 11 additions & 0 deletions rust/arrow-pyarrow-integration-testing/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -167,11 +167,22 @@ fn concatenate(array: PyObject, py: Python) -> PyResult<PyObject> {
to_py(array, py)
}

/// Converts to rust and back to python
#[pyfunction]
fn round_trip(array: PyObject, py: Python) -> PyResult<PyObject> {
// import
let array = to_rust(array, py)?;

// export
to_py(array, py)
}

#[pymodule]
fn arrow_pyarrow_integration_testing(_py: Python, m: &PyModule) -> PyResult<()> {
m.add_wrapped(wrap_pyfunction!(double))?;
m.add_wrapped(wrap_pyfunction!(double_py))?;
m.add_wrapped(wrap_pyfunction!(substring))?;
m.add_wrapped(wrap_pyfunction!(concatenate))?;
m.add_wrapped(wrap_pyfunction!(round_trip))?;
Ok(())
}
19 changes: 19 additions & 0 deletions rust/arrow-pyarrow-integration-testing/tests/test_sql.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,3 +78,22 @@ def test_time32_python(self):
del expected
# No leak of C++ memory
self.assertEqual(old_allocated, pyarrow.total_allocated_bytes())

def test_list_array(self):
"""
Python -> Rust -> Python
"""
old_allocated = pyarrow.total_allocated_bytes()
a = pyarrow.array([[], None, [1, 2], [4, 5, 6]], pyarrow.list_(pyarrow.int64()))
b = arrow_pyarrow_integration_testing.round_trip(a)

b.validate(full=True)

@pitroupitrouApr 5, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be interesting to add del a above this, to make sure that b keeps the data alive.

assert a.to_pylist() == b.to_pylist()
assert a.type == b.type
del a
del b
# No leak of C++ memory
self.assertEqual(old_allocated, pyarrow.total_allocated_bytes())



56 changes: 49 additions & 7 deletions rust/arrow/src/array/ffi.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,23 @@ use crate::{
};

use super::ArrayData;
use crate::datatypes::DataType;
use crate::ffi::ArrowArray;

impl TryFrom<ffi::ArrowArray> for ArrayData {
type Error = ArrowError;

fn try_from(value: ffi::ArrowArray) -> Result<Self> {
let data_type = value.data_type()?;
let child_data = value.children()?;

let child_type = if !child_data.is_empty() {
Some(child_data[0].data_type().clone())
} else {
None
};

let data_type = value.data_type(child_type)?;

let len = value.len();
let offset = value.offset();
let null_count = value.null_count();
Expand All@@ -44,9 +55,7 @@ impl TryFrom<ffi::ArrowArray> for ArrayData {
null_bit_buffer,
offset,
buffers,
// this is empty because ffi still does not support it.
// this is ok because FFI only supports datatypes without childs
vec![],
child_data,
))
}
}
Expand All@@ -55,11 +64,45 @@ impl TryFrom<ArrayData> for ffi::ArrowArray {
type Error = ArrowError;

fn try_from(value: ArrayData) -> Result<Self> {
// If parent is nullable, then children also must be nullable
// so we pass this nullable to the creation of hte child data
let nullable = match value.data_type() {
DataType::List(field) => field.is_nullable(),
DataType::LargeList(field) => field.is_nullable(),
_ => false,
};

let len = value.len();
let offset = value.offset() as usize;
let null_count = value.null_count();
let buffers = value.buffers().to_vec();
let null_buffer = value.null_buffer().cloned();
let child_data = value
.child_data()
.iter()
.map(|arr| {
let len = arr.len();

@pitroupitrouApr 5, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand: why isn't try_from called recursively?

@ritchie46ritchie46Apr 5, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is because I otherwise cannot pass nullable: bool information from the parent. If should split this up in a function separate from try_from to make this more explicit.

@pitroupitrouApr 5, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, you'll need to handle recursive types more generally anyway. Think list(list(int8)).

@ritchie46ritchie46Apr 5, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that would not work like this. I will fix that.

let offset = arr.offset() as usize;
let null_count = arr.null_count();
let buffers = arr.buffers().to_vec();
let null_buffer = arr.null_buffer().cloned();

// Note: the nullable comes from the parent data.
unsafe {
ArrowArray::try_new(
arr.data_type(),
len,
null_count,
null_buffer,
offset,
buffers,
vec![],
nullable,
)
.expect("infallible")
}
})
.collect::<Vec<_>>();

unsafe {
ffi::ArrowArray::try_new(
Expand All@@ -69,9 +112,8 @@ impl TryFrom<ArrayData> for ffi::ArrowArray {
null_buffer,
offset,
buffers,
// this is empty because ffi still does not support it.
// this is ok because FFI only supports datatypes without childs
vec![],
child_data,
nullable,
)
}
}
Expand Down
2 changes: 1 addition & 1 deletion rust/arrow/src/datatypes/field.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -309,8 +309,8 @@ impl Field {
};
Ok(Field {
name,
nullable,
data_type,
nullable,
dict_id,
dict_is_ordered,
metadata,
Expand Down
Loading
, '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-12052: [Rust] Add Child Data to Arrow's C FFI implementation. …#9778

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

 Closed

ritchie46
wants to merge
12
commits into

from

 Closed


ARROW-12052: [Rust] Add Child Data to Arrow's C FFI implementation. …
#9778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
80f6406

Add Child Data to Arrow's C FFI implementation. This commit adds the …


ritchie46 Mar 23, 2021
8376922

clippy


ritchie46 Mar 23, 2021
be102d2

process remarks


ritchie46 Mar 25, 2021
44efefb

test round trip with pyarrow


ritchie46 Mar 25, 2021
24e88b5

process comments nevi-me


ritchie46 Mar 28, 2021
dd50114

set nullable to true


ritchie46 Mar 28, 2021
7101de3

update test list ffi


ritchie46 Mar 29, 2021
4fe20df

default to nullable data types


ritchie46 Mar 29, 2021
ef14a99

pass nullable flag to C++


ritchie46 Mar 29, 2021
d7c599c

use schema information to parameterize list dtypes/fields


ritchie46 Mar 29, 2021
104dc1f

group imports


ritchie46 Mar 29, 2021
acd93b8

clippy


ritchie46 Apr 2, 2021

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


11 changes: 11 additions & 0 deletions
rust/arrow-pyarrow-integration-testing/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,11 +167,22 @@ fn concatenate(array: PyObject, py: Python) -> PyResult<PyObject> {
 to_py(array, py)
}

/// Converts to rust and back to python
#[pyfunction]
fn round_trip(array: PyObject, py: Python) -> PyResult<PyObject> {
 // import
 let array = to_rust(array, py)?;

 // export
 to_py(array, py)
}

#[pymodule]
fn arrow_pyarrow_integration_testing(_py: Python, m: &PyModule) -> PyResult<()> {
 m.add_wrapped(wrap_pyfunction!(double))?;
 m.add_wrapped(wrap_pyfunction!(double_py))?;
 m.add_wrapped(wrap_pyfunction!(substring))?;
 m.add_wrapped(wrap_pyfunction!(concatenate))?;
 m.add_wrapped(wrap_pyfunction!(round_trip))?;
 Ok(())
}

19 changes: 19 additions & 0 deletions
rust/arrow-pyarrow-integration-testing/tests/test_sql.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,3 +78,22 @@ def test_time32_python(self):
 del expected
 # No leak of C++ memory
 self.assertEqual(old_allocated, pyarrow.total_allocated_bytes())

 def test_list_array(self):
 """
 Python -> Rust -> Python
 """
 old_allocated = pyarrow.total_allocated_bytes()
 a = pyarrow.array([[], None, [1, 2], [4, 5, 6]], pyarrow.list_(pyarrow.int64()))
 b = arrow_pyarrow_integration_testing.round_trip(a)

 b.validate(full=True)
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be interesting to add del a above this, to make sure that b keeps the data alive.
 assert a.to_pylist() == b.to_pylist()
 assert a.type == b.type
 del a
 del b
 # No leak of C++ memory
 self.assertEqual(old_allocated, pyarrow.total_allocated_bytes())




56 changes: 49 additions & 7 deletions
rust/arrow/src/array/ffi.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,23 @@ use crate::{
};

use super::ArrayData;
use crate::datatypes::DataType;
use crate::ffi::ArrowArray;

impl TryFrom<ffi::ArrowArray> for ArrayData {
 type Error = ArrowError;

 fn try_from(value: ffi::ArrowArray) -> Result<Self> {
 let data_type = value.data_type()?;
 let child_data = value.children()?;

 let child_type = if !child_data.is_empty() {
 Some(child_data[0].data_type().clone())
 } else {
 None
 };

 let data_type = value.data_type(child_type)?;

 let len = value.len();
 let offset = value.offset();
 let null_count = value.null_count();
Expand All@@ -44,9 +55,7 @@ impl TryFrom<ffi::ArrowArray> for ArrayData {
 null_bit_buffer,
 offset,
 buffers,
 // this is empty because ffi still does not support it.
 // this is ok because FFI only supports datatypes without childs
 vec![],
 child_data,
 ))
 }
}
Expand All@@ -55,11 +64,45 @@ impl TryFrom<ArrayData> for ffi::ArrowArray {
 type Error = ArrowError;

 fn try_from(value: ArrayData) -> Result<Self> {
 // If parent is nullable, then children also must be nullable
 // so we pass this nullable to the creation of hte child data
 let nullable = match value.data_type() {
 DataType::List(field) => field.is_nullable(),
 DataType::LargeList(field) => field.is_nullable(),
 _ => false,
 };

 let len = value.len();
 let offset = value.offset() as usize;
 let null_count = value.null_count();
 let buffers = value.buffers().to_vec();
 let null_buffer = value.null_buffer().cloned();
 let child_data = value
 .child_data()
 .iter()
 .map(|arr| {
 let len = arr.len();
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand: why isn't try_from called recursively?
@ritchie46ritchie46Apr 5, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is because I otherwise cannot pass nullable: bool information from the parent. If should split this up in a function separate from try_from to make this more explicit.
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, you'll need to handle recursive types more generally anyway. Think list(list(int8)).
@ritchie46ritchie46Apr 5, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that would not work like this. I will fix that.
 let offset = arr.offset() as usize;
 let null_count = arr.null_count();
 let buffers = arr.buffers().to_vec();
 let null_buffer = arr.null_buffer().cloned();

 // Note: the nullable comes from the parent data.
 unsafe {
 ArrowArray::try_new(
 arr.data_type(),
 len,
 null_count,
 null_buffer,
 offset,
 buffers,
 vec![],
 nullable,
 )
 .expect("infallible")
 }
 })
 .collect::<Vec<_>>();

 unsafe {
 ffi::ArrowArray::try_new(
Expand All@@ -69,9 +112,8 @@ impl TryFrom<ArrayData> for ffi::ArrowArray {
 null_buffer,
 offset,
 buffers,
 // this is empty because ffi still does not support it.
 // this is ok because FFI only supports datatypes without childs
 vec![],
 child_data,
 nullable,
 )
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
rust/arrow/src/datatypes/field.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -309,8 +309,8 @@ impl Field {
 };
 Ok(Field {
 name,
 nullable,
 data_type,
 nullable,
 dict_id,
 dict_is_ordered,
 metadata,
Expand Down
Loading

, '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-12052: [Rust] Add Child Data to Arrow's C FFI implementation. …#9778

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

 Closed

ritchie46
wants to merge
12
commits into

from

 Closed


ARROW-12052: [Rust] Add Child Data to Arrow's C FFI implementation. …
#9778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
80f6406

Add Child Data to Arrow's C FFI implementation. This commit adds the …


ritchie46 Mar 23, 2021
8376922

clippy


ritchie46 Mar 23, 2021
be102d2

process remarks


ritchie46 Mar 25, 2021
44efefb

test round trip with pyarrow


ritchie46 Mar 25, 2021
24e88b5

process comments nevi-me


ritchie46 Mar 28, 2021
dd50114

set nullable to true


ritchie46 Mar 28, 2021
7101de3

update test list ffi


ritchie46 Mar 29, 2021
4fe20df

default to nullable data types


ritchie46 Mar 29, 2021
ef14a99

pass nullable flag to C++


ritchie46 Mar 29, 2021
d7c599c

use schema information to parameterize list dtypes/fields


ritchie46 Mar 29, 2021
104dc1f

group imports


ritchie46 Mar 29, 2021
acd93b8

clippy


ritchie46 Apr 2, 2021

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


11 changes: 11 additions & 0 deletions
rust/arrow-pyarrow-integration-testing/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,11 +167,22 @@ fn concatenate(array: PyObject, py: Python) -> PyResult<PyObject> {
 to_py(array, py)
}

/// Converts to rust and back to python
#[pyfunction]
fn round_trip(array: PyObject, py: Python) -> PyResult<PyObject> {
 // import
 let array = to_rust(array, py)?;

 // export
 to_py(array, py)
}

#[pymodule]
fn arrow_pyarrow_integration_testing(_py: Python, m: &PyModule) -> PyResult<()> {
 m.add_wrapped(wrap_pyfunction!(double))?;
 m.add_wrapped(wrap_pyfunction!(double_py))?;
 m.add_wrapped(wrap_pyfunction!(substring))?;
 m.add_wrapped(wrap_pyfunction!(concatenate))?;
 m.add_wrapped(wrap_pyfunction!(round_trip))?;
 Ok(())
}

19 changes: 19 additions & 0 deletions
rust/arrow-pyarrow-integration-testing/tests/test_sql.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,3 +78,22 @@ def test_time32_python(self):
 del expected
 # No leak of C++ memory
 self.assertEqual(old_allocated, pyarrow.total_allocated_bytes())

 def test_list_array(self):
 """
 Python -> Rust -> Python
 """
 old_allocated = pyarrow.total_allocated_bytes()
 a = pyarrow.array([[], None, [1, 2], [4, 5, 6]], pyarrow.list_(pyarrow.int64()))
 b = arrow_pyarrow_integration_testing.round_trip(a)

 b.validate(full=True)
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be interesting to add del a above this, to make sure that b keeps the data alive.
 assert a.to_pylist() == b.to_pylist()
 assert a.type == b.type
 del a
 del b
 # No leak of C++ memory
 self.assertEqual(old_allocated, pyarrow.total_allocated_bytes())




56 changes: 49 additions & 7 deletions
rust/arrow/src/array/ffi.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,23 @@ use crate::{
};

use super::ArrayData;
use crate::datatypes::DataType;
use crate::ffi::ArrowArray;

impl TryFrom<ffi::ArrowArray> for ArrayData {
 type Error = ArrowError;

 fn try_from(value: ffi::ArrowArray) -> Result<Self> {
 let data_type = value.data_type()?;
 let child_data = value.children()?;

 let child_type = if !child_data.is_empty() {
 Some(child_data[0].data_type().clone())
 } else {
 None
 };

 let data_type = value.data_type(child_type)?;

 let len = value.len();
 let offset = value.offset();
 let null_count = value.null_count();
Expand All@@ -44,9 +55,7 @@ impl TryFrom<ffi::ArrowArray> for ArrayData {
 null_bit_buffer,
 offset,
 buffers,
 // this is empty because ffi still does not support it.
 // this is ok because FFI only supports datatypes without childs
 vec![],
 child_data,
 ))
 }
}
Expand All@@ -55,11 +64,45 @@ impl TryFrom<ArrayData> for ffi::ArrowArray {
 type Error = ArrowError;

 fn try_from(value: ArrayData) -> Result<Self> {
 // If parent is nullable, then children also must be nullable
 // so we pass this nullable to the creation of hte child data
 let nullable = match value.data_type() {
 DataType::List(field) => field.is_nullable(),
 DataType::LargeList(field) => field.is_nullable(),
 _ => false,
 };

 let len = value.len();
 let offset = value.offset() as usize;
 let null_count = value.null_count();
 let buffers = value.buffers().to_vec();
 let null_buffer = value.null_buffer().cloned();
 let child_data = value
 .child_data()
 .iter()
 .map(|arr| {
 let len = arr.len();
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand: why isn't try_from called recursively?
@ritchie46ritchie46Apr 5, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is because I otherwise cannot pass nullable: bool information from the parent. If should split this up in a function separate from try_from to make this more explicit.
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, you'll need to handle recursive types more generally anyway. Think list(list(int8)).
@ritchie46ritchie46Apr 5, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that would not work like this. I will fix that.
 let offset = arr.offset() as usize;
 let null_count = arr.null_count();
 let buffers = arr.buffers().to_vec();
 let null_buffer = arr.null_buffer().cloned();

 // Note: the nullable comes from the parent data.
 unsafe {
 ArrowArray::try_new(
 arr.data_type(),
 len,
 null_count,
 null_buffer,
 offset,
 buffers,
 vec![],
 nullable,
 )
 .expect("infallible")
 }
 })
 .collect::<Vec<_>>();

 unsafe {
 ffi::ArrowArray::try_new(
Expand All@@ -69,9 +112,8 @@ impl TryFrom<ArrayData> for ffi::ArrowArray {
 null_buffer,
 offset,
 buffers,
 // this is empty because ffi still does not support it.
 // this is ok because FFI only supports datatypes without childs
 vec![],
 child_data,
 nullable,
 )
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
rust/arrow/src/datatypes/field.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -309,8 +309,8 @@ impl Field {
 };
 Ok(Field {
 name,
 nullable,
 data_type,
 nullable,
 dict_id,
 dict_is_ordered,
 metadata,
Expand Down
Loading

, '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-12052: [Rust] Add Child Data to Arrow's C FFI implementation. …#9778

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

 Closed

ritchie46
wants to merge
12
commits into

from

 Closed


ARROW-12052: [Rust] Add Child Data to Arrow's C FFI implementation. …
#9778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
80f6406

Add Child Data to Arrow's C FFI implementation. This commit adds the …


ritchie46 Mar 23, 2021
8376922

clippy


ritchie46 Mar 23, 2021
be102d2

process remarks


ritchie46 Mar 25, 2021
44efefb

test round trip with pyarrow


ritchie46 Mar 25, 2021
24e88b5

process comments nevi-me


ritchie46 Mar 28, 2021
dd50114

set nullable to true


ritchie46 Mar 28, 2021
7101de3

update test list ffi


ritchie46 Mar 29, 2021
4fe20df

default to nullable data types


ritchie46 Mar 29, 2021
ef14a99

pass nullable flag to C++


ritchie46 Mar 29, 2021
d7c599c

use schema information to parameterize list dtypes/fields


ritchie46 Mar 29, 2021
104dc1f

group imports


ritchie46 Mar 29, 2021
acd93b8

clippy


ritchie46 Apr 2, 2021

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


11 changes: 11 additions & 0 deletions
rust/arrow-pyarrow-integration-testing/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,11 +167,22 @@ fn concatenate(array: PyObject, py: Python) -> PyResult<PyObject> {
 to_py(array, py)
}

/// Converts to rust and back to python
#[pyfunction]
fn round_trip(array: PyObject, py: Python) -> PyResult<PyObject> {
 // import
 let array = to_rust(array, py)?;

 // export
 to_py(array, py)
}

#[pymodule]
fn arrow_pyarrow_integration_testing(_py: Python, m: &PyModule) -> PyResult<()> {
 m.add_wrapped(wrap_pyfunction!(double))?;
 m.add_wrapped(wrap_pyfunction!(double_py))?;
 m.add_wrapped(wrap_pyfunction!(substring))?;
 m.add_wrapped(wrap_pyfunction!(concatenate))?;
 m.add_wrapped(wrap_pyfunction!(round_trip))?;
 Ok(())
}

19 changes: 19 additions & 0 deletions
rust/arrow-pyarrow-integration-testing/tests/test_sql.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,3 +78,22 @@ def test_time32_python(self):
 del expected
 # No leak of C++ memory
 self.assertEqual(old_allocated, pyarrow.total_allocated_bytes())

 def test_list_array(self):
 """
 Python -> Rust -> Python
 """
 old_allocated = pyarrow.total_allocated_bytes()
 a = pyarrow.array([[], None, [1, 2], [4, 5, 6]], pyarrow.list_(pyarrow.int64()))
 b = arrow_pyarrow_integration_testing.round_trip(a)

 b.validate(full=True)
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be interesting to add del a above this, to make sure that b keeps the data alive.
 assert a.to_pylist() == b.to_pylist()
 assert a.type == b.type
 del a
 del b
 # No leak of C++ memory
 self.assertEqual(old_allocated, pyarrow.total_allocated_bytes())




56 changes: 49 additions & 7 deletions
rust/arrow/src/array/ffi.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,23 @@ use crate::{
};

use super::ArrayData;
use crate::datatypes::DataType;
use crate::ffi::ArrowArray;

impl TryFrom<ffi::ArrowArray> for ArrayData {
 type Error = ArrowError;

 fn try_from(value: ffi::ArrowArray) -> Result<Self> {
 let data_type = value.data_type()?;
 let child_data = value.children()?;

 let child_type = if !child_data.is_empty() {
 Some(child_data[0].data_type().clone())
 } else {
 None
 };

 let data_type = value.data_type(child_type)?;

 let len = value.len();
 let offset = value.offset();
 let null_count = value.null_count();
Expand All@@ -44,9 +55,7 @@ impl TryFrom<ffi::ArrowArray> for ArrayData {
 null_bit_buffer,
 offset,
 buffers,
 // this is empty because ffi still does not support it.
 // this is ok because FFI only supports datatypes without childs
 vec![],
 child_data,
 ))
 }
}
Expand All@@ -55,11 +64,45 @@ impl TryFrom<ArrayData> for ffi::ArrowArray {
 type Error = ArrowError;

 fn try_from(value: ArrayData) -> Result<Self> {
 // If parent is nullable, then children also must be nullable
 // so we pass this nullable to the creation of hte child data
 let nullable = match value.data_type() {
 DataType::List(field) => field.is_nullable(),
 DataType::LargeList(field) => field.is_nullable(),
 _ => false,
 };

 let len = value.len();
 let offset = value.offset() as usize;
 let null_count = value.null_count();
 let buffers = value.buffers().to_vec();
 let null_buffer = value.null_buffer().cloned();
 let child_data = value
 .child_data()
 .iter()
 .map(|arr| {
 let len = arr.len();
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand: why isn't try_from called recursively?
@ritchie46ritchie46Apr 5, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is because I otherwise cannot pass nullable: bool information from the parent. If should split this up in a function separate from try_from to make this more explicit.
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, you'll need to handle recursive types more generally anyway. Think list(list(int8)).
@ritchie46ritchie46Apr 5, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that would not work like this. I will fix that.
 let offset = arr.offset() as usize;
 let null_count = arr.null_count();
 let buffers = arr.buffers().to_vec();
 let null_buffer = arr.null_buffer().cloned();

 // Note: the nullable comes from the parent data.
 unsafe {
 ArrowArray::try_new(
 arr.data_type(),
 len,
 null_count,
 null_buffer,
 offset,
 buffers,
 vec![],
 nullable,
 )
 .expect("infallible")
 }
 })
 .collect::<Vec<_>>();

 unsafe {
 ffi::ArrowArray::try_new(
Expand All@@ -69,9 +112,8 @@ impl TryFrom<ArrayData> for ffi::ArrowArray {
 null_buffer,
 offset,
 buffers,
 // this is empty because ffi still does not support it.
 // this is ok because FFI only supports datatypes without childs
 vec![],
 child_data,
 nullable,
 )
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
rust/arrow/src/datatypes/field.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -309,8 +309,8 @@ impl Field {
 };
 Ok(Field {
 name,
 nullable,
 data_type,
 nullable,
 dict_id,
 dict_is_ordered,
 metadata,
Expand Down
Loading

, '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-12052: [Rust] Add Child Data to Arrow's C FFI implementation. …#9778

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

 Closed

ritchie46
wants to merge
12
commits into

from

 Closed


ARROW-12052: [Rust] Add Child Data to Arrow's C FFI implementation. …
#9778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
80f6406

Add Child Data to Arrow's C FFI implementation. This commit adds the …


ritchie46 Mar 23, 2021
8376922

clippy


ritchie46 Mar 23, 2021
be102d2

process remarks


ritchie46 Mar 25, 2021
44efefb

test round trip with pyarrow


ritchie46 Mar 25, 2021
24e88b5

process comments nevi-me


ritchie46 Mar 28, 2021
dd50114

set nullable to true


ritchie46 Mar 28, 2021
7101de3

update test list ffi


ritchie46 Mar 29, 2021
4fe20df

default to nullable data types


ritchie46 Mar 29, 2021
ef14a99

pass nullable flag to C++


ritchie46 Mar 29, 2021
d7c599c

use schema information to parameterize list dtypes/fields


ritchie46 Mar 29, 2021
104dc1f

group imports


ritchie46 Mar 29, 2021
acd93b8

clippy


ritchie46 Apr 2, 2021

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


11 changes: 11 additions & 0 deletions
rust/arrow-pyarrow-integration-testing/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,11 +167,22 @@ fn concatenate(array: PyObject, py: Python) -> PyResult<PyObject> {
 to_py(array, py)
}

/// Converts to rust and back to python
#[pyfunction]
fn round_trip(array: PyObject, py: Python) -> PyResult<PyObject> {
 // import
 let array = to_rust(array, py)?;

 // export
 to_py(array, py)
}

#[pymodule]
fn arrow_pyarrow_integration_testing(_py: Python, m: &PyModule) -> PyResult<()> {
 m.add_wrapped(wrap_pyfunction!(double))?;
 m.add_wrapped(wrap_pyfunction!(double_py))?;
 m.add_wrapped(wrap_pyfunction!(substring))?;
 m.add_wrapped(wrap_pyfunction!(concatenate))?;
 m.add_wrapped(wrap_pyfunction!(round_trip))?;
 Ok(())
}

19 changes: 19 additions & 0 deletions
rust/arrow-pyarrow-integration-testing/tests/test_sql.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,3 +78,22 @@ def test_time32_python(self):
 del expected
 # No leak of C++ memory
 self.assertEqual(old_allocated, pyarrow.total_allocated_bytes())

 def test_list_array(self):
 """
 Python -> Rust -> Python
 """
 old_allocated = pyarrow.total_allocated_bytes()
 a = pyarrow.array([[], None, [1, 2], [4, 5, 6]], pyarrow.list_(pyarrow.int64()))
 b = arrow_pyarrow_integration_testing.round_trip(a)

 b.validate(full=True)
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be interesting to add del a above this, to make sure that b keeps the data alive.
 assert a.to_pylist() == b.to_pylist()
 assert a.type == b.type
 del a
 del b
 # No leak of C++ memory
 self.assertEqual(old_allocated, pyarrow.total_allocated_bytes())




56 changes: 49 additions & 7 deletions
rust/arrow/src/array/ffi.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,23 @@ use crate::{
};

use super::ArrayData;
use crate::datatypes::DataType;
use crate::ffi::ArrowArray;

impl TryFrom<ffi::ArrowArray> for ArrayData {
 type Error = ArrowError;

 fn try_from(value: ffi::ArrowArray) -> Result<Self> {
 let data_type = value.data_type()?;
 let child_data = value.children()?;

 let child_type = if !child_data.is_empty() {
 Some(child_data[0].data_type().clone())
 } else {
 None
 };

 let data_type = value.data_type(child_type)?;

 let len = value.len();
 let offset = value.offset();
 let null_count = value.null_count();
Expand All@@ -44,9 +55,7 @@ impl TryFrom<ffi::ArrowArray> for ArrayData {
 null_bit_buffer,
 offset,
 buffers,
 // this is empty because ffi still does not support it.
 // this is ok because FFI only supports datatypes without childs
 vec![],
 child_data,
 ))
 }
}
Expand All@@ -55,11 +64,45 @@ impl TryFrom<ArrayData> for ffi::ArrowArray {
 type Error = ArrowError;

 fn try_from(value: ArrayData) -> Result<Self> {
 // If parent is nullable, then children also must be nullable
 // so we pass this nullable to the creation of hte child data
 let nullable = match value.data_type() {
 DataType::List(field) => field.is_nullable(),
 DataType::LargeList(field) => field.is_nullable(),
 _ => false,
 };

 let len = value.len();
 let offset = value.offset() as usize;
 let null_count = value.null_count();
 let buffers = value.buffers().to_vec();
 let null_buffer = value.null_buffer().cloned();
 let child_data = value
 .child_data()
 .iter()
 .map(|arr| {
 let len = arr.len();
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand: why isn't try_from called recursively?
@ritchie46ritchie46Apr 5, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is because I otherwise cannot pass nullable: bool information from the parent. If should split this up in a function separate from try_from to make this more explicit.
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, you'll need to handle recursive types more generally anyway. Think list(list(int8)).
@ritchie46ritchie46Apr 5, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that would not work like this. I will fix that.
 let offset = arr.offset() as usize;
 let null_count = arr.null_count();
 let buffers = arr.buffers().to_vec();
 let null_buffer = arr.null_buffer().cloned();

 // Note: the nullable comes from the parent data.
 unsafe {
 ArrowArray::try_new(
 arr.data_type(),
 len,
 null_count,
 null_buffer,
 offset,
 buffers,
 vec![],
 nullable,
 )
 .expect("infallible")
 }
 })
 .collect::<Vec<_>>();

 unsafe {
 ffi::ArrowArray::try_new(
Expand All@@ -69,9 +112,8 @@ impl TryFrom<ArrayData> for ffi::ArrowArray {
 null_buffer,
 offset,
 buffers,
 // this is empty because ffi still does not support it.
 // this is ok because FFI only supports datatypes without childs
 vec![],
 child_data,
 nullable,
 )
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
rust/arrow/src/datatypes/field.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -309,8 +309,8 @@ impl Field {
 };
 Ok(Field {
 name,
 nullable,
 data_type,
 nullable,
 dict_id,
 dict_is_ordered,
 metadata,
Expand Down
Loading

, '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-12052: [Rust] Add Child Data to Arrow's C FFI implementation. …#9778

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

 Closed

ritchie46
wants to merge
12
commits into

from

 Closed


ARROW-12052: [Rust] Add Child Data to Arrow's C FFI implementation. …
#9778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
80f6406

Add Child Data to Arrow's C FFI implementation. This commit adds the …


ritchie46 Mar 23, 2021
8376922

clippy


ritchie46 Mar 23, 2021
be102d2

process remarks


ritchie46 Mar 25, 2021
44efefb

test round trip with pyarrow


ritchie46 Mar 25, 2021
24e88b5

process comments nevi-me


ritchie46 Mar 28, 2021
dd50114

set nullable to true


ritchie46 Mar 28, 2021
7101de3

update test list ffi


ritchie46 Mar 29, 2021
4fe20df

default to nullable data types


ritchie46 Mar 29, 2021
ef14a99

pass nullable flag to C++


ritchie46 Mar 29, 2021
d7c599c

use schema information to parameterize list dtypes/fields


ritchie46 Mar 29, 2021
104dc1f

group imports


ritchie46 Mar 29, 2021
acd93b8

clippy


ritchie46 Apr 2, 2021

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


11 changes: 11 additions & 0 deletions
rust/arrow-pyarrow-integration-testing/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,11 +167,22 @@ fn concatenate(array: PyObject, py: Python) -> PyResult<PyObject> {
 to_py(array, py)
}

/// Converts to rust and back to python
#[pyfunction]
fn round_trip(array: PyObject, py: Python) -> PyResult<PyObject> {
 // import
 let array = to_rust(array, py)?;

 // export
 to_py(array, py)
}

#[pymodule]
fn arrow_pyarrow_integration_testing(_py: Python, m: &PyModule) -> PyResult<()> {
 m.add_wrapped(wrap_pyfunction!(double))?;
 m.add_wrapped(wrap_pyfunction!(double_py))?;
 m.add_wrapped(wrap_pyfunction!(substring))?;
 m.add_wrapped(wrap_pyfunction!(concatenate))?;
 m.add_wrapped(wrap_pyfunction!(round_trip))?;
 Ok(())
}

19 changes: 19 additions & 0 deletions
rust/arrow-pyarrow-integration-testing/tests/test_sql.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,3 +78,22 @@ def test_time32_python(self):
 del expected
 # No leak of C++ memory
 self.assertEqual(old_allocated, pyarrow.total_allocated_bytes())

 def test_list_array(self):
 """
 Python -> Rust -> Python
 """
 old_allocated = pyarrow.total_allocated_bytes()
 a = pyarrow.array([[], None, [1, 2], [4, 5, 6]], pyarrow.list_(pyarrow.int64()))
 b = arrow_pyarrow_integration_testing.round_trip(a)

 b.validate(full=True)
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be interesting to add del a above this, to make sure that b keeps the data alive.
 assert a.to_pylist() == b.to_pylist()
 assert a.type == b.type
 del a
 del b
 # No leak of C++ memory
 self.assertEqual(old_allocated, pyarrow.total_allocated_bytes())




56 changes: 49 additions & 7 deletions
rust/arrow/src/array/ffi.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,23 @@ use crate::{
};

use super::ArrayData;
use crate::datatypes::DataType;
use crate::ffi::ArrowArray;

impl TryFrom<ffi::ArrowArray> for ArrayData {
 type Error = ArrowError;

 fn try_from(value: ffi::ArrowArray) -> Result<Self> {
 let data_type = value.data_type()?;
 let child_data = value.children()?;

 let child_type = if !child_data.is_empty() {
 Some(child_data[0].data_type().clone())
 } else {
 None
 };

 let data_type = value.data_type(child_type)?;

 let len = value.len();
 let offset = value.offset();
 let null_count = value.null_count();
Expand All@@ -44,9 +55,7 @@ impl TryFrom<ffi::ArrowArray> for ArrayData {
 null_bit_buffer,
 offset,
 buffers,
 // this is empty because ffi still does not support it.
 // this is ok because FFI only supports datatypes without childs
 vec![],
 child_data,
 ))
 }
}
Expand All@@ -55,11 +64,45 @@ impl TryFrom<ArrayData> for ffi::ArrowArray {
 type Error = ArrowError;

 fn try_from(value: ArrayData) -> Result<Self> {
 // If parent is nullable, then children also must be nullable
 // so we pass this nullable to the creation of hte child data
 let nullable = match value.data_type() {
 DataType::List(field) => field.is_nullable(),
 DataType::LargeList(field) => field.is_nullable(),
 _ => false,
 };

 let len = value.len();
 let offset = value.offset() as usize;
 let null_count = value.null_count();
 let buffers = value.buffers().to_vec();
 let null_buffer = value.null_buffer().cloned();
 let child_data = value
 .child_data()
 .iter()
 .map(|arr| {
 let len = arr.len();
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand: why isn't try_from called recursively?
@ritchie46ritchie46Apr 5, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is because I otherwise cannot pass nullable: bool information from the parent. If should split this up in a function separate from try_from to make this more explicit.
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, you'll need to handle recursive types more generally anyway. Think list(list(int8)).
@ritchie46ritchie46Apr 5, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that would not work like this. I will fix that.
 let offset = arr.offset() as usize;
 let null_count = arr.null_count();
 let buffers = arr.buffers().to_vec();
 let null_buffer = arr.null_buffer().cloned();

 // Note: the nullable comes from the parent data.
 unsafe {
 ArrowArray::try_new(
 arr.data_type(),
 len,
 null_count,
 null_buffer,
 offset,
 buffers,
 vec![],
 nullable,
 )
 .expect("infallible")
 }
 })
 .collect::<Vec<_>>();

 unsafe {
 ffi::ArrowArray::try_new(
Expand All@@ -69,9 +112,8 @@ impl TryFrom<ArrayData> for ffi::ArrowArray {
 null_buffer,
 offset,
 buffers,
 // this is empty because ffi still does not support it.
 // this is ok because FFI only supports datatypes without childs
 vec![],
 child_data,
 nullable,
 )
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
rust/arrow/src/datatypes/field.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -309,8 +309,8 @@ impl Field {
 };
 Ok(Field {
 name,
 nullable,
 data_type,
 nullable,
 dict_id,
 dict_is_ordered,
 metadata,
Expand Down
Loading

, '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-12052: [Rust] Add Child Data to Arrow's C FFI implementation. …#9778

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

 Closed

ritchie46
wants to merge
12
commits into

from

 Closed


ARROW-12052: [Rust] Add Child Data to Arrow's C FFI implementation. …
#9778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
80f6406

Add Child Data to Arrow's C FFI implementation. This commit adds the …


ritchie46 Mar 23, 2021
8376922

clippy


ritchie46 Mar 23, 2021
be102d2

process remarks


ritchie46 Mar 25, 2021
44efefb

test round trip with pyarrow


ritchie46 Mar 25, 2021
24e88b5

process comments nevi-me


ritchie46 Mar 28, 2021
dd50114

set nullable to true


ritchie46 Mar 28, 2021
7101de3

update test list ffi


ritchie46 Mar 29, 2021
4fe20df

default to nullable data types


ritchie46 Mar 29, 2021
ef14a99

pass nullable flag to C++


ritchie46 Mar 29, 2021
d7c599c

use schema information to parameterize list dtypes/fields


ritchie46 Mar 29, 2021
104dc1f

group imports


ritchie46 Mar 29, 2021
acd93b8

clippy


ritchie46 Apr 2, 2021

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


11 changes: 11 additions & 0 deletions
rust/arrow-pyarrow-integration-testing/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,11 +167,22 @@ fn concatenate(array: PyObject, py: Python) -> PyResult<PyObject> {
 to_py(array, py)
}

/// Converts to rust and back to python
#[pyfunction]
fn round_trip(array: PyObject, py: Python) -> PyResult<PyObject> {
 // import
 let array = to_rust(array, py)?;

 // export
 to_py(array, py)
}

#[pymodule]
fn arrow_pyarrow_integration_testing(_py: Python, m: &PyModule) -> PyResult<()> {
 m.add_wrapped(wrap_pyfunction!(double))?;
 m.add_wrapped(wrap_pyfunction!(double_py))?;
 m.add_wrapped(wrap_pyfunction!(substring))?;
 m.add_wrapped(wrap_pyfunction!(concatenate))?;
 m.add_wrapped(wrap_pyfunction!(round_trip))?;
 Ok(())
}

19 changes: 19 additions & 0 deletions
rust/arrow-pyarrow-integration-testing/tests/test_sql.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,3 +78,22 @@ def test_time32_python(self):
 del expected
 # No leak of C++ memory
 self.assertEqual(old_allocated, pyarrow.total_allocated_bytes())

 def test_list_array(self):
 """
 Python -> Rust -> Python
 """
 old_allocated = pyarrow.total_allocated_bytes()
 a = pyarrow.array([[], None, [1, 2], [4, 5, 6]], pyarrow.list_(pyarrow.int64()))
 b = arrow_pyarrow_integration_testing.round_trip(a)

 b.validate(full=True)
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be interesting to add del a above this, to make sure that b keeps the data alive.
 assert a.to_pylist() == b.to_pylist()
 assert a.type == b.type
 del a
 del b
 # No leak of C++ memory
 self.assertEqual(old_allocated, pyarrow.total_allocated_bytes())




56 changes: 49 additions & 7 deletions
rust/arrow/src/array/ffi.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,23 @@ use crate::{
};

use super::ArrayData;
use crate::datatypes::DataType;
use crate::ffi::ArrowArray;

impl TryFrom<ffi::ArrowArray> for ArrayData {
 type Error = ArrowError;

 fn try_from(value: ffi::ArrowArray) -> Result<Self> {
 let data_type = value.data_type()?;
 let child_data = value.children()?;

 let child_type = if !child_data.is_empty() {
 Some(child_data[0].data_type().clone())
 } else {
 None
 };

 let data_type = value.data_type(child_type)?;

 let len = value.len();
 let offset = value.offset();
 let null_count = value.null_count();
Expand All@@ -44,9 +55,7 @@ impl TryFrom<ffi::ArrowArray> for ArrayData {
 null_bit_buffer,
 offset,
 buffers,
 // this is empty because ffi still does not support it.
 // this is ok because FFI only supports datatypes without childs
 vec![],
 child_data,
 ))
 }
}
Expand All@@ -55,11 +64,45 @@ impl TryFrom<ArrayData> for ffi::ArrowArray {
 type Error = ArrowError;

 fn try_from(value: ArrayData) -> Result<Self> {
 // If parent is nullable, then children also must be nullable
 // so we pass this nullable to the creation of hte child data
 let nullable = match value.data_type() {
 DataType::List(field) => field.is_nullable(),
 DataType::LargeList(field) => field.is_nullable(),
 _ => false,
 };

 let len = value.len();
 let offset = value.offset() as usize;
 let null_count = value.null_count();
 let buffers = value.buffers().to_vec();
 let null_buffer = value.null_buffer().cloned();
 let child_data = value
 .child_data()
 .iter()
 .map(|arr| {
 let len = arr.len();
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand: why isn't try_from called recursively?
@ritchie46ritchie46Apr 5, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is because I otherwise cannot pass nullable: bool information from the parent. If should split this up in a function separate from try_from to make this more explicit.
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, you'll need to handle recursive types more generally anyway. Think list(list(int8)).
@ritchie46ritchie46Apr 5, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that would not work like this. I will fix that.
 let offset = arr.offset() as usize;
 let null_count = arr.null_count();
 let buffers = arr.buffers().to_vec();
 let null_buffer = arr.null_buffer().cloned();

 // Note: the nullable comes from the parent data.
 unsafe {
 ArrowArray::try_new(
 arr.data_type(),
 len,
 null_count,
 null_buffer,
 offset,
 buffers,
 vec![],
 nullable,
 )
 .expect("infallible")
 }
 })
 .collect::<Vec<_>>();

 unsafe {
 ffi::ArrowArray::try_new(
Expand All@@ -69,9 +112,8 @@ impl TryFrom<ArrayData> for ffi::ArrowArray {
 null_buffer,
 offset,
 buffers,
 // this is empty because ffi still does not support it.
 // this is ok because FFI only supports datatypes without childs
 vec![],
 child_data,
 nullable,
 )
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
rust/arrow/src/datatypes/field.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -309,8 +309,8 @@ impl Field {
 };
 Ok(Field {
 name,
 nullable,
 data_type,
 nullable,
 dict_id,
 dict_is_ordered,
 metadata,
Expand Down
Loading

, '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-12052: [Rust] Add Child Data to Arrow's C FFI implementation. …#9778

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

 Closed

ritchie46
wants to merge
12
commits into

from

 Closed


ARROW-12052: [Rust] Add Child Data to Arrow's C FFI implementation. …
#9778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
80f6406

Add Child Data to Arrow's C FFI implementation. This commit adds the …


ritchie46 Mar 23, 2021
8376922

clippy


ritchie46 Mar 23, 2021
be102d2

process remarks


ritchie46 Mar 25, 2021
44efefb

test round trip with pyarrow


ritchie46 Mar 25, 2021
24e88b5

process comments nevi-me


ritchie46 Mar 28, 2021
dd50114

set nullable to true


ritchie46 Mar 28, 2021
7101de3

update test list ffi


ritchie46 Mar 29, 2021
4fe20df

default to nullable data types


ritchie46 Mar 29, 2021
ef14a99

pass nullable flag to C++


ritchie46 Mar 29, 2021
d7c599c

use schema information to parameterize list dtypes/fields


ritchie46 Mar 29, 2021
104dc1f

group imports


ritchie46 Mar 29, 2021
acd93b8

clippy


ritchie46 Apr 2, 2021

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


11 changes: 11 additions & 0 deletions
rust/arrow-pyarrow-integration-testing/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,11 +167,22 @@ fn concatenate(array: PyObject, py: Python) -> PyResult<PyObject> {
 to_py(array, py)
}

/// Converts to rust and back to python
#[pyfunction]
fn round_trip(array: PyObject, py: Python) -> PyResult<PyObject> {
 // import
 let array = to_rust(array, py)?;

 // export
 to_py(array, py)
}

#[pymodule]
fn arrow_pyarrow_integration_testing(_py: Python, m: &PyModule) -> PyResult<()> {
 m.add_wrapped(wrap_pyfunction!(double))?;
 m.add_wrapped(wrap_pyfunction!(double_py))?;
 m.add_wrapped(wrap_pyfunction!(substring))?;
 m.add_wrapped(wrap_pyfunction!(concatenate))?;
 m.add_wrapped(wrap_pyfunction!(round_trip))?;
 Ok(())
}

19 changes: 19 additions & 0 deletions
rust/arrow-pyarrow-integration-testing/tests/test_sql.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,3 +78,22 @@ def test_time32_python(self):
 del expected
 # No leak of C++ memory
 self.assertEqual(old_allocated, pyarrow.total_allocated_bytes())

 def test_list_array(self):
 """
 Python -> Rust -> Python
 """
 old_allocated = pyarrow.total_allocated_bytes()
 a = pyarrow.array([[], None, [1, 2], [4, 5, 6]], pyarrow.list_(pyarrow.int64()))
 b = arrow_pyarrow_integration_testing.round_trip(a)

 b.validate(full=True)
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be interesting to add del a above this, to make sure that b keeps the data alive.
 assert a.to_pylist() == b.to_pylist()
 assert a.type == b.type
 del a
 del b
 # No leak of C++ memory
 self.assertEqual(old_allocated, pyarrow.total_allocated_bytes())




56 changes: 49 additions & 7 deletions
rust/arrow/src/array/ffi.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,23 @@ use crate::{
};

use super::ArrayData;
use crate::datatypes::DataType;
use crate::ffi::ArrowArray;

impl TryFrom<ffi::ArrowArray> for ArrayData {
 type Error = ArrowError;

 fn try_from(value: ffi::ArrowArray) -> Result<Self> {
 let data_type = value.data_type()?;
 let child_data = value.children()?;

 let child_type = if !child_data.is_empty() {
 Some(child_data[0].data_type().clone())
 } else {
 None
 };

 let data_type = value.data_type(child_type)?;

 let len = value.len();
 let offset = value.offset();
 let null_count = value.null_count();
Expand All@@ -44,9 +55,7 @@ impl TryFrom<ffi::ArrowArray> for ArrayData {
 null_bit_buffer,
 offset,
 buffers,
 // this is empty because ffi still does not support it.
 // this is ok because FFI only supports datatypes without childs
 vec![],
 child_data,
 ))
 }
}
Expand All@@ -55,11 +64,45 @@ impl TryFrom<ArrayData> for ffi::ArrowArray {
 type Error = ArrowError;

 fn try_from(value: ArrayData) -> Result<Self> {
 // If parent is nullable, then children also must be nullable
 // so we pass this nullable to the creation of hte child data
 let nullable = match value.data_type() {
 DataType::List(field) => field.is_nullable(),
 DataType::LargeList(field) => field.is_nullable(),
 _ => false,
 };

 let len = value.len();
 let offset = value.offset() as usize;
 let null_count = value.null_count();
 let buffers = value.buffers().to_vec();
 let null_buffer = value.null_buffer().cloned();
 let child_data = value
 .child_data()
 .iter()
 .map(|arr| {
 let len = arr.len();
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand: why isn't try_from called recursively?
@ritchie46ritchie46Apr 5, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is because I otherwise cannot pass nullable: bool information from the parent. If should split this up in a function separate from try_from to make this more explicit.
@pitroupitrouApr 5, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, you'll need to handle recursive types more generally anyway. Think list(list(int8)).
@ritchie46ritchie46Apr 5, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that would not work like this. I will fix that.
 let offset = arr.offset() as usize;
 let null_count = arr.null_count();
 let buffers = arr.buffers().to_vec();
 let null_buffer = arr.null_buffer().cloned();

 // Note: the nullable comes from the parent data.
 unsafe {
 ArrowArray::try_new(
 arr.data_type(),
 len,
 null_count,
 null_buffer,
 offset,
 buffers,
 vec![],
 nullable,
 )
 .expect("infallible")
 }
 })
 .collect::<Vec<_>>();

 unsafe {
 ffi::ArrowArray::try_new(
Expand All@@ -69,9 +112,8 @@ impl TryFrom<ArrayData> for ffi::ArrowArray {
 null_buffer,
 offset,
 buffers,
 // this is empty because ffi still does not support it.
 // this is ok because FFI only supports datatypes without childs
 vec![],
 child_data,
 nullable,
 )
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
rust/arrow/src/datatypes/field.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -309,8 +309,8 @@ impl Field {
 };
 Ok(Field {
 name,
 nullable,
 data_type,
 nullable,
 dict_id,
 dict_is_ordered,
 metadata,
Expand Down
Loading