ianmcook commented on a change in pull request #9745:
URL: https://github.com/apache/arrow/pull/9745#discussion_r600110657
##########
File path: r/R/dplyr.R
##########
@@ -631,17 +671,85 @@ abandon_ship <- function(call, .data, msg = NULL) {
eval.parent(call, 2)
}
-arrange.arrow_dplyr_query <- function(.data, ...) {
+arrange.arrow_dplyr_query <- function(.data, ..., .by_group = FALSE) {
+ call <- match.call()
+ exprs <- quos(...)
+ if (.by_group) {
+ exprs <- c(quos(!!!dplyr::groups(.data)), exprs)
+ }
+ if (length(exprs) == 0) {
+ # Nothing to do
+ return(.data)
+ }
.data <- arrow_dplyr_query(.data)
if (query_on_dataset(.data)) {
not_implemented_for_dataset("arrange()")
}
- # TODO(ARROW-11703) move this to Arrow
- call <- match.call()
- abandon_ship(call, .data)
+ is_dataset <- query_on_dataset(.data)
+ if (is_dataset) {
+ return(abandon_ship(call, .data))
+ }
+ # find and remove any dplyr::desc() and tidy-eval
+ # the arrange expressions inside an Arrow data_mask
+ sorts <- vector("list", length(exprs))
+ descs <- logical(0)
+ mask <- arrow_mask(.data)
+ for (i in seq_along(exprs)) {
+ x <- find_and_remove_desc(exprs[[i]])
+ exprs[[i]] <- x[["quos"]]
+ sorts[[i]] <- arrow_eval(exprs[[i]], mask)
+ if (inherits(sorts[[i]], "try-error")) {
+ msg <- paste('Expression', as_label(exprs[[i]]), 'not supported in
Arrow')
+ return(abandon_ship(call, .data, msg))
+ }
+ names(sorts)[i] <- tryCatch(
Review comment:
I dug into this more and found that there's no need to try `as_name`
first. `as_label` should work every time. Changed in
832f3c7102a3fa5f46886544873e7d526cafc5fb.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
