Skip to content

ARROW-10399: [R] Fix performance regression from cpp11::r_string #8536

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
nealrichardson wants to merge 2 commits into from
Closed

ARROW-10399: [R] Fix performance regression from cpp11::r_string #8536

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b46162
Fix performance regression from cpp11::r_string
nealrichardson Oct 26, 2020
d6037cc
Apply @bkietz's suggestions
nealrichardson Oct 27, 2020
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
28 changes: 18 additions & 10 deletions r/src/array_to_vector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,24 +292,32 @@ struct Converter_String : public Converter {
// need to watch for nulls
arrow::internal::BitmapReader null_reader(array->null_bitmap_data(),
array->offset(), n);
for (int i = 0; i < n; i++, null_reader.Next()) {
if (null_reader.IsSet()) {
SET_STRING_ELT(data, start + i, cpp11::r_string(string_array->GetString(i)));
} else {
SET_STRING_ELT(data, start + i, NA_STRING);
cpp11::unwind_protect([&] {
for (int i = 0; i < n; i++, null_reader.Next()) {
if (null_reader.IsSet()) {
SET_STRING_ELT(data, start + i, r_string_from_view(string_array->GetView(i)));
} else {
SET_STRING_ELT(data, start + i, NA_STRING);
}
}
}

});
} else {
for (int i = 0; i < n; i++) {
SET_STRING_ELT(data, start + i, cpp11::r_string(string_array->GetString(i)));
}
cpp11::unwind_protect([&] {
for (int i = 0; i < n; i++) {
SET_STRING_ELT(data, start + i, r_string_from_view(string_array->GetView(i)));
}
});
}

return Status::OK();
}

bool Parallel() const { return false; }

private:
static SEXP r_string_from_view(const arrow::util::string_view& view) {
return Rf_mkCharLenCE(view.data(), view.size(), CE_UTF8);
}
};

class Converter_Boolean : public Converter {
Expand Down