Skip to content

ARROW-14989: [R] Update num_rows methods to output doubles not integers to prevent integer overflow #13482

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
thisisnic wants to merge 12 commits into from
Closed

ARROW-14989: [R] Update num_rows methods to output doubles not integers to prevent integer overflow #13482

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
eb5c5ce
Add code from Romaine's suggestions
thisisnic Jun 30, 2022
92a8a86
Try to use function
thisisnic Jun 30, 2022
d68e394
Move definition of r_vec_size and change Table__num_rows to be an obj…
thisisnic Jun 30, 2022
4c43483
Add test for num_rows on large table
thisisnic Jun 30, 2022
5e2cfd1
Implement for RecordBatches too
thisisnic Jun 30, 2022
5036dd2
Remove unnecessary whitespace
thisisnic Jun 30, 2022
e92c427
Use values on border instead of small ones
thisisnic Jun 30, 2022
dbfa34f
Lint the C++
thisisnic Jun 30, 2022
e7cf8a6
Remove tests that won't run on CI as too slow
thisisnic Jul 1, 2022
cc269de
Mark variable 'explicit' because the linter told me to
thisisnic Jul 1, 2022
402f2e8
Update r/src/recordbatch.cpp
thisisnic Jul 4, 2022
33a3ceb
Update r/src/table.cpp
thisisnic Jul 4, 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
15 changes: 15 additions & 0 deletions r/src/arrow_cpp11.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,12 @@ cpp11::writable::list to_r_list(const std::vector<std::shared_ptr<T>>& x) {
} // namespace r
} // namespace arrow

struct r_vec_size {
explicit r_vec_size(R_xlen_t x) : value(x) {}

R_xlen_t value;
};

namespace cpp11 {

template <typename T>
Expand All @@ -428,4 +434,13 @@ SEXP as_sexp(const std::shared_ptr<T>& ptr) {
return cpp11::to_r6<T>(ptr);
}

inline SEXP as_sexp(r_vec_size size) {
R_xlen_t x = size.value;
if (x > std::numeric_limits<int>::max()) {
return Rf_ScalarReal(x);
} else {
return Rf_ScalarInteger(x);
}
}

} // namespace cpp11
4 changes: 2 additions & 2 deletions r/src/recordbatch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ int RecordBatch__num_columns(const std::shared_ptr<arrow::RecordBatch>& x) {
}

// [[arrow::export]]
int RecordBatch__num_rows(const std::shared_ptr<arrow::RecordBatch>& x) {
return x->num_rows();
r_vec_size RecordBatch__num_rows(const std::shared_ptr<arrow::RecordBatch>& x) {
return r_vec_size(x->num_rows());
}

// [[arrow::export]]
Expand Down
4 changes: 3 additions & 1 deletion r/src/table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ int Table__num_columns(const std::shared_ptr<arrow::Table>& x) {
}

// [[arrow::export]]
int Table__num_rows(const std::shared_ptr<arrow::Table>& x) { return x->num_rows(); }
r_vec_size Table__num_rows(const std::shared_ptr<arrow::Table>& x) {
return r_vec_size(x->num_rows());
}

// [[arrow::export]]
std::shared_ptr<arrow::Schema> Table__schema(const std::shared_ptr<arrow::Table>& x) {
Expand Down