Skip to content
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

[c++] Address final valgrind issue #2403

Merged
merged 3 commits into from
Apr 8, 2024
Merged

[c++] Address final valgrind issue #2403

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b38d9f0
Release (default) allocation of private_data before point to ours
eddelbuettel Apr 8, 2024
2d0b778
Remove unnecessary buffer set up done by nanoarrow
eddelbuettel Apr 8, 2024
c1befef
White-space only commit because of clang-format
eddelbuettel Apr 8, 2024
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
16 changes: 4 additions & 12 deletions libtiledbsoma/src/utils/arrow_adapter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,14 +298,6 @@ std::pair<const void*, std::size_t> ArrowAdapter::_get_data_and_length(
}
}

bool ArrowAdapter::_isstr(const char* format) {
if ((strcmp(format, "U") == 0) || (strcmp(format, "Z") == 0) ||
(strcmp(format, "u") == 0) || (strcmp(format, "z") == 0)) {
return true;
}
return false;
}

inline void exitIfError(const ArrowErrorCode ec, const std::string& msg) {
if (ec != NANOARROW_OK)
throw TileDBSOMAError(
Expand Down Expand Up @@ -358,6 +350,9 @@ ArrowAdapter::to_arrow(std::shared_ptr<ColumnBuffer> column) {
// After allocating and initializing via nanoarrow we
// hook our custom release function in
array->release = &release_array;
if (array->private_data != nullptr) { // as we use nanoarrow's init
free(array->private_data); // free what was allocated before
} // assigning our ArrowBuffer pointer
array->private_data = (void*)arrow_buffer;

LOG_TRACE(fmt::format(
Expand Down Expand Up @@ -445,10 +440,7 @@ ArrowAdapter::to_arrow(std::shared_ptr<ColumnBuffer> column) {
exitIfError(
ArrowArrayAllocateChildren(dict_arr, 0),
"Bad array children alloc");
const int n_buf = ArrowAdapter::_isstr(dict_sch->format) == true ? 3 :
2;
dict_arr->buffers = (const void**)malloc(sizeof(void*) * n_buf);
dict_arr->buffers[0] = nullptr; // validity: none here
// hook up our custom release function
dict_arr->release = &release_array;

// TODO string types currently get the data and offset
Expand Down
Loading