ARROW-9387: [R] Use new C++ table select method#8125

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
romainfrancois wants to merge 5 commits into from
Closed

ARROW-9387: [R] Use new C++ table select method #8125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7dec4ed
+ Table$SelectColumns()
romainfrancois Sep 7, 2020
ab4dd81
RecordBatch and Table gets $SelectColumns()
romainfrancois Sep 11, 2020
3668ad5
$SelectColumns() only supporting 0-based integers, but [ support R st…
romainfrancois Sep 11, 2020
0686538
Allow column selection by negative indices
nealrichardson Sep 11, 2020
d60683d
Update test
nealrichardson Sep 11, 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
8 changes: 4 additions & 4 deletions r/R/arrowExports.R
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion r/R/csv.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,12 @@ read_delim_arrow <- function(file,
convert_options = convert_options
)

tab <- reader$Read()$select(!!enquo(col_select))
tab <- reader$Read()

col_select <- enquo(col_select)
if (!quo_is_null(col_select)) {
tab <- tab[vars_select(names(tab), !!col_select)]
}

if (isTRUE(as_data_frame)) {
tab <- as.data.frame(tab)
Expand Down
7 changes: 6 additions & 1 deletion r/R/json.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,12 @@
#' df <- read_json_arrow(tf)
#' }
read_json_arrow <- function(file, col_select = NULL, as_data_frame = TRUE, ...) {
tab <- JsonTableReader$create(file, ...)$Read()$select(!!enquo(col_select))
tab <- JsonTableReader$create(file, ...)$Read()

col_select <- enquo(col_select)
if (!quo_is_null(col_select)) {
tab <- tab[vars_select(names(tab), !!col_select)]
}

if (isTRUE(as_data_frame)) {
tab <- as.data.frame(tab)
Expand Down
28 changes: 13 additions & 15 deletions r/R/record-batch.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,7 @@
#' - `$names()`: Get all column names (called by `names(batch)`)
#' - `$GetColumnByName(name)`: Extract an `Array` by string name
#' - `$RemoveColumn(i)`: Drops a column from the batch by integer position
#' - `$select(spec)`: Return a new record batch with a selection of columns.
#' This supports the usual `character`, `numeric`, and `logical` selection
#' methods as well as "tidy select" expressions.
#' - `$selectColumns(indices)`: Return a new record batch with a selection of columns, expressed as 0-based integers.
#' - `$Slice(offset, length = NULL)`: Create a zero-copy view starting at the
#' indicated integer offset and going for the given length, or to the end
#' of the table if `NULL`, the default.
Expand DownExpand Up@@ -84,21 +82,12 @@ RecordBatch <- R6Class("RecordBatch", inherit = ArrowObject,
assert_that(is.string(name))
shared_ptr(Array, RecordBatch__GetColumnByName(self, name))
},
select = function(spec) {
spec <- enquo(spec)
if (quo_is_null(spec)) {
self
} else {
all_vars <- self$names()
vars <- vars_select(all_vars, !!spec)
indices <- match(vars, all_vars)
shared_ptr(RecordBatch, RecordBatch__select(self, indices))
}
SelectColumns = function(indices) {
shared_ptr(RecordBatch, RecordBatch__SelectColumns(self, indices))
},
RemoveColumn = function(i){
shared_ptr(RecordBatch, RecordBatch__RemoveColumn(self, i))
},

Slice = function(offset, length = NULL) {
if (is.null(length)) {
shared_ptr(RecordBatch, RecordBatch__Slice1(self, offset))
Expand DownExpand Up@@ -218,7 +207,16 @@ names.RecordBatch <- function(x) x$names()
if (!missing(j)) {
# Selecting columns is cheaper than filtering rows, so do it first.
# That way, if we're filtering too, we have fewer arrays to filter/slice/take
x <- x$select(j)
if (is_integerish(j)) {
if (all(j < 0)) {
# in R, negative j means "everything but j"
j <- setdiff(seq_len(x$num_columns), -1 * j)
}
x <- x$SelectColumns(as.integer(j) - 1L)
Comment thread
nealrichardson marked this conversation as resolved.
} else if (is.character(j)) {
x <- x$SelectColumns(match(j, names(x)) - 1L)
}

if (drop && ncol(x) == 1L) {
x <- x$column(0)
}
Expand Down
16 changes: 3 additions & 13 deletions r/R/table.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,7 @@
#' - `$ColumnNames()`: Get all column names (called by `names(tab)`)
#' - `$GetColumnByName(name)`: Extract a `ChunkedArray` by string name
#' - `$field(i)`: Extract a `Field` from the table schema by integer position
#' - `$select(spec)`: Return a new table with a selection of columns.
#' This supports the usual `character`, `numeric`, and `logical` selection
#' methods as well as "tidy select" expressions.
#' - `$SelectColumns(indices)`: Return new `Table` with specified columns, expressed as 0-based integers.
#' - `$Slice(offset, length = NULL)`: Create a zero-copy view starting at the
#' indicated integer offset and going for the given length, or to the end
#' of the table if `NULL`, the default.
Expand DownExpand Up@@ -115,16 +113,8 @@ Table <- R6Class("Table", inherit = ArrowObject,
shared_ptr(Table, Table__cast(self, target_schema, options))
},

select = function(spec) {
spec <- enquo(spec)
if (quo_is_null(spec)) {
self
} else {
all_vars <- self$ColumnNames()
vars <- vars_select(all_vars, !!spec)
indices <- match(vars, all_vars)
shared_ptr(Table, Table__select(self, indices))
}
SelectColumns = function(indices) {
shared_ptr(Table, Table__SelectColumns(self, indices))
},

Slice = function(offset, length = NULL) {
Expand Down
5 changes: 2 additions & 3 deletions r/man/RecordBatch.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions r/man/Table.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions r/src/arrowExports.cpp
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions r/src/recordbatch.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ std::shared_ptr<arrow::Array> RecordBatch__GetColumnByName(
}

// [[arrow::export]]
std::shared_ptr<arrow::RecordBatch> RecordBatch__select(
std::shared_ptr<arrow::RecordBatch> RecordBatch__SelectColumns(
const std::shared_ptr<arrow::RecordBatch>& batch, cpp11::integers indices) {
R_xlen_t n = indices.size();
auto nrows = batch->num_rows();
Expand All@@ -86,7 +86,7 @@ std::shared_ptr<arrow::RecordBatch> RecordBatch__select(
std::vector<std::shared_ptr<arrow::Array>> columns(n);

for (R_xlen_t i = 0; i < n; i++) {
int pos = indices[i] - 1;
int pos = indices[i];
fields[i] = batch->schema()->field(pos);
columns[i] = batch->column(pos);
}
Expand Down
18 changes: 3 additions & 15 deletions r/src/table.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,21 +115,9 @@ std::shared_ptr<arrow::ChunkedArray> Table__GetColumnByName(
}

// [[arrow::export]]
std::shared_ptr<arrow::Table> Table__select(const std::shared_ptr<arrow::Table>& table,
cpp11::integers indices) {
R_xlen_t n = indices.size();

std::vector<std::shared_ptr<arrow::Field>> fields(n);
std::vector<std::shared_ptr<arrow::ChunkedArray>> columns(n);

for (R_xlen_t i = 0; i < n; i++) {
int pos = indices[i] - 1;
fields[i] = table->schema()->field(pos);
columns[i] = table->column(pos);
}

auto schema = std::make_shared<arrow::Schema>(std::move(fields));
return arrow::Table::Make(schema, columns);
std::shared_ptr<arrow::Table> Table__SelectColumns(
const std::shared_ptr<arrow::Table>& table, const std::vector<int>& indices) {
return ValueOrStop(table->SelectColumns(indices));
}

namespace arrow {
Expand Down
19 changes: 14 additions & 5 deletions r/tests/testthat/test-Table.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,16 +130,16 @@ test_that("[, [[, $ for Table", {
expect_null(tab[["asdf"]])
# List-like column slicing
expect_data_frame(tab[2:4], tbl[2:4])
expect_data_frame(tab[c(1, 0)], tbl[c(1, 0)])
expect_data_frame(tab[c(2, 1)], tbl[c(2, 1)])

@nealrichardsonnealrichardsonSep 11, 2020

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.

Should we maintain the base R behavior for subsetting on column 0 (it is ignored)? I can't imagine why someone would do such a thing on purpose.

expect_data_frame(tab[-3], tbl[-3])

expect_error(tab[[c(4, 3)]])
expect_error(tab[[NA]], "'i' must be character or numeric, not logical")
expect_error(tab[[NULL]], "'i' must be character or numeric, not NULL")
expect_error(tab[[c("asdf", "jkl;")]], 'length(name) not equal to 1', fixed = TRUE)
expect_error(tab[-3], "Selections can't have negative value") # From tidyselect
expect_error(tab[-3:3], "Selections can't have negative value") # From tidyselect
expect_error(tab[1000]) # This is caught in vctrs, assert more specifically when it stabilizes
expect_error(tab[1:1000]) # same as ^
expect_error(tab[-3:3], "Invalid column index")
expect_error(tab[1000], "Invalid column index")
expect_error(tab[1:1000], "Invalid column index")

skip("Table with 0 cols doesn't know how many rows it should have")
expect_data_frame(tab[0], tbl[0])
Expand DownExpand Up@@ -349,3 +349,12 @@ test_that("Table unifies dictionary on conversion back to R (ARROW-8374)", {

expect_identical(as.data.frame(tab), res)
})

test_that("Table$SelectColumns()", {
tab <- Table$create(x = 1:10, y = 1:10)

expect_equal(tab$SelectColumns(0L), Table$create(x = 1:10))

expect_error(tab$SelectColumns(2:4))
expect_error(tab$SelectColumns(""))
})
, '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-9387: [R] Use new C++ table select method#8125

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

romainfrancois
wants to merge
5
commits into

from

 Closed


ARROW-9387: [R] Use new C++ table select method
#8125
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7dec4ed

+ Table$SelectColumns()


romainfrancois Sep 7, 2020
ab4dd81

RecordBatch and Table gets $SelectColumns()


romainfrancois Sep 11, 2020
3668ad5

$SelectColumns() only supporting 0-based integers, but [ support R st…


romainfrancois Sep 11, 2020
0686538

Allow column selection by negative indices


nealrichardson Sep 11, 2020
d60683d

Update test


nealrichardson Sep 11, 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


8 changes: 4 additions & 4 deletions
r/R/arrowExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


7 changes: 6 additions & 1 deletion
r/R/csv.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,12 @@ read_delim_arrow <- function(file,
 convert_options = convert_options
 )

 tab <- reader$Read()$select(!!enquo(col_select))
 tab <- reader$Read()

 col_select <- enquo(col_select)
 if (!quo_is_null(col_select)) {
 tab <- tab[vars_select(names(tab), !!col_select)]
 }

 if (isTRUE(as_data_frame)) {
 tab <- as.data.frame(tab)
Expand Down

7 changes: 6 additions & 1 deletion
r/R/json.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,12 @@
#' df <- read_json_arrow(tf)
#' }
read_json_arrow <- function(file, col_select = NULL, as_data_frame = TRUE, ...) {
 tab <- JsonTableReader$create(file, ...)$Read()$select(!!enquo(col_select))
 tab <- JsonTableReader$create(file, ...)$Read()

 col_select <- enquo(col_select)
 if (!quo_is_null(col_select)) {
 tab <- tab[vars_select(names(tab), !!col_select)]
 }

 if (isTRUE(as_data_frame)) {
 tab <- as.data.frame(tab)
Expand Down

28 changes: 13 additions & 15 deletions
r/R/record-batch.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,7 @@
#' - `$names()`: Get all column names (called by `names(batch)`)
#' - `$GetColumnByName(name)`: Extract an `Array` by string name
#' - `$RemoveColumn(i)`: Drops a column from the batch by integer position
#' - `$select(spec)`: Return a new record batch with a selection of columns.
#' This supports the usual `character`, `numeric`, and `logical` selection
#' methods as well as "tidy select" expressions.
#' - `$selectColumns(indices)`: Return a new record batch with a selection of columns, expressed as 0-based integers.
#' - `$Slice(offset, length = NULL)`: Create a zero-copy view starting at the
#' indicated integer offset and going for the given length, or to the end
#' of the table if `NULL`, the default.
Expand DownExpand Up@@ -84,21 +82,12 @@ RecordBatch <- R6Class("RecordBatch", inherit = ArrowObject,
 assert_that(is.string(name))
 shared_ptr(Array, RecordBatch__GetColumnByName(self, name))
 },
 select = function(spec) {
 spec <- enquo(spec)
 if (quo_is_null(spec)) {
 self
 } else {
 all_vars <- self$names()
 vars <- vars_select(all_vars, !!spec)
 indices <- match(vars, all_vars)
 shared_ptr(RecordBatch, RecordBatch__select(self, indices))
 }
 SelectColumns = function(indices) {
 shared_ptr(RecordBatch, RecordBatch__SelectColumns(self, indices))
 },
 RemoveColumn = function(i){
 shared_ptr(RecordBatch, RecordBatch__RemoveColumn(self, i))
 },

 Slice = function(offset, length = NULL) {
 if (is.null(length)) {
 shared_ptr(RecordBatch, RecordBatch__Slice1(self, offset))
Expand DownExpand Up@@ -218,7 +207,16 @@ names.RecordBatch <- function(x) x$names()
 if (!missing(j)) {
 # Selecting columns is cheaper than filtering rows, so do it first.
 # That way, if we're filtering too, we have fewer arrays to filter/slice/take
 x <- x$select(j)
 if (is_integerish(j)) {
 if (all(j < 0)) {
 # in R, negative j means "everything but j"
 j <- setdiff(seq_len(x$num_columns), -1 * j)
 }
 x <- x$SelectColumns(as.integer(j) - 1L)
Comment thread
nealrichardson marked this conversation as resolved.

 } else if (is.character(j)) {
 x <- x$SelectColumns(match(j, names(x)) - 1L)
 }

 if (drop && ncol(x) == 1L) {
 x <- x$column(0)
 }
Expand Down

16 changes: 3 additions & 13 deletions
r/R/table.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,7 @@
#' - `$ColumnNames()`: Get all column names (called by `names(tab)`)
#' - `$GetColumnByName(name)`: Extract a `ChunkedArray` by string name
#' - `$field(i)`: Extract a `Field` from the table schema by integer position
#' - `$select(spec)`: Return a new table with a selection of columns.
#' This supports the usual `character`, `numeric`, and `logical` selection
#' methods as well as "tidy select" expressions.
#' - `$SelectColumns(indices)`: Return new `Table` with specified columns, expressed as 0-based integers.
#' - `$Slice(offset, length = NULL)`: Create a zero-copy view starting at the
#' indicated integer offset and going for the given length, or to the end
#' of the table if `NULL`, the default.
Expand DownExpand Up@@ -115,16 +113,8 @@ Table <- R6Class("Table", inherit = ArrowObject,
 shared_ptr(Table, Table__cast(self, target_schema, options))
 },

 select = function(spec) {
 spec <- enquo(spec)
 if (quo_is_null(spec)) {
 self
 } else {
 all_vars <- self$ColumnNames()
 vars <- vars_select(all_vars, !!spec)
 indices <- match(vars, all_vars)
 shared_ptr(Table, Table__select(self, indices))
 }
 SelectColumns = function(indices) {
 shared_ptr(Table, Table__SelectColumns(self, indices))
 },

 Slice = function(offset, length = NULL) {
Expand Down

5 changes: 2 additions & 3 deletions
r/man/RecordBatch.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


5 changes: 2 additions & 3 deletions
r/man/Table.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


26 changes: 13 additions & 13 deletions
r/src/arrowExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


4 changes: 2 additions & 2 deletions
r/src/recordbatch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ std::shared_ptr<arrow::Array> RecordBatch__GetColumnByName(
}

// [[arrow::export]]
std::shared_ptr<arrow::RecordBatch> RecordBatch__select(
std::shared_ptr<arrow::RecordBatch> RecordBatch__SelectColumns(
 const std::shared_ptr<arrow::RecordBatch>& batch, cpp11::integers indices) {
 R_xlen_t n = indices.size();
 auto nrows = batch->num_rows();
Expand All@@ -86,7 +86,7 @@ std::shared_ptr<arrow::RecordBatch> RecordBatch__select(
 std::vector<std::shared_ptr<arrow::Array>> columns(n);

 for (R_xlen_t i = 0; i < n; i++) {
 int pos = indices[i] - 1;
 int pos = indices[i];
 fields[i] = batch->schema()->field(pos);
 columns[i] = batch->column(pos);
 }
Expand Down

18 changes: 3 additions & 15 deletions
r/src/table.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,21 +115,9 @@ std::shared_ptr<arrow::ChunkedArray> Table__GetColumnByName(
}

// [[arrow::export]]
std::shared_ptr<arrow::Table> Table__select(const std::shared_ptr<arrow::Table>& table,
 cpp11::integers indices) {
 R_xlen_t n = indices.size();

 std::vector<std::shared_ptr<arrow::Field>> fields(n);
 std::vector<std::shared_ptr<arrow::ChunkedArray>> columns(n);

 for (R_xlen_t i = 0; i < n; i++) {
 int pos = indices[i] - 1;
 fields[i] = table->schema()->field(pos);
 columns[i] = table->column(pos);
 }

 auto schema = std::make_shared<arrow::Schema>(std::move(fields));
 return arrow::Table::Make(schema, columns);
std::shared_ptr<arrow::Table> Table__SelectColumns(
 const std::shared_ptr<arrow::Table>& table, const std::vector<int>& indices) {
 return ValueOrStop(table->SelectColumns(indices));
}

namespace arrow {
Expand Down

19 changes: 14 additions & 5 deletions
r/tests/testthat/test-Table.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,16 +130,16 @@ test_that("[, [[, $ for Table", {
 expect_null(tab[["asdf"]])
 # List-like column slicing
 expect_data_frame(tab[2:4], tbl[2:4])
 expect_data_frame(tab[c(1, 0)], tbl[c(1, 0)])
 expect_data_frame(tab[c(2, 1)], tbl[c(2, 1)])
@nealrichardsonnealrichardsonSep 11, 2020

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.

Should we maintain the base R behavior for subsetting on column 0 (it is ignored)? I can't imagine why someone would do such a thing on purpose.
 expect_data_frame(tab[-3], tbl[-3])

 expect_error(tab[[c(4, 3)]])
 expect_error(tab[[NA]], "'i' must be character or numeric, not logical")
 expect_error(tab[[NULL]], "'i' must be character or numeric, not NULL")
 expect_error(tab[[c("asdf", "jkl;")]], 'length(name) not equal to 1', fixed = TRUE)
 expect_error(tab[-3], "Selections can't have negative value") # From tidyselect
 expect_error(tab[-3:3], "Selections can't have negative value") # From tidyselect
 expect_error(tab[1000]) # This is caught in vctrs, assert more specifically when it stabilizes
 expect_error(tab[1:1000]) # same as ^
 expect_error(tab[-3:3], "Invalid column index")
 expect_error(tab[1000], "Invalid column index")
 expect_error(tab[1:1000], "Invalid column index")

 skip("Table with 0 cols doesn't know how many rows it should have")
 expect_data_frame(tab[0], tbl[0])
Expand DownExpand Up@@ -349,3 +349,12 @@ test_that("Table unifies dictionary on conversion back to R (ARROW-8374)", {

 expect_identical(as.data.frame(tab), res)
})

test_that("Table$SelectColumns()", {
 tab <- Table$create(x = 1:10, y = 1:10)

 expect_equal(tab$SelectColumns(0L), Table$create(x = 1:10))

 expect_error(tab$SelectColumns(2:4))
 expect_error(tab$SelectColumns(""))
})

, '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-9387: [R] Use new C++ table select method#8125

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

romainfrancois
wants to merge
5
commits into

from

 Closed


ARROW-9387: [R] Use new C++ table select method
#8125
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7dec4ed

+ Table$SelectColumns()


romainfrancois Sep 7, 2020
ab4dd81

RecordBatch and Table gets $SelectColumns()


romainfrancois Sep 11, 2020
3668ad5

$SelectColumns() only supporting 0-based integers, but [ support R st…


romainfrancois Sep 11, 2020
0686538

Allow column selection by negative indices


nealrichardson Sep 11, 2020
d60683d

Update test


nealrichardson Sep 11, 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


8 changes: 4 additions & 4 deletions
r/R/arrowExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


7 changes: 6 additions & 1 deletion
r/R/csv.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,12 @@ read_delim_arrow <- function(file,
 convert_options = convert_options
 )

 tab <- reader$Read()$select(!!enquo(col_select))
 tab <- reader$Read()

 col_select <- enquo(col_select)
 if (!quo_is_null(col_select)) {
 tab <- tab[vars_select(names(tab), !!col_select)]
 }

 if (isTRUE(as_data_frame)) {
 tab <- as.data.frame(tab)
Expand Down

7 changes: 6 additions & 1 deletion
r/R/json.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,12 @@
#' df <- read_json_arrow(tf)
#' }
read_json_arrow <- function(file, col_select = NULL, as_data_frame = TRUE, ...) {
 tab <- JsonTableReader$create(file, ...)$Read()$select(!!enquo(col_select))
 tab <- JsonTableReader$create(file, ...)$Read()

 col_select <- enquo(col_select)
 if (!quo_is_null(col_select)) {
 tab <- tab[vars_select(names(tab), !!col_select)]
 }

 if (isTRUE(as_data_frame)) {
 tab <- as.data.frame(tab)
Expand Down

28 changes: 13 additions & 15 deletions
r/R/record-batch.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,7 @@
#' - `$names()`: Get all column names (called by `names(batch)`)
#' - `$GetColumnByName(name)`: Extract an `Array` by string name
#' - `$RemoveColumn(i)`: Drops a column from the batch by integer position
#' - `$select(spec)`: Return a new record batch with a selection of columns.
#' This supports the usual `character`, `numeric`, and `logical` selection
#' methods as well as "tidy select" expressions.
#' - `$selectColumns(indices)`: Return a new record batch with a selection of columns, expressed as 0-based integers.
#' - `$Slice(offset, length = NULL)`: Create a zero-copy view starting at the
#' indicated integer offset and going for the given length, or to the end
#' of the table if `NULL`, the default.
Expand DownExpand Up@@ -84,21 +82,12 @@ RecordBatch <- R6Class("RecordBatch", inherit = ArrowObject,
 assert_that(is.string(name))
 shared_ptr(Array, RecordBatch__GetColumnByName(self, name))
 },
 select = function(spec) {
 spec <- enquo(spec)
 if (quo_is_null(spec)) {
 self
 } else {
 all_vars <- self$names()
 vars <- vars_select(all_vars, !!spec)
 indices <- match(vars, all_vars)
 shared_ptr(RecordBatch, RecordBatch__select(self, indices))
 }
 SelectColumns = function(indices) {
 shared_ptr(RecordBatch, RecordBatch__SelectColumns(self, indices))
 },
 RemoveColumn = function(i){
 shared_ptr(RecordBatch, RecordBatch__RemoveColumn(self, i))
 },

 Slice = function(offset, length = NULL) {
 if (is.null(length)) {
 shared_ptr(RecordBatch, RecordBatch__Slice1(self, offset))
Expand DownExpand Up@@ -218,7 +207,16 @@ names.RecordBatch <- function(x) x$names()
 if (!missing(j)) {
 # Selecting columns is cheaper than filtering rows, so do it first.
 # That way, if we're filtering too, we have fewer arrays to filter/slice/take
 x <- x$select(j)
 if (is_integerish(j)) {
 if (all(j < 0)) {
 # in R, negative j means "everything but j"
 j <- setdiff(seq_len(x$num_columns), -1 * j)
 }
 x <- x$SelectColumns(as.integer(j) - 1L)
Comment thread
nealrichardson marked this conversation as resolved.

 } else if (is.character(j)) {
 x <- x$SelectColumns(match(j, names(x)) - 1L)
 }

 if (drop && ncol(x) == 1L) {
 x <- x$column(0)
 }
Expand Down

16 changes: 3 additions & 13 deletions
r/R/table.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,7 @@
#' - `$ColumnNames()`: Get all column names (called by `names(tab)`)
#' - `$GetColumnByName(name)`: Extract a `ChunkedArray` by string name
#' - `$field(i)`: Extract a `Field` from the table schema by integer position
#' - `$select(spec)`: Return a new table with a selection of columns.
#' This supports the usual `character`, `numeric`, and `logical` selection
#' methods as well as "tidy select" expressions.
#' - `$SelectColumns(indices)`: Return new `Table` with specified columns, expressed as 0-based integers.
#' - `$Slice(offset, length = NULL)`: Create a zero-copy view starting at the
#' indicated integer offset and going for the given length, or to the end
#' of the table if `NULL`, the default.
Expand DownExpand Up@@ -115,16 +113,8 @@ Table <- R6Class("Table", inherit = ArrowObject,
 shared_ptr(Table, Table__cast(self, target_schema, options))
 },

 select = function(spec) {
 spec <- enquo(spec)
 if (quo_is_null(spec)) {
 self
 } else {
 all_vars <- self$ColumnNames()
 vars <- vars_select(all_vars, !!spec)
 indices <- match(vars, all_vars)
 shared_ptr(Table, Table__select(self, indices))
 }
 SelectColumns = function(indices) {
 shared_ptr(Table, Table__SelectColumns(self, indices))
 },

 Slice = function(offset, length = NULL) {
Expand Down

5 changes: 2 additions & 3 deletions
r/man/RecordBatch.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


5 changes: 2 additions & 3 deletions
r/man/Table.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


26 changes: 13 additions & 13 deletions
r/src/arrowExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


4 changes: 2 additions & 2 deletions
r/src/recordbatch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ std::shared_ptr<arrow::Array> RecordBatch__GetColumnByName(
}

// [[arrow::export]]
std::shared_ptr<arrow::RecordBatch> RecordBatch__select(
std::shared_ptr<arrow::RecordBatch> RecordBatch__SelectColumns(
 const std::shared_ptr<arrow::RecordBatch>& batch, cpp11::integers indices) {
 R_xlen_t n = indices.size();
 auto nrows = batch->num_rows();
Expand All@@ -86,7 +86,7 @@ std::shared_ptr<arrow::RecordBatch> RecordBatch__select(
 std::vector<std::shared_ptr<arrow::Array>> columns(n);

 for (R_xlen_t i = 0; i < n; i++) {
 int pos = indices[i] - 1;
 int pos = indices[i];
 fields[i] = batch->schema()->field(pos);
 columns[i] = batch->column(pos);
 }
Expand Down

18 changes: 3 additions & 15 deletions
r/src/table.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,21 +115,9 @@ std::shared_ptr<arrow::ChunkedArray> Table__GetColumnByName(
}

// [[arrow::export]]
std::shared_ptr<arrow::Table> Table__select(const std::shared_ptr<arrow::Table>& table,
 cpp11::integers indices) {
 R_xlen_t n = indices.size();

 std::vector<std::shared_ptr<arrow::Field>> fields(n);
 std::vector<std::shared_ptr<arrow::ChunkedArray>> columns(n);

 for (R_xlen_t i = 0; i < n; i++) {
 int pos = indices[i] - 1;
 fields[i] = table->schema()->field(pos);
 columns[i] = table->column(pos);
 }

 auto schema = std::make_shared<arrow::Schema>(std::move(fields));
 return arrow::Table::Make(schema, columns);
std::shared_ptr<arrow::Table> Table__SelectColumns(
 const std::shared_ptr<arrow::Table>& table, const std::vector<int>& indices) {
 return ValueOrStop(table->SelectColumns(indices));
}

namespace arrow {
Expand Down

19 changes: 14 additions & 5 deletions
r/tests/testthat/test-Table.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,16 +130,16 @@ test_that("[, [[, $ for Table", {
 expect_null(tab[["asdf"]])
 # List-like column slicing
 expect_data_frame(tab[2:4], tbl[2:4])
 expect_data_frame(tab[c(1, 0)], tbl[c(1, 0)])
 expect_data_frame(tab[c(2, 1)], tbl[c(2, 1)])
@nealrichardsonnealrichardsonSep 11, 2020

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.

Should we maintain the base R behavior for subsetting on column 0 (it is ignored)? I can't imagine why someone would do such a thing on purpose.
 expect_data_frame(tab[-3], tbl[-3])

 expect_error(tab[[c(4, 3)]])
 expect_error(tab[[NA]], "'i' must be character or numeric, not logical")
 expect_error(tab[[NULL]], "'i' must be character or numeric, not NULL")
 expect_error(tab[[c("asdf", "jkl;")]], 'length(name) not equal to 1', fixed = TRUE)
 expect_error(tab[-3], "Selections can't have negative value") # From tidyselect
 expect_error(tab[-3:3], "Selections can't have negative value") # From tidyselect
 expect_error(tab[1000]) # This is caught in vctrs, assert more specifically when it stabilizes
 expect_error(tab[1:1000]) # same as ^
 expect_error(tab[-3:3], "Invalid column index")
 expect_error(tab[1000], "Invalid column index")
 expect_error(tab[1:1000], "Invalid column index")

 skip("Table with 0 cols doesn't know how many rows it should have")
 expect_data_frame(tab[0], tbl[0])
Expand DownExpand Up@@ -349,3 +349,12 @@ test_that("Table unifies dictionary on conversion back to R (ARROW-8374)", {

 expect_identical(as.data.frame(tab), res)
})

test_that("Table$SelectColumns()", {
 tab <- Table$create(x = 1:10, y = 1:10)

 expect_equal(tab$SelectColumns(0L), Table$create(x = 1:10))

 expect_error(tab$SelectColumns(2:4))
 expect_error(tab$SelectColumns(""))
})

, '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-9387: [R] Use new C++ table select method#8125

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

romainfrancois
wants to merge
5
commits into

from

 Closed


ARROW-9387: [R] Use new C++ table select method
#8125
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7dec4ed

+ Table$SelectColumns()


romainfrancois Sep 7, 2020
ab4dd81

RecordBatch and Table gets $SelectColumns()


romainfrancois Sep 11, 2020
3668ad5

$SelectColumns() only supporting 0-based integers, but [ support R st…


romainfrancois Sep 11, 2020
0686538

Allow column selection by negative indices


nealrichardson Sep 11, 2020
d60683d

Update test


nealrichardson Sep 11, 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


8 changes: 4 additions & 4 deletions
r/R/arrowExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


7 changes: 6 additions & 1 deletion
r/R/csv.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,12 @@ read_delim_arrow <- function(file,
 convert_options = convert_options
 )

 tab <- reader$Read()$select(!!enquo(col_select))
 tab <- reader$Read()

 col_select <- enquo(col_select)
 if (!quo_is_null(col_select)) {
 tab <- tab[vars_select(names(tab), !!col_select)]
 }

 if (isTRUE(as_data_frame)) {
 tab <- as.data.frame(tab)
Expand Down

7 changes: 6 additions & 1 deletion
r/R/json.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,12 @@
#' df <- read_json_arrow(tf)
#' }
read_json_arrow <- function(file, col_select = NULL, as_data_frame = TRUE, ...) {
 tab <- JsonTableReader$create(file, ...)$Read()$select(!!enquo(col_select))
 tab <- JsonTableReader$create(file, ...)$Read()

 col_select <- enquo(col_select)
 if (!quo_is_null(col_select)) {
 tab <- tab[vars_select(names(tab), !!col_select)]
 }

 if (isTRUE(as_data_frame)) {
 tab <- as.data.frame(tab)
Expand Down

28 changes: 13 additions & 15 deletions
r/R/record-batch.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,7 @@
#' - `$names()`: Get all column names (called by `names(batch)`)
#' - `$GetColumnByName(name)`: Extract an `Array` by string name
#' - `$RemoveColumn(i)`: Drops a column from the batch by integer position
#' - `$select(spec)`: Return a new record batch with a selection of columns.
#' This supports the usual `character`, `numeric`, and `logical` selection
#' methods as well as "tidy select" expressions.
#' - `$selectColumns(indices)`: Return a new record batch with a selection of columns, expressed as 0-based integers.
#' - `$Slice(offset, length = NULL)`: Create a zero-copy view starting at the
#' indicated integer offset and going for the given length, or to the end
#' of the table if `NULL`, the default.
Expand DownExpand Up@@ -84,21 +82,12 @@ RecordBatch <- R6Class("RecordBatch", inherit = ArrowObject,
 assert_that(is.string(name))
 shared_ptr(Array, RecordBatch__GetColumnByName(self, name))
 },
 select = function(spec) {
 spec <- enquo(spec)
 if (quo_is_null(spec)) {
 self
 } else {
 all_vars <- self$names()
 vars <- vars_select(all_vars, !!spec)
 indices <- match(vars, all_vars)
 shared_ptr(RecordBatch, RecordBatch__select(self, indices))
 }
 SelectColumns = function(indices) {
 shared_ptr(RecordBatch, RecordBatch__SelectColumns(self, indices))
 },
 RemoveColumn = function(i){
 shared_ptr(RecordBatch, RecordBatch__RemoveColumn(self, i))
 },

 Slice = function(offset, length = NULL) {
 if (is.null(length)) {
 shared_ptr(RecordBatch, RecordBatch__Slice1(self, offset))
Expand DownExpand Up@@ -218,7 +207,16 @@ names.RecordBatch <- function(x) x$names()
 if (!missing(j)) {
 # Selecting columns is cheaper than filtering rows, so do it first.
 # That way, if we're filtering too, we have fewer arrays to filter/slice/take
 x <- x$select(j)
 if (is_integerish(j)) {
 if (all(j < 0)) {
 # in R, negative j means "everything but j"
 j <- setdiff(seq_len(x$num_columns), -1 * j)
 }
 x <- x$SelectColumns(as.integer(j) - 1L)
Comment thread
nealrichardson marked this conversation as resolved.

 } else if (is.character(j)) {
 x <- x$SelectColumns(match(j, names(x)) - 1L)
 }

 if (drop && ncol(x) == 1L) {
 x <- x$column(0)
 }
Expand Down

16 changes: 3 additions & 13 deletions
r/R/table.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,7 @@
#' - `$ColumnNames()`: Get all column names (called by `names(tab)`)
#' - `$GetColumnByName(name)`: Extract a `ChunkedArray` by string name
#' - `$field(i)`: Extract a `Field` from the table schema by integer position
#' - `$select(spec)`: Return a new table with a selection of columns.
#' This supports the usual `character`, `numeric`, and `logical` selection
#' methods as well as "tidy select" expressions.
#' - `$SelectColumns(indices)`: Return new `Table` with specified columns, expressed as 0-based integers.
#' - `$Slice(offset, length = NULL)`: Create a zero-copy view starting at the
#' indicated integer offset and going for the given length, or to the end
#' of the table if `NULL`, the default.
Expand DownExpand Up@@ -115,16 +113,8 @@ Table <- R6Class("Table", inherit = ArrowObject,
 shared_ptr(Table, Table__cast(self, target_schema, options))
 },

 select = function(spec) {
 spec <- enquo(spec)
 if (quo_is_null(spec)) {
 self
 } else {
 all_vars <- self$ColumnNames()
 vars <- vars_select(all_vars, !!spec)
 indices <- match(vars, all_vars)
 shared_ptr(Table, Table__select(self, indices))
 }
 SelectColumns = function(indices) {
 shared_ptr(Table, Table__SelectColumns(self, indices))
 },

 Slice = function(offset, length = NULL) {
Expand Down

5 changes: 2 additions & 3 deletions
r/man/RecordBatch.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


5 changes: 2 additions & 3 deletions
r/man/Table.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


26 changes: 13 additions & 13 deletions
r/src/arrowExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


4 changes: 2 additions & 2 deletions
r/src/recordbatch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ std::shared_ptr<arrow::Array> RecordBatch__GetColumnByName(
}

// [[arrow::export]]
std::shared_ptr<arrow::RecordBatch> RecordBatch__select(
std::shared_ptr<arrow::RecordBatch> RecordBatch__SelectColumns(
 const std::shared_ptr<arrow::RecordBatch>& batch, cpp11::integers indices) {
 R_xlen_t n = indices.size();
 auto nrows = batch->num_rows();
Expand All@@ -86,7 +86,7 @@ std::shared_ptr<arrow::RecordBatch> RecordBatch__select(
 std::vector<std::shared_ptr<arrow::Array>> columns(n);

 for (R_xlen_t i = 0; i < n; i++) {
 int pos = indices[i] - 1;
 int pos = indices[i];
 fields[i] = batch->schema()->field(pos);
 columns[i] = batch->column(pos);
 }
Expand Down

18 changes: 3 additions & 15 deletions
r/src/table.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,21 +115,9 @@ std::shared_ptr<arrow::ChunkedArray> Table__GetColumnByName(
}

// [[arrow::export]]
std::shared_ptr<arrow::Table> Table__select(const std::shared_ptr<arrow::Table>& table,
 cpp11::integers indices) {
 R_xlen_t n = indices.size();

 std::vector<std::shared_ptr<arrow::Field>> fields(n);
 std::vector<std::shared_ptr<arrow::ChunkedArray>> columns(n);

 for (R_xlen_t i = 0; i < n; i++) {
 int pos = indices[i] - 1;
 fields[i] = table->schema()->field(pos);
 columns[i] = table->column(pos);
 }

 auto schema = std::make_shared<arrow::Schema>(std::move(fields));
 return arrow::Table::Make(schema, columns);
std::shared_ptr<arrow::Table> Table__SelectColumns(
 const std::shared_ptr<arrow::Table>& table, const std::vector<int>& indices) {
 return ValueOrStop(table->SelectColumns(indices));
}

namespace arrow {
Expand Down

19 changes: 14 additions & 5 deletions
r/tests/testthat/test-Table.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,16 +130,16 @@ test_that("[, [[, $ for Table", {
 expect_null(tab[["asdf"]])
 # List-like column slicing
 expect_data_frame(tab[2:4], tbl[2:4])
 expect_data_frame(tab[c(1, 0)], tbl[c(1, 0)])
 expect_data_frame(tab[c(2, 1)], tbl[c(2, 1)])
@nealrichardsonnealrichardsonSep 11, 2020

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.

Should we maintain the base R behavior for subsetting on column 0 (it is ignored)? I can't imagine why someone would do such a thing on purpose.
 expect_data_frame(tab[-3], tbl[-3])

 expect_error(tab[[c(4, 3)]])
 expect_error(tab[[NA]], "'i' must be character or numeric, not logical")
 expect_error(tab[[NULL]], "'i' must be character or numeric, not NULL")
 expect_error(tab[[c("asdf", "jkl;")]], 'length(name) not equal to 1', fixed = TRUE)
 expect_error(tab[-3], "Selections can't have negative value") # From tidyselect
 expect_error(tab[-3:3], "Selections can't have negative value") # From tidyselect
 expect_error(tab[1000]) # This is caught in vctrs, assert more specifically when it stabilizes
 expect_error(tab[1:1000]) # same as ^
 expect_error(tab[-3:3], "Invalid column index")
 expect_error(tab[1000], "Invalid column index")
 expect_error(tab[1:1000], "Invalid column index")

 skip("Table with 0 cols doesn't know how many rows it should have")
 expect_data_frame(tab[0], tbl[0])
Expand DownExpand Up@@ -349,3 +349,12 @@ test_that("Table unifies dictionary on conversion back to R (ARROW-8374)", {

 expect_identical(as.data.frame(tab), res)
})

test_that("Table$SelectColumns()", {
 tab <- Table$create(x = 1:10, y = 1:10)

 expect_equal(tab$SelectColumns(0L), Table$create(x = 1:10))

 expect_error(tab$SelectColumns(2:4))
 expect_error(tab$SelectColumns(""))
})

, '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-9387: [R] Use new C++ table select method#8125

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

romainfrancois
wants to merge
5
commits into

from

 Closed


ARROW-9387: [R] Use new C++ table select method
#8125
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7dec4ed

+ Table$SelectColumns()


romainfrancois Sep 7, 2020
ab4dd81

RecordBatch and Table gets $SelectColumns()


romainfrancois Sep 11, 2020
3668ad5

$SelectColumns() only supporting 0-based integers, but [ support R st…


romainfrancois Sep 11, 2020
0686538

Allow column selection by negative indices


nealrichardson Sep 11, 2020
d60683d

Update test


nealrichardson Sep 11, 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


8 changes: 4 additions & 4 deletions
r/R/arrowExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


7 changes: 6 additions & 1 deletion
r/R/csv.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,12 @@ read_delim_arrow <- function(file,
 convert_options = convert_options
 )

 tab <- reader$Read()$select(!!enquo(col_select))
 tab <- reader$Read()

 col_select <- enquo(col_select)
 if (!quo_is_null(col_select)) {
 tab <- tab[vars_select(names(tab), !!col_select)]
 }

 if (isTRUE(as_data_frame)) {
 tab <- as.data.frame(tab)
Expand Down

7 changes: 6 additions & 1 deletion
r/R/json.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,12 @@
#' df <- read_json_arrow(tf)
#' }
read_json_arrow <- function(file, col_select = NULL, as_data_frame = TRUE, ...) {
 tab <- JsonTableReader$create(file, ...)$Read()$select(!!enquo(col_select))
 tab <- JsonTableReader$create(file, ...)$Read()

 col_select <- enquo(col_select)
 if (!quo_is_null(col_select)) {
 tab <- tab[vars_select(names(tab), !!col_select)]
 }

 if (isTRUE(as_data_frame)) {
 tab <- as.data.frame(tab)
Expand Down

28 changes: 13 additions & 15 deletions
r/R/record-batch.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,7 @@
#' - `$names()`: Get all column names (called by `names(batch)`)
#' - `$GetColumnByName(name)`: Extract an `Array` by string name
#' - `$RemoveColumn(i)`: Drops a column from the batch by integer position
#' - `$select(spec)`: Return a new record batch with a selection of columns.
#' This supports the usual `character`, `numeric`, and `logical` selection
#' methods as well as "tidy select" expressions.
#' - `$selectColumns(indices)`: Return a new record batch with a selection of columns, expressed as 0-based integers.
#' - `$Slice(offset, length = NULL)`: Create a zero-copy view starting at the
#' indicated integer offset and going for the given length, or to the end
#' of the table if `NULL`, the default.
Expand DownExpand Up@@ -84,21 +82,12 @@ RecordBatch <- R6Class("RecordBatch", inherit = ArrowObject,
 assert_that(is.string(name))
 shared_ptr(Array, RecordBatch__GetColumnByName(self, name))
 },
 select = function(spec) {
 spec <- enquo(spec)
 if (quo_is_null(spec)) {
 self
 } else {
 all_vars <- self$names()
 vars <- vars_select(all_vars, !!spec)
 indices <- match(vars, all_vars)
 shared_ptr(RecordBatch, RecordBatch__select(self, indices))
 }
 SelectColumns = function(indices) {
 shared_ptr(RecordBatch, RecordBatch__SelectColumns(self, indices))
 },
 RemoveColumn = function(i){
 shared_ptr(RecordBatch, RecordBatch__RemoveColumn(self, i))
 },

 Slice = function(offset, length = NULL) {
 if (is.null(length)) {
 shared_ptr(RecordBatch, RecordBatch__Slice1(self, offset))
Expand DownExpand Up@@ -218,7 +207,16 @@ names.RecordBatch <- function(x) x$names()
 if (!missing(j)) {
 # Selecting columns is cheaper than filtering rows, so do it first.
 # That way, if we're filtering too, we have fewer arrays to filter/slice/take
 x <- x$select(j)
 if (is_integerish(j)) {
 if (all(j < 0)) {
 # in R, negative j means "everything but j"
 j <- setdiff(seq_len(x$num_columns), -1 * j)
 }
 x <- x$SelectColumns(as.integer(j) - 1L)
Comment thread
nealrichardson marked this conversation as resolved.

 } else if (is.character(j)) {
 x <- x$SelectColumns(match(j, names(x)) - 1L)
 }

 if (drop && ncol(x) == 1L) {
 x <- x$column(0)
 }
Expand Down

16 changes: 3 additions & 13 deletions
r/R/table.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,7 @@
#' - `$ColumnNames()`: Get all column names (called by `names(tab)`)
#' - `$GetColumnByName(name)`: Extract a `ChunkedArray` by string name
#' - `$field(i)`: Extract a `Field` from the table schema by integer position
#' - `$select(spec)`: Return a new table with a selection of columns.
#' This supports the usual `character`, `numeric`, and `logical` selection
#' methods as well as "tidy select" expressions.
#' - `$SelectColumns(indices)`: Return new `Table` with specified columns, expressed as 0-based integers.
#' - `$Slice(offset, length = NULL)`: Create a zero-copy view starting at the
#' indicated integer offset and going for the given length, or to the end
#' of the table if `NULL`, the default.
Expand DownExpand Up@@ -115,16 +113,8 @@ Table <- R6Class("Table", inherit = ArrowObject,
 shared_ptr(Table, Table__cast(self, target_schema, options))
 },

 select = function(spec) {
 spec <- enquo(spec)
 if (quo_is_null(spec)) {
 self
 } else {
 all_vars <- self$ColumnNames()
 vars <- vars_select(all_vars, !!spec)
 indices <- match(vars, all_vars)
 shared_ptr(Table, Table__select(self, indices))
 }
 SelectColumns = function(indices) {
 shared_ptr(Table, Table__SelectColumns(self, indices))
 },

 Slice = function(offset, length = NULL) {
Expand Down

5 changes: 2 additions & 3 deletions
r/man/RecordBatch.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


5 changes: 2 additions & 3 deletions
r/man/Table.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


26 changes: 13 additions & 13 deletions
r/src/arrowExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


4 changes: 2 additions & 2 deletions
r/src/recordbatch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ std::shared_ptr<arrow::Array> RecordBatch__GetColumnByName(
}

// [[arrow::export]]
std::shared_ptr<arrow::RecordBatch> RecordBatch__select(
std::shared_ptr<arrow::RecordBatch> RecordBatch__SelectColumns(
 const std::shared_ptr<arrow::RecordBatch>& batch, cpp11::integers indices) {
 R_xlen_t n = indices.size();
 auto nrows = batch->num_rows();
Expand All@@ -86,7 +86,7 @@ std::shared_ptr<arrow::RecordBatch> RecordBatch__select(
 std::vector<std::shared_ptr<arrow::Array>> columns(n);

 for (R_xlen_t i = 0; i < n; i++) {
 int pos = indices[i] - 1;
 int pos = indices[i];
 fields[i] = batch->schema()->field(pos);
 columns[i] = batch->column(pos);
 }
Expand Down

18 changes: 3 additions & 15 deletions
r/src/table.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,21 +115,9 @@ std::shared_ptr<arrow::ChunkedArray> Table__GetColumnByName(
}

// [[arrow::export]]
std::shared_ptr<arrow::Table> Table__select(const std::shared_ptr<arrow::Table>& table,
 cpp11::integers indices) {
 R_xlen_t n = indices.size();

 std::vector<std::shared_ptr<arrow::Field>> fields(n);
 std::vector<std::shared_ptr<arrow::ChunkedArray>> columns(n);

 for (R_xlen_t i = 0; i < n; i++) {
 int pos = indices[i] - 1;
 fields[i] = table->schema()->field(pos);
 columns[i] = table->column(pos);
 }

 auto schema = std::make_shared<arrow::Schema>(std::move(fields));
 return arrow::Table::Make(schema, columns);
std::shared_ptr<arrow::Table> Table__SelectColumns(
 const std::shared_ptr<arrow::Table>& table, const std::vector<int>& indices) {
 return ValueOrStop(table->SelectColumns(indices));
}

namespace arrow {
Expand Down

19 changes: 14 additions & 5 deletions
r/tests/testthat/test-Table.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,16 +130,16 @@ test_that("[, [[, $ for Table", {
 expect_null(tab[["asdf"]])
 # List-like column slicing
 expect_data_frame(tab[2:4], tbl[2:4])
 expect_data_frame(tab[c(1, 0)], tbl[c(1, 0)])
 expect_data_frame(tab[c(2, 1)], tbl[c(2, 1)])
@nealrichardsonnealrichardsonSep 11, 2020

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.

Should we maintain the base R behavior for subsetting on column 0 (it is ignored)? I can't imagine why someone would do such a thing on purpose.
 expect_data_frame(tab[-3], tbl[-3])

 expect_error(tab[[c(4, 3)]])
 expect_error(tab[[NA]], "'i' must be character or numeric, not logical")
 expect_error(tab[[NULL]], "'i' must be character or numeric, not NULL")
 expect_error(tab[[c("asdf", "jkl;")]], 'length(name) not equal to 1', fixed = TRUE)
 expect_error(tab[-3], "Selections can't have negative value") # From tidyselect
 expect_error(tab[-3:3], "Selections can't have negative value") # From tidyselect
 expect_error(tab[1000]) # This is caught in vctrs, assert more specifically when it stabilizes
 expect_error(tab[1:1000]) # same as ^
 expect_error(tab[-3:3], "Invalid column index")
 expect_error(tab[1000], "Invalid column index")
 expect_error(tab[1:1000], "Invalid column index")

 skip("Table with 0 cols doesn't know how many rows it should have")
 expect_data_frame(tab[0], tbl[0])
Expand DownExpand Up@@ -349,3 +349,12 @@ test_that("Table unifies dictionary on conversion back to R (ARROW-8374)", {

 expect_identical(as.data.frame(tab), res)
})

test_that("Table$SelectColumns()", {
 tab <- Table$create(x = 1:10, y = 1:10)

 expect_equal(tab$SelectColumns(0L), Table$create(x = 1:10))

 expect_error(tab$SelectColumns(2:4))
 expect_error(tab$SelectColumns(""))
})

, '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-9387: [R] Use new C++ table select method#8125

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

romainfrancois
wants to merge
5
commits into

from

 Closed


ARROW-9387: [R] Use new C++ table select method
#8125
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7dec4ed

+ Table$SelectColumns()


romainfrancois Sep 7, 2020
ab4dd81

RecordBatch and Table gets $SelectColumns()


romainfrancois Sep 11, 2020
3668ad5

$SelectColumns() only supporting 0-based integers, but [ support R st…


romainfrancois Sep 11, 2020
0686538

Allow column selection by negative indices


nealrichardson Sep 11, 2020
d60683d

Update test


nealrichardson Sep 11, 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


8 changes: 4 additions & 4 deletions
r/R/arrowExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


7 changes: 6 additions & 1 deletion
r/R/csv.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,12 @@ read_delim_arrow <- function(file,
 convert_options = convert_options
 )

 tab <- reader$Read()$select(!!enquo(col_select))
 tab <- reader$Read()

 col_select <- enquo(col_select)
 if (!quo_is_null(col_select)) {
 tab <- tab[vars_select(names(tab), !!col_select)]
 }

 if (isTRUE(as_data_frame)) {
 tab <- as.data.frame(tab)
Expand Down

7 changes: 6 additions & 1 deletion
r/R/json.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,12 @@
#' df <- read_json_arrow(tf)
#' }
read_json_arrow <- function(file, col_select = NULL, as_data_frame = TRUE, ...) {
 tab <- JsonTableReader$create(file, ...)$Read()$select(!!enquo(col_select))
 tab <- JsonTableReader$create(file, ...)$Read()

 col_select <- enquo(col_select)
 if (!quo_is_null(col_select)) {
 tab <- tab[vars_select(names(tab), !!col_select)]
 }

 if (isTRUE(as_data_frame)) {
 tab <- as.data.frame(tab)
Expand Down

28 changes: 13 additions & 15 deletions
r/R/record-batch.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,7 @@
#' - `$names()`: Get all column names (called by `names(batch)`)
#' - `$GetColumnByName(name)`: Extract an `Array` by string name
#' - `$RemoveColumn(i)`: Drops a column from the batch by integer position
#' - `$select(spec)`: Return a new record batch with a selection of columns.
#' This supports the usual `character`, `numeric`, and `logical` selection
#' methods as well as "tidy select" expressions.
#' - `$selectColumns(indices)`: Return a new record batch with a selection of columns, expressed as 0-based integers.
#' - `$Slice(offset, length = NULL)`: Create a zero-copy view starting at the
#' indicated integer offset and going for the given length, or to the end
#' of the table if `NULL`, the default.
Expand DownExpand Up@@ -84,21 +82,12 @@ RecordBatch <- R6Class("RecordBatch", inherit = ArrowObject,
 assert_that(is.string(name))
 shared_ptr(Array, RecordBatch__GetColumnByName(self, name))
 },
 select = function(spec) {
 spec <- enquo(spec)
 if (quo_is_null(spec)) {
 self
 } else {
 all_vars <- self$names()
 vars <- vars_select(all_vars, !!spec)
 indices <- match(vars, all_vars)
 shared_ptr(RecordBatch, RecordBatch__select(self, indices))
 }
 SelectColumns = function(indices) {
 shared_ptr(RecordBatch, RecordBatch__SelectColumns(self, indices))
 },
 RemoveColumn = function(i){
 shared_ptr(RecordBatch, RecordBatch__RemoveColumn(self, i))
 },

 Slice = function(offset, length = NULL) {
 if (is.null(length)) {
 shared_ptr(RecordBatch, RecordBatch__Slice1(self, offset))
Expand DownExpand Up@@ -218,7 +207,16 @@ names.RecordBatch <- function(x) x$names()
 if (!missing(j)) {
 # Selecting columns is cheaper than filtering rows, so do it first.
 # That way, if we're filtering too, we have fewer arrays to filter/slice/take
 x <- x$select(j)
 if (is_integerish(j)) {
 if (all(j < 0)) {
 # in R, negative j means "everything but j"
 j <- setdiff(seq_len(x$num_columns), -1 * j)
 }
 x <- x$SelectColumns(as.integer(j) - 1L)
Comment thread
nealrichardson marked this conversation as resolved.

 } else if (is.character(j)) {
 x <- x$SelectColumns(match(j, names(x)) - 1L)
 }

 if (drop && ncol(x) == 1L) {
 x <- x$column(0)
 }
Expand Down

16 changes: 3 additions & 13 deletions
r/R/table.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,7 @@
#' - `$ColumnNames()`: Get all column names (called by `names(tab)`)
#' - `$GetColumnByName(name)`: Extract a `ChunkedArray` by string name
#' - `$field(i)`: Extract a `Field` from the table schema by integer position
#' - `$select(spec)`: Return a new table with a selection of columns.
#' This supports the usual `character`, `numeric`, and `logical` selection
#' methods as well as "tidy select" expressions.
#' - `$SelectColumns(indices)`: Return new `Table` with specified columns, expressed as 0-based integers.
#' - `$Slice(offset, length = NULL)`: Create a zero-copy view starting at the
#' indicated integer offset and going for the given length, or to the end
#' of the table if `NULL`, the default.
Expand DownExpand Up@@ -115,16 +113,8 @@ Table <- R6Class("Table", inherit = ArrowObject,
 shared_ptr(Table, Table__cast(self, target_schema, options))
 },

 select = function(spec) {
 spec <- enquo(spec)
 if (quo_is_null(spec)) {
 self
 } else {
 all_vars <- self$ColumnNames()
 vars <- vars_select(all_vars, !!spec)
 indices <- match(vars, all_vars)
 shared_ptr(Table, Table__select(self, indices))
 }
 SelectColumns = function(indices) {
 shared_ptr(Table, Table__SelectColumns(self, indices))
 },

 Slice = function(offset, length = NULL) {
Expand Down

5 changes: 2 additions & 3 deletions
r/man/RecordBatch.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


5 changes: 2 additions & 3 deletions
r/man/Table.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


26 changes: 13 additions & 13 deletions
r/src/arrowExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


4 changes: 2 additions & 2 deletions
r/src/recordbatch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ std::shared_ptr<arrow::Array> RecordBatch__GetColumnByName(
}

// [[arrow::export]]
std::shared_ptr<arrow::RecordBatch> RecordBatch__select(
std::shared_ptr<arrow::RecordBatch> RecordBatch__SelectColumns(
 const std::shared_ptr<arrow::RecordBatch>& batch, cpp11::integers indices) {
 R_xlen_t n = indices.size();
 auto nrows = batch->num_rows();
Expand All@@ -86,7 +86,7 @@ std::shared_ptr<arrow::RecordBatch> RecordBatch__select(
 std::vector<std::shared_ptr<arrow::Array>> columns(n);

 for (R_xlen_t i = 0; i < n; i++) {
 int pos = indices[i] - 1;
 int pos = indices[i];
 fields[i] = batch->schema()->field(pos);
 columns[i] = batch->column(pos);
 }
Expand Down

18 changes: 3 additions & 15 deletions
r/src/table.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,21 +115,9 @@ std::shared_ptr<arrow::ChunkedArray> Table__GetColumnByName(
}

// [[arrow::export]]
std::shared_ptr<arrow::Table> Table__select(const std::shared_ptr<arrow::Table>& table,
 cpp11::integers indices) {
 R_xlen_t n = indices.size();

 std::vector<std::shared_ptr<arrow::Field>> fields(n);
 std::vector<std::shared_ptr<arrow::ChunkedArray>> columns(n);

 for (R_xlen_t i = 0; i < n; i++) {
 int pos = indices[i] - 1;
 fields[i] = table->schema()->field(pos);
 columns[i] = table->column(pos);
 }

 auto schema = std::make_shared<arrow::Schema>(std::move(fields));
 return arrow::Table::Make(schema, columns);
std::shared_ptr<arrow::Table> Table__SelectColumns(
 const std::shared_ptr<arrow::Table>& table, const std::vector<int>& indices) {
 return ValueOrStop(table->SelectColumns(indices));
}

namespace arrow {
Expand Down

19 changes: 14 additions & 5 deletions
r/tests/testthat/test-Table.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,16 +130,16 @@ test_that("[, [[, $ for Table", {
 expect_null(tab[["asdf"]])
 # List-like column slicing
 expect_data_frame(tab[2:4], tbl[2:4])
 expect_data_frame(tab[c(1, 0)], tbl[c(1, 0)])
 expect_data_frame(tab[c(2, 1)], tbl[c(2, 1)])
@nealrichardsonnealrichardsonSep 11, 2020

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.

Should we maintain the base R behavior for subsetting on column 0 (it is ignored)? I can't imagine why someone would do such a thing on purpose.
 expect_data_frame(tab[-3], tbl[-3])

 expect_error(tab[[c(4, 3)]])
 expect_error(tab[[NA]], "'i' must be character or numeric, not logical")
 expect_error(tab[[NULL]], "'i' must be character or numeric, not NULL")
 expect_error(tab[[c("asdf", "jkl;")]], 'length(name) not equal to 1', fixed = TRUE)
 expect_error(tab[-3], "Selections can't have negative value") # From tidyselect
 expect_error(tab[-3:3], "Selections can't have negative value") # From tidyselect
 expect_error(tab[1000]) # This is caught in vctrs, assert more specifically when it stabilizes
 expect_error(tab[1:1000]) # same as ^
 expect_error(tab[-3:3], "Invalid column index")
 expect_error(tab[1000], "Invalid column index")
 expect_error(tab[1:1000], "Invalid column index")

 skip("Table with 0 cols doesn't know how many rows it should have")
 expect_data_frame(tab[0], tbl[0])
Expand DownExpand Up@@ -349,3 +349,12 @@ test_that("Table unifies dictionary on conversion back to R (ARROW-8374)", {

 expect_identical(as.data.frame(tab), res)
})

test_that("Table$SelectColumns()", {
 tab <- Table$create(x = 1:10, y = 1:10)

 expect_equal(tab$SelectColumns(0L), Table$create(x = 1:10))

 expect_error(tab$SelectColumns(2:4))
 expect_error(tab$SelectColumns(""))
})

, '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-9387: [R] Use new C++ table select method#8125

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

romainfrancois
wants to merge
5
commits into

from

 Closed


ARROW-9387: [R] Use new C++ table select method
#8125
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7dec4ed

+ Table$SelectColumns()


romainfrancois Sep 7, 2020
ab4dd81

RecordBatch and Table gets $SelectColumns()


romainfrancois Sep 11, 2020
3668ad5

$SelectColumns() only supporting 0-based integers, but [ support R st…


romainfrancois Sep 11, 2020
0686538

Allow column selection by negative indices


nealrichardson Sep 11, 2020
d60683d

Update test


nealrichardson Sep 11, 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


8 changes: 4 additions & 4 deletions
r/R/arrowExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


7 changes: 6 additions & 1 deletion
r/R/csv.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,12 @@ read_delim_arrow <- function(file,
 convert_options = convert_options
 )

 tab <- reader$Read()$select(!!enquo(col_select))
 tab <- reader$Read()

 col_select <- enquo(col_select)
 if (!quo_is_null(col_select)) {
 tab <- tab[vars_select(names(tab), !!col_select)]
 }

 if (isTRUE(as_data_frame)) {
 tab <- as.data.frame(tab)
Expand Down

7 changes: 6 additions & 1 deletion
r/R/json.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,12 @@
#' df <- read_json_arrow(tf)
#' }
read_json_arrow <- function(file, col_select = NULL, as_data_frame = TRUE, ...) {
 tab <- JsonTableReader$create(file, ...)$Read()$select(!!enquo(col_select))
 tab <- JsonTableReader$create(file, ...)$Read()

 col_select <- enquo(col_select)
 if (!quo_is_null(col_select)) {
 tab <- tab[vars_select(names(tab), !!col_select)]
 }

 if (isTRUE(as_data_frame)) {
 tab <- as.data.frame(tab)
Expand Down

28 changes: 13 additions & 15 deletions
r/R/record-batch.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,7 @@
#' - `$names()`: Get all column names (called by `names(batch)`)
#' - `$GetColumnByName(name)`: Extract an `Array` by string name
#' - `$RemoveColumn(i)`: Drops a column from the batch by integer position
#' - `$select(spec)`: Return a new record batch with a selection of columns.
#' This supports the usual `character`, `numeric`, and `logical` selection
#' methods as well as "tidy select" expressions.
#' - `$selectColumns(indices)`: Return a new record batch with a selection of columns, expressed as 0-based integers.
#' - `$Slice(offset, length = NULL)`: Create a zero-copy view starting at the
#' indicated integer offset and going for the given length, or to the end
#' of the table if `NULL`, the default.
Expand DownExpand Up@@ -84,21 +82,12 @@ RecordBatch <- R6Class("RecordBatch", inherit = ArrowObject,
 assert_that(is.string(name))
 shared_ptr(Array, RecordBatch__GetColumnByName(self, name))
 },
 select = function(spec) {
 spec <- enquo(spec)
 if (quo_is_null(spec)) {
 self
 } else {
 all_vars <- self$names()
 vars <- vars_select(all_vars, !!spec)
 indices <- match(vars, all_vars)
 shared_ptr(RecordBatch, RecordBatch__select(self, indices))
 }
 SelectColumns = function(indices) {
 shared_ptr(RecordBatch, RecordBatch__SelectColumns(self, indices))
 },
 RemoveColumn = function(i){
 shared_ptr(RecordBatch, RecordBatch__RemoveColumn(self, i))
 },

 Slice = function(offset, length = NULL) {
 if (is.null(length)) {
 shared_ptr(RecordBatch, RecordBatch__Slice1(self, offset))
Expand DownExpand Up@@ -218,7 +207,16 @@ names.RecordBatch <- function(x) x$names()
 if (!missing(j)) {
 # Selecting columns is cheaper than filtering rows, so do it first.
 # That way, if we're filtering too, we have fewer arrays to filter/slice/take
 x <- x$select(j)
 if (is_integerish(j)) {
 if (all(j < 0)) {
 # in R, negative j means "everything but j"
 j <- setdiff(seq_len(x$num_columns), -1 * j)
 }
 x <- x$SelectColumns(as.integer(j) - 1L)
Comment thread
nealrichardson marked this conversation as resolved.

 } else if (is.character(j)) {
 x <- x$SelectColumns(match(j, names(x)) - 1L)
 }

 if (drop && ncol(x) == 1L) {
 x <- x$column(0)
 }
Expand Down

16 changes: 3 additions & 13 deletions
r/R/table.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,7 @@
#' - `$ColumnNames()`: Get all column names (called by `names(tab)`)
#' - `$GetColumnByName(name)`: Extract a `ChunkedArray` by string name
#' - `$field(i)`: Extract a `Field` from the table schema by integer position
#' - `$select(spec)`: Return a new table with a selection of columns.
#' This supports the usual `character`, `numeric`, and `logical` selection
#' methods as well as "tidy select" expressions.
#' - `$SelectColumns(indices)`: Return new `Table` with specified columns, expressed as 0-based integers.
#' - `$Slice(offset, length = NULL)`: Create a zero-copy view starting at the
#' indicated integer offset and going for the given length, or to the end
#' of the table if `NULL`, the default.
Expand DownExpand Up@@ -115,16 +113,8 @@ Table <- R6Class("Table", inherit = ArrowObject,
 shared_ptr(Table, Table__cast(self, target_schema, options))
 },

 select = function(spec) {
 spec <- enquo(spec)
 if (quo_is_null(spec)) {
 self
 } else {
 all_vars <- self$ColumnNames()
 vars <- vars_select(all_vars, !!spec)
 indices <- match(vars, all_vars)
 shared_ptr(Table, Table__select(self, indices))
 }
 SelectColumns = function(indices) {
 shared_ptr(Table, Table__SelectColumns(self, indices))
 },

 Slice = function(offset, length = NULL) {
Expand Down

5 changes: 2 additions & 3 deletions
r/man/RecordBatch.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


5 changes: 2 additions & 3 deletions
r/man/Table.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


26 changes: 13 additions & 13 deletions
r/src/arrowExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


4 changes: 2 additions & 2 deletions
r/src/recordbatch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ std::shared_ptr<arrow::Array> RecordBatch__GetColumnByName(
}

// [[arrow::export]]
std::shared_ptr<arrow::RecordBatch> RecordBatch__select(
std::shared_ptr<arrow::RecordBatch> RecordBatch__SelectColumns(
 const std::shared_ptr<arrow::RecordBatch>& batch, cpp11::integers indices) {
 R_xlen_t n = indices.size();
 auto nrows = batch->num_rows();
Expand All@@ -86,7 +86,7 @@ std::shared_ptr<arrow::RecordBatch> RecordBatch__select(
 std::vector<std::shared_ptr<arrow::Array>> columns(n);

 for (R_xlen_t i = 0; i < n; i++) {
 int pos = indices[i] - 1;
 int pos = indices[i];
 fields[i] = batch->schema()->field(pos);
 columns[i] = batch->column(pos);
 }
Expand Down

18 changes: 3 additions & 15 deletions
r/src/table.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,21 +115,9 @@ std::shared_ptr<arrow::ChunkedArray> Table__GetColumnByName(
}

// [[arrow::export]]
std::shared_ptr<arrow::Table> Table__select(const std::shared_ptr<arrow::Table>& table,
 cpp11::integers indices) {
 R_xlen_t n = indices.size();

 std::vector<std::shared_ptr<arrow::Field>> fields(n);
 std::vector<std::shared_ptr<arrow::ChunkedArray>> columns(n);

 for (R_xlen_t i = 0; i < n; i++) {
 int pos = indices[i] - 1;
 fields[i] = table->schema()->field(pos);
 columns[i] = table->column(pos);
 }

 auto schema = std::make_shared<arrow::Schema>(std::move(fields));
 return arrow::Table::Make(schema, columns);
std::shared_ptr<arrow::Table> Table__SelectColumns(
 const std::shared_ptr<arrow::Table>& table, const std::vector<int>& indices) {
 return ValueOrStop(table->SelectColumns(indices));
}

namespace arrow {
Expand Down

19 changes: 14 additions & 5 deletions
r/tests/testthat/test-Table.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,16 +130,16 @@ test_that("[, [[, $ for Table", {
 expect_null(tab[["asdf"]])
 # List-like column slicing
 expect_data_frame(tab[2:4], tbl[2:4])
 expect_data_frame(tab[c(1, 0)], tbl[c(1, 0)])
 expect_data_frame(tab[c(2, 1)], tbl[c(2, 1)])
@nealrichardsonnealrichardsonSep 11, 2020

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.

Should we maintain the base R behavior for subsetting on column 0 (it is ignored)? I can't imagine why someone would do such a thing on purpose.
 expect_data_frame(tab[-3], tbl[-3])

 expect_error(tab[[c(4, 3)]])
 expect_error(tab[[NA]], "'i' must be character or numeric, not logical")
 expect_error(tab[[NULL]], "'i' must be character or numeric, not NULL")
 expect_error(tab[[c("asdf", "jkl;")]], 'length(name) not equal to 1', fixed = TRUE)
 expect_error(tab[-3], "Selections can't have negative value") # From tidyselect
 expect_error(tab[-3:3], "Selections can't have negative value") # From tidyselect
 expect_error(tab[1000]) # This is caught in vctrs, assert more specifically when it stabilizes
 expect_error(tab[1:1000]) # same as ^
 expect_error(tab[-3:3], "Invalid column index")
 expect_error(tab[1000], "Invalid column index")
 expect_error(tab[1:1000], "Invalid column index")

 skip("Table with 0 cols doesn't know how many rows it should have")
 expect_data_frame(tab[0], tbl[0])
Expand DownExpand Up@@ -349,3 +349,12 @@ test_that("Table unifies dictionary on conversion back to R (ARROW-8374)", {

 expect_identical(as.data.frame(tab), res)
})

test_that("Table$SelectColumns()", {
 tab <- Table$create(x = 1:10, y = 1:10)

 expect_equal(tab$SelectColumns(0L), Table$create(x = 1:10))

 expect_error(tab$SelectColumns(2:4))
 expect_error(tab$SelectColumns(""))
})

, '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-9387: [R] Use new C++ table select method#8125

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

romainfrancois
wants to merge
5
commits into

from

 Closed


ARROW-9387: [R] Use new C++ table select method
#8125
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7dec4ed

+ Table$SelectColumns()


romainfrancois Sep 7, 2020
ab4dd81

RecordBatch and Table gets $SelectColumns()


romainfrancois Sep 11, 2020
3668ad5

$SelectColumns() only supporting 0-based integers, but [ support R st…


romainfrancois Sep 11, 2020
0686538

Allow column selection by negative indices


nealrichardson Sep 11, 2020
d60683d

Update test


nealrichardson Sep 11, 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


8 changes: 4 additions & 4 deletions
r/R/arrowExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


7 changes: 6 additions & 1 deletion
r/R/csv.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,12 @@ read_delim_arrow <- function(file,
 convert_options = convert_options
 )

 tab <- reader$Read()$select(!!enquo(col_select))
 tab <- reader$Read()

 col_select <- enquo(col_select)
 if (!quo_is_null(col_select)) {
 tab <- tab[vars_select(names(tab), !!col_select)]
 }

 if (isTRUE(as_data_frame)) {
 tab <- as.data.frame(tab)
Expand Down

7 changes: 6 additions & 1 deletion
r/R/json.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,12 @@
#' df <- read_json_arrow(tf)
#' }
read_json_arrow <- function(file, col_select = NULL, as_data_frame = TRUE, ...) {
 tab <- JsonTableReader$create(file, ...)$Read()$select(!!enquo(col_select))
 tab <- JsonTableReader$create(file, ...)$Read()

 col_select <- enquo(col_select)
 if (!quo_is_null(col_select)) {
 tab <- tab[vars_select(names(tab), !!col_select)]
 }

 if (isTRUE(as_data_frame)) {
 tab <- as.data.frame(tab)
Expand Down

28 changes: 13 additions & 15 deletions
r/R/record-batch.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,7 @@
#' - `$names()`: Get all column names (called by `names(batch)`)
#' - `$GetColumnByName(name)`: Extract an `Array` by string name
#' - `$RemoveColumn(i)`: Drops a column from the batch by integer position
#' - `$select(spec)`: Return a new record batch with a selection of columns.
#' This supports the usual `character`, `numeric`, and `logical` selection
#' methods as well as "tidy select" expressions.
#' - `$selectColumns(indices)`: Return a new record batch with a selection of columns, expressed as 0-based integers.
#' - `$Slice(offset, length = NULL)`: Create a zero-copy view starting at the
#' indicated integer offset and going for the given length, or to the end
#' of the table if `NULL`, the default.
Expand DownExpand Up@@ -84,21 +82,12 @@ RecordBatch <- R6Class("RecordBatch", inherit = ArrowObject,
 assert_that(is.string(name))
 shared_ptr(Array, RecordBatch__GetColumnByName(self, name))
 },
 select = function(spec) {
 spec <- enquo(spec)
 if (quo_is_null(spec)) {
 self
 } else {
 all_vars <- self$names()
 vars <- vars_select(all_vars, !!spec)
 indices <- match(vars, all_vars)
 shared_ptr(RecordBatch, RecordBatch__select(self, indices))
 }
 SelectColumns = function(indices) {
 shared_ptr(RecordBatch, RecordBatch__SelectColumns(self, indices))
 },
 RemoveColumn = function(i){
 shared_ptr(RecordBatch, RecordBatch__RemoveColumn(self, i))
 },

 Slice = function(offset, length = NULL) {
 if (is.null(length)) {
 shared_ptr(RecordBatch, RecordBatch__Slice1(self, offset))
Expand DownExpand Up@@ -218,7 +207,16 @@ names.RecordBatch <- function(x) x$names()
 if (!missing(j)) {
 # Selecting columns is cheaper than filtering rows, so do it first.
 # That way, if we're filtering too, we have fewer arrays to filter/slice/take
 x <- x$select(j)
 if (is_integerish(j)) {
 if (all(j < 0)) {
 # in R, negative j means "everything but j"
 j <- setdiff(seq_len(x$num_columns), -1 * j)
 }
 x <- x$SelectColumns(as.integer(j) - 1L)
Comment thread
nealrichardson marked this conversation as resolved.

 } else if (is.character(j)) {
 x <- x$SelectColumns(match(j, names(x)) - 1L)
 }

 if (drop && ncol(x) == 1L) {
 x <- x$column(0)
 }
Expand Down

16 changes: 3 additions & 13 deletions
r/R/table.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,7 @@
#' - `$ColumnNames()`: Get all column names (called by `names(tab)`)
#' - `$GetColumnByName(name)`: Extract a `ChunkedArray` by string name
#' - `$field(i)`: Extract a `Field` from the table schema by integer position
#' - `$select(spec)`: Return a new table with a selection of columns.
#' This supports the usual `character`, `numeric`, and `logical` selection
#' methods as well as "tidy select" expressions.
#' - `$SelectColumns(indices)`: Return new `Table` with specified columns, expressed as 0-based integers.
#' - `$Slice(offset, length = NULL)`: Create a zero-copy view starting at the
#' indicated integer offset and going for the given length, or to the end
#' of the table if `NULL`, the default.
Expand DownExpand Up@@ -115,16 +113,8 @@ Table <- R6Class("Table", inherit = ArrowObject,
 shared_ptr(Table, Table__cast(self, target_schema, options))
 },

 select = function(spec) {
 spec <- enquo(spec)
 if (quo_is_null(spec)) {
 self
 } else {
 all_vars <- self$ColumnNames()
 vars <- vars_select(all_vars, !!spec)
 indices <- match(vars, all_vars)
 shared_ptr(Table, Table__select(self, indices))
 }
 SelectColumns = function(indices) {
 shared_ptr(Table, Table__SelectColumns(self, indices))
 },

 Slice = function(offset, length = NULL) {
Expand Down

5 changes: 2 additions & 3 deletions
r/man/RecordBatch.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


5 changes: 2 additions & 3 deletions
r/man/Table.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


26 changes: 13 additions & 13 deletions
r/src/arrowExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


4 changes: 2 additions & 2 deletions
r/src/recordbatch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ std::shared_ptr<arrow::Array> RecordBatch__GetColumnByName(
}

// [[arrow::export]]
std::shared_ptr<arrow::RecordBatch> RecordBatch__select(
std::shared_ptr<arrow::RecordBatch> RecordBatch__SelectColumns(
 const std::shared_ptr<arrow::RecordBatch>& batch, cpp11::integers indices) {
 R_xlen_t n = indices.size();
 auto nrows = batch->num_rows();
Expand All@@ -86,7 +86,7 @@ std::shared_ptr<arrow::RecordBatch> RecordBatch__select(
 std::vector<std::shared_ptr<arrow::Array>> columns(n);

 for (R_xlen_t i = 0; i < n; i++) {
 int pos = indices[i] - 1;
 int pos = indices[i];
 fields[i] = batch->schema()->field(pos);
 columns[i] = batch->column(pos);
 }
Expand Down

18 changes: 3 additions & 15 deletions
r/src/table.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,21 +115,9 @@ std::shared_ptr<arrow::ChunkedArray> Table__GetColumnByName(
}

// [[arrow::export]]
std::shared_ptr<arrow::Table> Table__select(const std::shared_ptr<arrow::Table>& table,
 cpp11::integers indices) {
 R_xlen_t n = indices.size();

 std::vector<std::shared_ptr<arrow::Field>> fields(n);
 std::vector<std::shared_ptr<arrow::ChunkedArray>> columns(n);

 for (R_xlen_t i = 0; i < n; i++) {
 int pos = indices[i] - 1;
 fields[i] = table->schema()->field(pos);
 columns[i] = table->column(pos);
 }

 auto schema = std::make_shared<arrow::Schema>(std::move(fields));
 return arrow::Table::Make(schema, columns);
std::shared_ptr<arrow::Table> Table__SelectColumns(
 const std::shared_ptr<arrow::Table>& table, const std::vector<int>& indices) {
 return ValueOrStop(table->SelectColumns(indices));
}

namespace arrow {
Expand Down

19 changes: 14 additions & 5 deletions
r/tests/testthat/test-Table.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,16 +130,16 @@ test_that("[, [[, $ for Table", {
 expect_null(tab[["asdf"]])
 # List-like column slicing
 expect_data_frame(tab[2:4], tbl[2:4])
 expect_data_frame(tab[c(1, 0)], tbl[c(1, 0)])
 expect_data_frame(tab[c(2, 1)], tbl[c(2, 1)])
@nealrichardsonnealrichardsonSep 11, 2020

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.

Should we maintain the base R behavior for subsetting on column 0 (it is ignored)? I can't imagine why someone would do such a thing on purpose.
 expect_data_frame(tab[-3], tbl[-3])

 expect_error(tab[[c(4, 3)]])
 expect_error(tab[[NA]], "'i' must be character or numeric, not logical")
 expect_error(tab[[NULL]], "'i' must be character or numeric, not NULL")
 expect_error(tab[[c("asdf", "jkl;")]], 'length(name) not equal to 1', fixed = TRUE)
 expect_error(tab[-3], "Selections can't have negative value") # From tidyselect
 expect_error(tab[-3:3], "Selections can't have negative value") # From tidyselect
 expect_error(tab[1000]) # This is caught in vctrs, assert more specifically when it stabilizes
 expect_error(tab[1:1000]) # same as ^
 expect_error(tab[-3:3], "Invalid column index")
 expect_error(tab[1000], "Invalid column index")
 expect_error(tab[1:1000], "Invalid column index")

 skip("Table with 0 cols doesn't know how many rows it should have")
 expect_data_frame(tab[0], tbl[0])
Expand DownExpand Up@@ -349,3 +349,12 @@ test_that("Table unifies dictionary on conversion back to R (ARROW-8374)", {

 expect_identical(as.data.frame(tab), res)
})

test_that("Table$SelectColumns()", {
 tab <- Table$create(x = 1:10, y = 1:10)

 expect_equal(tab$SelectColumns(0L), Table$create(x = 1:10))

 expect_error(tab$SelectColumns(2:4))
 expect_error(tab$SelectColumns(""))
})