ARROW-14199 [R] bindings for format (where possible)#12319

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
dragosmg wants to merge 26 commits into from
Closed

ARROW-14199 [R] bindings for format (where possible) #12319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
db29c42
first pass at implementing `format()` for date-time
dragosmg Jan 25, 2022
cb162d9
`arrow::format()` uses object timezone if available
dragosmg Feb 3, 2022
fb67975
lint
dragosmg Feb 3, 2022
a7707c2
`format()` dispatch for `Timestamp` and `Date32` types
dragosmg Feb 3, 2022
f5f199a
create helper function for date/time format
dragosmg Feb 3, 2022
3e09b5c
moved format date/time and helper (+tests) to dplyr-funcs-type
dragosmg Feb 3, 2022
def79dc
remove arg check
dragosmg Feb 3, 2022
46ee180
testing abandon ship for unsupported types
dragosmg Feb 3, 2022
976e172
improve `format()` abort message
dragosmg Feb 3, 2022
1bbcdac
improve test description
dragosmg Feb 3, 2022
cf514eb
use `"Etc/GMT+6"` as unlikely unit test
dragosmg Feb 4, 2022
f8c2ed2
test on windows too
dragosmg Feb 4, 2022
2ae6249
skip on win
dragosmg Feb 4, 2022
40e1914
moved `binding_format_datetime()` to dplyr-funcs-datetime.R
dragosmg Feb 17, 2022
f771682
cast as string for unsupported formats + update unit tests
dragosmg Feb 17, 2022
5411458
without casting
dragosmg Feb 17, 2022
8859ebb
with casting
dragosmg Feb 17, 2022
03eb111
added TODO to revisit the casting step once #12240 is merged
dragosmg Feb 23, 2022
09d99b4
used `build_expr()` and simplified the implementation
dragosmg Mar 3, 2022
8ecf37a
typo
dragosmg Mar 3, 2022
c0688e1
:)
dragosmg Mar 3, 2022
c118700
changed one test to use `arrow_table()`
dragosmg Mar 5, 2022
a6c0b19
updated the `format()` binding to use `build_expr()`
dragosmg Mar 5, 2022
7878b37
keep dispatch for regular R objects in and add a unit test for `forma…
dragosmg Mar 5, 2022
ce5a0c1
additional unit test with regular R object
dragosmg Mar 8, 2022
9668f01
removed unevaluated args and added comment on why we use `base::forma…
dragosmg Mar 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions r/R/dplyr-funcs-datetime.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -168,3 +168,23 @@ register_bindings_datetime <- function() {
build_expr("cast", x, options = list(to_type = date32()))
})
}

binding_format_datetime <- function(x, format = "", tz = "", usetz = FALSE) {
if (usetz) {
format <- paste(format, "%Z")
}

if (call_binding("is.POSIXct", x)) {
# the casting part might not be required once
# https://issues.apache.org/jira/browse/ARROW-14442 is solved
# TODO revisit the steps below once the PR for that issue is merged
if (tz == "" && x$type()$timezone() != "") {
tz <- x$type()$timezone()
Comment thread
dragosmg marked this conversation as resolved.
} else if (tz == "") {
tz <- Sys.timezone()
}
Comment thread
dragosmg marked this conversation as resolved.
Outdated
x <- build_expr("cast", x, options = cast_options(to_type = timestamp(x$type()$unit(), tz)))
}

build_expr("strftime", x, options = list(format = format, locale = Sys.getlocale("LC_TIME")))
}
18 changes: 18 additions & 0 deletions r/R/dplyr-funcs-type.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ register_bindings_type <- function() {
register_bindings_type_cast()
register_bindings_type_inspect()
register_bindings_type_elementwise()
register_bindings_type_format()
}

register_bindings_type_cast <- function() {
Expand DownExpand Up@@ -292,3 +293,20 @@ register_bindings_type_elementwise <- function() {
is_inf & !call_binding("is.na", is_inf)
})
}

register_bindings_type_format <- function() {
register_binding("format", function(x, ...) {
# We use R's format if we get a single R object here since we don't (yet)
# support all of the possible options for casting to string
if (!inherits(x, "Expression")) {
return(format(x, ...))
}
Comment thread
dragosmg marked this conversation as resolved.

if (inherits(x, "Expression") &&
Comment thread
dragosmg marked this conversation as resolved.
Outdated
x$type_id() %in% Type[c("TIMESTAMP", "DATE32", "DATE64")]) {
binding_format_datetime(x, ...)
} else {
build_expr("cast", x, options = cast_options(to_type = string()))
}
})
}
102 changes: 102 additions & 0 deletions r/tests/testthat/test-dplyr-funcs-type.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -843,3 +843,105 @@ test_that("as.Date() converts successfully from date, timestamp, integer, char a
test_df
)
})

test_that("format date/time", {
skip_on_os("windows") # https://issues.apache.org/jira/browse/ARROW-13168

times <- tibble(
datetime = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Pacific/Marquesas"), NA),
date = c(as.Date("2021-01-01"), NA)
)
formats <- "%a %A %w %d %b %B %m %y %Y %H %I %p %M %z %Z %j %U %W %x %X %% %G %V %u"
formats_date <- "%a %A %w %d %b %B %m %y %Y %H %I %p %M %j %U %W %x %X %% %G %V %u"

compare_dplyr_binding(
.input %>%
mutate(x = format(datetime, format = formats)) %>%
collect(),
times
)

compare_dplyr_binding(
.input %>%
mutate(x = format(date, format = formats_date)) %>%
collect(),
times
)

compare_dplyr_binding(
.input %>%
mutate(x = format(datetime, format = formats, tz = "Europe/Bucharest")) %>%
collect(),
times
)

compare_dplyr_binding(
.input %>%
mutate(x = format(datetime, format = formats, tz = "EST", usetz = TRUE)) %>%
Comment thread
dragosmg marked this conversation as resolved.
Outdated
collect(),
times
)

compare_dplyr_binding(
.input %>%
mutate(x = format(1),
y = format(13.7, nsmall = 3)) %>%
collect(),
times
)

compare_dplyr_binding(
.input %>%
mutate(start_date = format(as.POSIXct("2022-01-01 01:01:00"))) %>%
collect(),
times
)

withr::with_timezone(
"Pacific/Marquesas",
{
compare_dplyr_binding(
.input %>%
mutate(
x = format(datetime, format = formats, tz = "EST"),
x_date = format(date, format = formats_date, tz = "EST")
) %>%
collect(),
times
)

compare_dplyr_binding(
.input %>%
mutate(
x = format(datetime, format = formats),
x_date = format(date, format = formats_date)
) %>%
collect(),
times
)
}
)
})
Comment thread
dragosmg marked this conversation as resolved.

test_that("format() for unsupported types returns the input as string", {
expect_equal(
example_data %>%
record_batch() %>%
mutate(x = format(int)) %>%
collect(),
example_data %>%
record_batch() %>%
mutate(x = as.character(int)) %>%
collect()
)
expect_equal(
example_data %>%
arrow_table() %>%
mutate(y = format(dbl)) %>%
collect(),
example_data %>%
arrow_table() %>%
mutate(y = as.character(dbl)) %>%
collect()
)
})
, '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-14199 [R] bindings for format (where possible)#12319

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

dragosmg
wants to merge
26
commits into

from

 Closed


ARROW-14199 [R] bindings for format (where possible)
#12319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
db29c42

first pass at implementing `format()` for date-time


dragosmg Jan 25, 2022
cb162d9

`arrow::format()` uses object timezone if available


dragosmg Feb 3, 2022
fb67975

lint


dragosmg Feb 3, 2022
a7707c2

`format()` dispatch for `Timestamp` and `Date32` types


dragosmg Feb 3, 2022
f5f199a

create helper function for date/time format


dragosmg Feb 3, 2022
3e09b5c

moved format date/time and helper (+tests) to dplyr-funcs-type


dragosmg Feb 3, 2022
def79dc

remove arg check


dragosmg Feb 3, 2022
46ee180

testing abandon ship for unsupported types


dragosmg Feb 3, 2022
976e172

improve `format()` abort message


dragosmg Feb 3, 2022
1bbcdac

improve test description


dragosmg Feb 3, 2022
cf514eb

use `"Etc/GMT+6"` as unlikely unit test


dragosmg Feb 4, 2022
f8c2ed2

test on windows too


dragosmg Feb 4, 2022
2ae6249

skip on win


dragosmg Feb 4, 2022
40e1914

moved `binding_format_datetime()` to dplyr-funcs-datetime.R


dragosmg Feb 17, 2022
f771682

cast as string for unsupported formats + update unit tests


dragosmg Feb 17, 2022
5411458

without casting


dragosmg Feb 17, 2022
8859ebb

with casting


dragosmg Feb 17, 2022
03eb111

added TODO to revisit the casting step once #12240 is merged


dragosmg Feb 23, 2022
09d99b4

used `build_expr()` and simplified the implementation


dragosmg Mar 3, 2022
8ecf37a

typo


dragosmg Mar 3, 2022
c0688e1

:)


dragosmg Mar 3, 2022
c118700

changed one test to use `arrow_table()`


dragosmg Mar 5, 2022
a6c0b19

updated the `format()` binding to use `build_expr()`


dragosmg Mar 5, 2022
7878b37

keep dispatch for regular R objects in and add a unit test for `forma…


dragosmg Mar 5, 2022
ce5a0c1

additional unit test with regular R object


dragosmg Mar 8, 2022
9668f01

removed unevaluated args and added comment on why we use `base::forma…


dragosmg Mar 9, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 20 additions & 0 deletions
r/R/dplyr-funcs-datetime.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,3 +168,23 @@ register_bindings_datetime <- function() {
 build_expr("cast", x, options = list(to_type = date32()))
 })
}

binding_format_datetime <- function(x, format = "", tz = "", usetz = FALSE) {
 if (usetz) {
 format <- paste(format, "%Z")
 }

 if (call_binding("is.POSIXct", x)) {
 # the casting part might not be required once
 # https://issues.apache.org/jira/browse/ARROW-14442 is solved
 # TODO revisit the steps below once the PR for that issue is merged
 if (tz == "" && x$type()$timezone() != "") {
 tz <- x$type()$timezone()
Comment thread
dragosmg marked this conversation as resolved.

 } else if (tz == "") {
 tz <- Sys.timezone()
 }
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 x <- build_expr("cast", x, options = cast_options(to_type = timestamp(x$type()$unit(), tz)))
 }

 build_expr("strftime", x, options = list(format = format, locale = Sys.getlocale("LC_TIME")))
}

18 changes: 18 additions & 0 deletions
r/R/dplyr-funcs-type.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ register_bindings_type <- function() {
 register_bindings_type_cast()
 register_bindings_type_inspect()
 register_bindings_type_elementwise()
 register_bindings_type_format()
}

register_bindings_type_cast <- function() {
Expand DownExpand Up@@ -292,3 +293,20 @@ register_bindings_type_elementwise <- function() {
 is_inf & !call_binding("is.na", is_inf)
 })
}

register_bindings_type_format <- function() {
 register_binding("format", function(x, ...) {
 # We use R's format if we get a single R object here since we don't (yet)
 # support all of the possible options for casting to string
 if (!inherits(x, "Expression")) {
 return(format(x, ...))
 }
Comment thread
dragosmg marked this conversation as resolved.


 if (inherits(x, "Expression") &&
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 x$type_id() %in% Type[c("TIMESTAMP", "DATE32", "DATE64")]) {
 binding_format_datetime(x, ...)
 } else {
 build_expr("cast", x, options = cast_options(to_type = string()))
 }
 })
}

102 changes: 102 additions & 0 deletions
r/tests/testthat/test-dplyr-funcs-type.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -843,3 +843,105 @@ test_that("as.Date() converts successfully from date, timestamp, integer, char a
 test_df
 )
})

test_that("format date/time", {
 skip_on_os("windows") # https://issues.apache.org/jira/browse/ARROW-13168

 times <- tibble(
 datetime = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Pacific/Marquesas"), NA),
 date = c(as.Date("2021-01-01"), NA)
 )
 formats <- "%a %A %w %d %b %B %m %y %Y %H %I %p %M %z %Z %j %U %W %x %X %% %G %V %u"
 formats_date <- "%a %A %w %d %b %B %m %y %Y %H %I %p %M %j %U %W %x %X %% %G %V %u"

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(date, format = formats_date)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats, tz = "Europe/Bucharest")) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats, tz = "EST", usetz = TRUE)) %>%
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(1),
 y = format(13.7, nsmall = 3)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(start_date = format(as.POSIXct("2022-01-01 01:01:00"))) %>%
 collect(),
 times
 )

 withr::with_timezone(
 "Pacific/Marquesas",
 {
 compare_dplyr_binding(
 .input %>%
 mutate(
 x = format(datetime, format = formats, tz = "EST"),
 x_date = format(date, format = formats_date, tz = "EST")
 ) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(
 x = format(datetime, format = formats),
 x_date = format(date, format = formats_date)
 ) %>%
 collect(),
 times
 )
 }
 )
})
Comment thread
dragosmg marked this conversation as resolved.


test_that("format() for unsupported types returns the input as string", {
 expect_equal(
 example_data %>%
 record_batch() %>%
 mutate(x = format(int)) %>%
 collect(),
 example_data %>%
 record_batch() %>%
 mutate(x = as.character(int)) %>%
 collect()
 )
 expect_equal(
 example_data %>%
 arrow_table() %>%
 mutate(y = format(dbl)) %>%
 collect(),
 example_data %>%
 arrow_table() %>%
 mutate(y = as.character(dbl)) %>%
 collect()
 )
})

, '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-14199 [R] bindings for format (where possible)#12319

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

dragosmg
wants to merge
26
commits into

from

 Closed


ARROW-14199 [R] bindings for format (where possible)
#12319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
db29c42

first pass at implementing `format()` for date-time


dragosmg Jan 25, 2022
cb162d9

`arrow::format()` uses object timezone if available


dragosmg Feb 3, 2022
fb67975

lint


dragosmg Feb 3, 2022
a7707c2

`format()` dispatch for `Timestamp` and `Date32` types


dragosmg Feb 3, 2022
f5f199a

create helper function for date/time format


dragosmg Feb 3, 2022
3e09b5c

moved format date/time and helper (+tests) to dplyr-funcs-type


dragosmg Feb 3, 2022
def79dc

remove arg check


dragosmg Feb 3, 2022
46ee180

testing abandon ship for unsupported types


dragosmg Feb 3, 2022
976e172

improve `format()` abort message


dragosmg Feb 3, 2022
1bbcdac

improve test description


dragosmg Feb 3, 2022
cf514eb

use `"Etc/GMT+6"` as unlikely unit test


dragosmg Feb 4, 2022
f8c2ed2

test on windows too


dragosmg Feb 4, 2022
2ae6249

skip on win


dragosmg Feb 4, 2022
40e1914

moved `binding_format_datetime()` to dplyr-funcs-datetime.R


dragosmg Feb 17, 2022
f771682

cast as string for unsupported formats + update unit tests


dragosmg Feb 17, 2022
5411458

without casting


dragosmg Feb 17, 2022
8859ebb

with casting


dragosmg Feb 17, 2022
03eb111

added TODO to revisit the casting step once #12240 is merged


dragosmg Feb 23, 2022
09d99b4

used `build_expr()` and simplified the implementation


dragosmg Mar 3, 2022
8ecf37a

typo


dragosmg Mar 3, 2022
c0688e1

:)


dragosmg Mar 3, 2022
c118700

changed one test to use `arrow_table()`


dragosmg Mar 5, 2022
a6c0b19

updated the `format()` binding to use `build_expr()`


dragosmg Mar 5, 2022
7878b37

keep dispatch for regular R objects in and add a unit test for `forma…


dragosmg Mar 5, 2022
ce5a0c1

additional unit test with regular R object


dragosmg Mar 8, 2022
9668f01

removed unevaluated args and added comment on why we use `base::forma…


dragosmg Mar 9, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 20 additions & 0 deletions
r/R/dplyr-funcs-datetime.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,3 +168,23 @@ register_bindings_datetime <- function() {
 build_expr("cast", x, options = list(to_type = date32()))
 })
}

binding_format_datetime <- function(x, format = "", tz = "", usetz = FALSE) {
 if (usetz) {
 format <- paste(format, "%Z")
 }

 if (call_binding("is.POSIXct", x)) {
 # the casting part might not be required once
 # https://issues.apache.org/jira/browse/ARROW-14442 is solved
 # TODO revisit the steps below once the PR for that issue is merged
 if (tz == "" && x$type()$timezone() != "") {
 tz <- x$type()$timezone()
Comment thread
dragosmg marked this conversation as resolved.

 } else if (tz == "") {
 tz <- Sys.timezone()
 }
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 x <- build_expr("cast", x, options = cast_options(to_type = timestamp(x$type()$unit(), tz)))
 }

 build_expr("strftime", x, options = list(format = format, locale = Sys.getlocale("LC_TIME")))
}

18 changes: 18 additions & 0 deletions
r/R/dplyr-funcs-type.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ register_bindings_type <- function() {
 register_bindings_type_cast()
 register_bindings_type_inspect()
 register_bindings_type_elementwise()
 register_bindings_type_format()
}

register_bindings_type_cast <- function() {
Expand DownExpand Up@@ -292,3 +293,20 @@ register_bindings_type_elementwise <- function() {
 is_inf & !call_binding("is.na", is_inf)
 })
}

register_bindings_type_format <- function() {
 register_binding("format", function(x, ...) {
 # We use R's format if we get a single R object here since we don't (yet)
 # support all of the possible options for casting to string
 if (!inherits(x, "Expression")) {
 return(format(x, ...))
 }
Comment thread
dragosmg marked this conversation as resolved.


 if (inherits(x, "Expression") &&
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 x$type_id() %in% Type[c("TIMESTAMP", "DATE32", "DATE64")]) {
 binding_format_datetime(x, ...)
 } else {
 build_expr("cast", x, options = cast_options(to_type = string()))
 }
 })
}

102 changes: 102 additions & 0 deletions
r/tests/testthat/test-dplyr-funcs-type.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -843,3 +843,105 @@ test_that("as.Date() converts successfully from date, timestamp, integer, char a
 test_df
 )
})

test_that("format date/time", {
 skip_on_os("windows") # https://issues.apache.org/jira/browse/ARROW-13168

 times <- tibble(
 datetime = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Pacific/Marquesas"), NA),
 date = c(as.Date("2021-01-01"), NA)
 )
 formats <- "%a %A %w %d %b %B %m %y %Y %H %I %p %M %z %Z %j %U %W %x %X %% %G %V %u"
 formats_date <- "%a %A %w %d %b %B %m %y %Y %H %I %p %M %j %U %W %x %X %% %G %V %u"

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(date, format = formats_date)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats, tz = "Europe/Bucharest")) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats, tz = "EST", usetz = TRUE)) %>%
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(1),
 y = format(13.7, nsmall = 3)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(start_date = format(as.POSIXct("2022-01-01 01:01:00"))) %>%
 collect(),
 times
 )

 withr::with_timezone(
 "Pacific/Marquesas",
 {
 compare_dplyr_binding(
 .input %>%
 mutate(
 x = format(datetime, format = formats, tz = "EST"),
 x_date = format(date, format = formats_date, tz = "EST")
 ) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(
 x = format(datetime, format = formats),
 x_date = format(date, format = formats_date)
 ) %>%
 collect(),
 times
 )
 }
 )
})
Comment thread
dragosmg marked this conversation as resolved.


test_that("format() for unsupported types returns the input as string", {
 expect_equal(
 example_data %>%
 record_batch() %>%
 mutate(x = format(int)) %>%
 collect(),
 example_data %>%
 record_batch() %>%
 mutate(x = as.character(int)) %>%
 collect()
 )
 expect_equal(
 example_data %>%
 arrow_table() %>%
 mutate(y = format(dbl)) %>%
 collect(),
 example_data %>%
 arrow_table() %>%
 mutate(y = as.character(dbl)) %>%
 collect()
 )
})

, '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-14199 [R] bindings for format (where possible)#12319

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

dragosmg
wants to merge
26
commits into

from

 Closed


ARROW-14199 [R] bindings for format (where possible)
#12319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
db29c42

first pass at implementing `format()` for date-time


dragosmg Jan 25, 2022
cb162d9

`arrow::format()` uses object timezone if available


dragosmg Feb 3, 2022
fb67975

lint


dragosmg Feb 3, 2022
a7707c2

`format()` dispatch for `Timestamp` and `Date32` types


dragosmg Feb 3, 2022
f5f199a

create helper function for date/time format


dragosmg Feb 3, 2022
3e09b5c

moved format date/time and helper (+tests) to dplyr-funcs-type


dragosmg Feb 3, 2022
def79dc

remove arg check


dragosmg Feb 3, 2022
46ee180

testing abandon ship for unsupported types


dragosmg Feb 3, 2022
976e172

improve `format()` abort message


dragosmg Feb 3, 2022
1bbcdac

improve test description


dragosmg Feb 3, 2022
cf514eb

use `"Etc/GMT+6"` as unlikely unit test


dragosmg Feb 4, 2022
f8c2ed2

test on windows too


dragosmg Feb 4, 2022
2ae6249

skip on win


dragosmg Feb 4, 2022
40e1914

moved `binding_format_datetime()` to dplyr-funcs-datetime.R


dragosmg Feb 17, 2022
f771682

cast as string for unsupported formats + update unit tests


dragosmg Feb 17, 2022
5411458

without casting


dragosmg Feb 17, 2022
8859ebb

with casting


dragosmg Feb 17, 2022
03eb111

added TODO to revisit the casting step once #12240 is merged


dragosmg Feb 23, 2022
09d99b4

used `build_expr()` and simplified the implementation


dragosmg Mar 3, 2022
8ecf37a

typo


dragosmg Mar 3, 2022
c0688e1

:)


dragosmg Mar 3, 2022
c118700

changed one test to use `arrow_table()`


dragosmg Mar 5, 2022
a6c0b19

updated the `format()` binding to use `build_expr()`


dragosmg Mar 5, 2022
7878b37

keep dispatch for regular R objects in and add a unit test for `forma…


dragosmg Mar 5, 2022
ce5a0c1

additional unit test with regular R object


dragosmg Mar 8, 2022
9668f01

removed unevaluated args and added comment on why we use `base::forma…


dragosmg Mar 9, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 20 additions & 0 deletions
r/R/dplyr-funcs-datetime.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,3 +168,23 @@ register_bindings_datetime <- function() {
 build_expr("cast", x, options = list(to_type = date32()))
 })
}

binding_format_datetime <- function(x, format = "", tz = "", usetz = FALSE) {
 if (usetz) {
 format <- paste(format, "%Z")
 }

 if (call_binding("is.POSIXct", x)) {
 # the casting part might not be required once
 # https://issues.apache.org/jira/browse/ARROW-14442 is solved
 # TODO revisit the steps below once the PR for that issue is merged
 if (tz == "" && x$type()$timezone() != "") {
 tz <- x$type()$timezone()
Comment thread
dragosmg marked this conversation as resolved.

 } else if (tz == "") {
 tz <- Sys.timezone()
 }
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 x <- build_expr("cast", x, options = cast_options(to_type = timestamp(x$type()$unit(), tz)))
 }

 build_expr("strftime", x, options = list(format = format, locale = Sys.getlocale("LC_TIME")))
}

18 changes: 18 additions & 0 deletions
r/R/dplyr-funcs-type.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ register_bindings_type <- function() {
 register_bindings_type_cast()
 register_bindings_type_inspect()
 register_bindings_type_elementwise()
 register_bindings_type_format()
}

register_bindings_type_cast <- function() {
Expand DownExpand Up@@ -292,3 +293,20 @@ register_bindings_type_elementwise <- function() {
 is_inf & !call_binding("is.na", is_inf)
 })
}

register_bindings_type_format <- function() {
 register_binding("format", function(x, ...) {
 # We use R's format if we get a single R object here since we don't (yet)
 # support all of the possible options for casting to string
 if (!inherits(x, "Expression")) {
 return(format(x, ...))
 }
Comment thread
dragosmg marked this conversation as resolved.


 if (inherits(x, "Expression") &&
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 x$type_id() %in% Type[c("TIMESTAMP", "DATE32", "DATE64")]) {
 binding_format_datetime(x, ...)
 } else {
 build_expr("cast", x, options = cast_options(to_type = string()))
 }
 })
}

102 changes: 102 additions & 0 deletions
r/tests/testthat/test-dplyr-funcs-type.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -843,3 +843,105 @@ test_that("as.Date() converts successfully from date, timestamp, integer, char a
 test_df
 )
})

test_that("format date/time", {
 skip_on_os("windows") # https://issues.apache.org/jira/browse/ARROW-13168

 times <- tibble(
 datetime = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Pacific/Marquesas"), NA),
 date = c(as.Date("2021-01-01"), NA)
 )
 formats <- "%a %A %w %d %b %B %m %y %Y %H %I %p %M %z %Z %j %U %W %x %X %% %G %V %u"
 formats_date <- "%a %A %w %d %b %B %m %y %Y %H %I %p %M %j %U %W %x %X %% %G %V %u"

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(date, format = formats_date)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats, tz = "Europe/Bucharest")) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats, tz = "EST", usetz = TRUE)) %>%
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(1),
 y = format(13.7, nsmall = 3)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(start_date = format(as.POSIXct("2022-01-01 01:01:00"))) %>%
 collect(),
 times
 )

 withr::with_timezone(
 "Pacific/Marquesas",
 {
 compare_dplyr_binding(
 .input %>%
 mutate(
 x = format(datetime, format = formats, tz = "EST"),
 x_date = format(date, format = formats_date, tz = "EST")
 ) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(
 x = format(datetime, format = formats),
 x_date = format(date, format = formats_date)
 ) %>%
 collect(),
 times
 )
 }
 )
})
Comment thread
dragosmg marked this conversation as resolved.


test_that("format() for unsupported types returns the input as string", {
 expect_equal(
 example_data %>%
 record_batch() %>%
 mutate(x = format(int)) %>%
 collect(),
 example_data %>%
 record_batch() %>%
 mutate(x = as.character(int)) %>%
 collect()
 )
 expect_equal(
 example_data %>%
 arrow_table() %>%
 mutate(y = format(dbl)) %>%
 collect(),
 example_data %>%
 arrow_table() %>%
 mutate(y = as.character(dbl)) %>%
 collect()
 )
})

, '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-14199 [R] bindings for format (where possible)#12319

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

dragosmg
wants to merge
26
commits into

from

 Closed


ARROW-14199 [R] bindings for format (where possible)
#12319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
db29c42

first pass at implementing `format()` for date-time


dragosmg Jan 25, 2022
cb162d9

`arrow::format()` uses object timezone if available


dragosmg Feb 3, 2022
fb67975

lint


dragosmg Feb 3, 2022
a7707c2

`format()` dispatch for `Timestamp` and `Date32` types


dragosmg Feb 3, 2022
f5f199a

create helper function for date/time format


dragosmg Feb 3, 2022
3e09b5c

moved format date/time and helper (+tests) to dplyr-funcs-type


dragosmg Feb 3, 2022
def79dc

remove arg check


dragosmg Feb 3, 2022
46ee180

testing abandon ship for unsupported types


dragosmg Feb 3, 2022
976e172

improve `format()` abort message


dragosmg Feb 3, 2022
1bbcdac

improve test description


dragosmg Feb 3, 2022
cf514eb

use `"Etc/GMT+6"` as unlikely unit test


dragosmg Feb 4, 2022
f8c2ed2

test on windows too


dragosmg Feb 4, 2022
2ae6249

skip on win


dragosmg Feb 4, 2022
40e1914

moved `binding_format_datetime()` to dplyr-funcs-datetime.R


dragosmg Feb 17, 2022
f771682

cast as string for unsupported formats + update unit tests


dragosmg Feb 17, 2022
5411458

without casting


dragosmg Feb 17, 2022
8859ebb

with casting


dragosmg Feb 17, 2022
03eb111

added TODO to revisit the casting step once #12240 is merged


dragosmg Feb 23, 2022
09d99b4

used `build_expr()` and simplified the implementation


dragosmg Mar 3, 2022
8ecf37a

typo


dragosmg Mar 3, 2022
c0688e1

:)


dragosmg Mar 3, 2022
c118700

changed one test to use `arrow_table()`


dragosmg Mar 5, 2022
a6c0b19

updated the `format()` binding to use `build_expr()`


dragosmg Mar 5, 2022
7878b37

keep dispatch for regular R objects in and add a unit test for `forma…


dragosmg Mar 5, 2022
ce5a0c1

additional unit test with regular R object


dragosmg Mar 8, 2022
9668f01

removed unevaluated args and added comment on why we use `base::forma…


dragosmg Mar 9, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 20 additions & 0 deletions
r/R/dplyr-funcs-datetime.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,3 +168,23 @@ register_bindings_datetime <- function() {
 build_expr("cast", x, options = list(to_type = date32()))
 })
}

binding_format_datetime <- function(x, format = "", tz = "", usetz = FALSE) {
 if (usetz) {
 format <- paste(format, "%Z")
 }

 if (call_binding("is.POSIXct", x)) {
 # the casting part might not be required once
 # https://issues.apache.org/jira/browse/ARROW-14442 is solved
 # TODO revisit the steps below once the PR for that issue is merged
 if (tz == "" && x$type()$timezone() != "") {
 tz <- x$type()$timezone()
Comment thread
dragosmg marked this conversation as resolved.

 } else if (tz == "") {
 tz <- Sys.timezone()
 }
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 x <- build_expr("cast", x, options = cast_options(to_type = timestamp(x$type()$unit(), tz)))
 }

 build_expr("strftime", x, options = list(format = format, locale = Sys.getlocale("LC_TIME")))
}

18 changes: 18 additions & 0 deletions
r/R/dplyr-funcs-type.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ register_bindings_type <- function() {
 register_bindings_type_cast()
 register_bindings_type_inspect()
 register_bindings_type_elementwise()
 register_bindings_type_format()
}

register_bindings_type_cast <- function() {
Expand DownExpand Up@@ -292,3 +293,20 @@ register_bindings_type_elementwise <- function() {
 is_inf & !call_binding("is.na", is_inf)
 })
}

register_bindings_type_format <- function() {
 register_binding("format", function(x, ...) {
 # We use R's format if we get a single R object here since we don't (yet)
 # support all of the possible options for casting to string
 if (!inherits(x, "Expression")) {
 return(format(x, ...))
 }
Comment thread
dragosmg marked this conversation as resolved.


 if (inherits(x, "Expression") &&
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 x$type_id() %in% Type[c("TIMESTAMP", "DATE32", "DATE64")]) {
 binding_format_datetime(x, ...)
 } else {
 build_expr("cast", x, options = cast_options(to_type = string()))
 }
 })
}

102 changes: 102 additions & 0 deletions
r/tests/testthat/test-dplyr-funcs-type.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -843,3 +843,105 @@ test_that("as.Date() converts successfully from date, timestamp, integer, char a
 test_df
 )
})

test_that("format date/time", {
 skip_on_os("windows") # https://issues.apache.org/jira/browse/ARROW-13168

 times <- tibble(
 datetime = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Pacific/Marquesas"), NA),
 date = c(as.Date("2021-01-01"), NA)
 )
 formats <- "%a %A %w %d %b %B %m %y %Y %H %I %p %M %z %Z %j %U %W %x %X %% %G %V %u"
 formats_date <- "%a %A %w %d %b %B %m %y %Y %H %I %p %M %j %U %W %x %X %% %G %V %u"

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(date, format = formats_date)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats, tz = "Europe/Bucharest")) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats, tz = "EST", usetz = TRUE)) %>%
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(1),
 y = format(13.7, nsmall = 3)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(start_date = format(as.POSIXct("2022-01-01 01:01:00"))) %>%
 collect(),
 times
 )

 withr::with_timezone(
 "Pacific/Marquesas",
 {
 compare_dplyr_binding(
 .input %>%
 mutate(
 x = format(datetime, format = formats, tz = "EST"),
 x_date = format(date, format = formats_date, tz = "EST")
 ) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(
 x = format(datetime, format = formats),
 x_date = format(date, format = formats_date)
 ) %>%
 collect(),
 times
 )
 }
 )
})
Comment thread
dragosmg marked this conversation as resolved.


test_that("format() for unsupported types returns the input as string", {
 expect_equal(
 example_data %>%
 record_batch() %>%
 mutate(x = format(int)) %>%
 collect(),
 example_data %>%
 record_batch() %>%
 mutate(x = as.character(int)) %>%
 collect()
 )
 expect_equal(
 example_data %>%
 arrow_table() %>%
 mutate(y = format(dbl)) %>%
 collect(),
 example_data %>%
 arrow_table() %>%
 mutate(y = as.character(dbl)) %>%
 collect()
 )
})

, '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-14199 [R] bindings for format (where possible)#12319

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

dragosmg
wants to merge
26
commits into

from

 Closed


ARROW-14199 [R] bindings for format (where possible)
#12319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
db29c42

first pass at implementing `format()` for date-time


dragosmg Jan 25, 2022
cb162d9

`arrow::format()` uses object timezone if available


dragosmg Feb 3, 2022
fb67975

lint


dragosmg Feb 3, 2022
a7707c2

`format()` dispatch for `Timestamp` and `Date32` types


dragosmg Feb 3, 2022
f5f199a

create helper function for date/time format


dragosmg Feb 3, 2022
3e09b5c

moved format date/time and helper (+tests) to dplyr-funcs-type


dragosmg Feb 3, 2022
def79dc

remove arg check


dragosmg Feb 3, 2022
46ee180

testing abandon ship for unsupported types


dragosmg Feb 3, 2022
976e172

improve `format()` abort message


dragosmg Feb 3, 2022
1bbcdac

improve test description


dragosmg Feb 3, 2022
cf514eb

use `"Etc/GMT+6"` as unlikely unit test


dragosmg Feb 4, 2022
f8c2ed2

test on windows too


dragosmg Feb 4, 2022
2ae6249

skip on win


dragosmg Feb 4, 2022
40e1914

moved `binding_format_datetime()` to dplyr-funcs-datetime.R


dragosmg Feb 17, 2022
f771682

cast as string for unsupported formats + update unit tests


dragosmg Feb 17, 2022
5411458

without casting


dragosmg Feb 17, 2022
8859ebb

with casting


dragosmg Feb 17, 2022
03eb111

added TODO to revisit the casting step once #12240 is merged


dragosmg Feb 23, 2022
09d99b4

used `build_expr()` and simplified the implementation


dragosmg Mar 3, 2022
8ecf37a

typo


dragosmg Mar 3, 2022
c0688e1

:)


dragosmg Mar 3, 2022
c118700

changed one test to use `arrow_table()`


dragosmg Mar 5, 2022
a6c0b19

updated the `format()` binding to use `build_expr()`


dragosmg Mar 5, 2022
7878b37

keep dispatch for regular R objects in and add a unit test for `forma…


dragosmg Mar 5, 2022
ce5a0c1

additional unit test with regular R object


dragosmg Mar 8, 2022
9668f01

removed unevaluated args and added comment on why we use `base::forma…


dragosmg Mar 9, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 20 additions & 0 deletions
r/R/dplyr-funcs-datetime.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,3 +168,23 @@ register_bindings_datetime <- function() {
 build_expr("cast", x, options = list(to_type = date32()))
 })
}

binding_format_datetime <- function(x, format = "", tz = "", usetz = FALSE) {
 if (usetz) {
 format <- paste(format, "%Z")
 }

 if (call_binding("is.POSIXct", x)) {
 # the casting part might not be required once
 # https://issues.apache.org/jira/browse/ARROW-14442 is solved
 # TODO revisit the steps below once the PR for that issue is merged
 if (tz == "" && x$type()$timezone() != "") {
 tz <- x$type()$timezone()
Comment thread
dragosmg marked this conversation as resolved.

 } else if (tz == "") {
 tz <- Sys.timezone()
 }
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 x <- build_expr("cast", x, options = cast_options(to_type = timestamp(x$type()$unit(), tz)))
 }

 build_expr("strftime", x, options = list(format = format, locale = Sys.getlocale("LC_TIME")))
}

18 changes: 18 additions & 0 deletions
r/R/dplyr-funcs-type.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ register_bindings_type <- function() {
 register_bindings_type_cast()
 register_bindings_type_inspect()
 register_bindings_type_elementwise()
 register_bindings_type_format()
}

register_bindings_type_cast <- function() {
Expand DownExpand Up@@ -292,3 +293,20 @@ register_bindings_type_elementwise <- function() {
 is_inf & !call_binding("is.na", is_inf)
 })
}

register_bindings_type_format <- function() {
 register_binding("format", function(x, ...) {
 # We use R's format if we get a single R object here since we don't (yet)
 # support all of the possible options for casting to string
 if (!inherits(x, "Expression")) {
 return(format(x, ...))
 }
Comment thread
dragosmg marked this conversation as resolved.


 if (inherits(x, "Expression") &&
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 x$type_id() %in% Type[c("TIMESTAMP", "DATE32", "DATE64")]) {
 binding_format_datetime(x, ...)
 } else {
 build_expr("cast", x, options = cast_options(to_type = string()))
 }
 })
}

102 changes: 102 additions & 0 deletions
r/tests/testthat/test-dplyr-funcs-type.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -843,3 +843,105 @@ test_that("as.Date() converts successfully from date, timestamp, integer, char a
 test_df
 )
})

test_that("format date/time", {
 skip_on_os("windows") # https://issues.apache.org/jira/browse/ARROW-13168

 times <- tibble(
 datetime = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Pacific/Marquesas"), NA),
 date = c(as.Date("2021-01-01"), NA)
 )
 formats <- "%a %A %w %d %b %B %m %y %Y %H %I %p %M %z %Z %j %U %W %x %X %% %G %V %u"
 formats_date <- "%a %A %w %d %b %B %m %y %Y %H %I %p %M %j %U %W %x %X %% %G %V %u"

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(date, format = formats_date)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats, tz = "Europe/Bucharest")) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats, tz = "EST", usetz = TRUE)) %>%
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(1),
 y = format(13.7, nsmall = 3)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(start_date = format(as.POSIXct("2022-01-01 01:01:00"))) %>%
 collect(),
 times
 )

 withr::with_timezone(
 "Pacific/Marquesas",
 {
 compare_dplyr_binding(
 .input %>%
 mutate(
 x = format(datetime, format = formats, tz = "EST"),
 x_date = format(date, format = formats_date, tz = "EST")
 ) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(
 x = format(datetime, format = formats),
 x_date = format(date, format = formats_date)
 ) %>%
 collect(),
 times
 )
 }
 )
})
Comment thread
dragosmg marked this conversation as resolved.


test_that("format() for unsupported types returns the input as string", {
 expect_equal(
 example_data %>%
 record_batch() %>%
 mutate(x = format(int)) %>%
 collect(),
 example_data %>%
 record_batch() %>%
 mutate(x = as.character(int)) %>%
 collect()
 )
 expect_equal(
 example_data %>%
 arrow_table() %>%
 mutate(y = format(dbl)) %>%
 collect(),
 example_data %>%
 arrow_table() %>%
 mutate(y = as.character(dbl)) %>%
 collect()
 )
})

, '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-14199 [R] bindings for format (where possible)#12319

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

dragosmg
wants to merge
26
commits into

from

 Closed


ARROW-14199 [R] bindings for format (where possible)
#12319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
db29c42

first pass at implementing `format()` for date-time


dragosmg Jan 25, 2022
cb162d9

`arrow::format()` uses object timezone if available


dragosmg Feb 3, 2022
fb67975

lint


dragosmg Feb 3, 2022
a7707c2

`format()` dispatch for `Timestamp` and `Date32` types


dragosmg Feb 3, 2022
f5f199a

create helper function for date/time format


dragosmg Feb 3, 2022
3e09b5c

moved format date/time and helper (+tests) to dplyr-funcs-type


dragosmg Feb 3, 2022
def79dc

remove arg check


dragosmg Feb 3, 2022
46ee180

testing abandon ship for unsupported types


dragosmg Feb 3, 2022
976e172

improve `format()` abort message


dragosmg Feb 3, 2022
1bbcdac

improve test description


dragosmg Feb 3, 2022
cf514eb

use `"Etc/GMT+6"` as unlikely unit test


dragosmg Feb 4, 2022
f8c2ed2

test on windows too


dragosmg Feb 4, 2022
2ae6249

skip on win


dragosmg Feb 4, 2022
40e1914

moved `binding_format_datetime()` to dplyr-funcs-datetime.R


dragosmg Feb 17, 2022
f771682

cast as string for unsupported formats + update unit tests


dragosmg Feb 17, 2022
5411458

without casting


dragosmg Feb 17, 2022
8859ebb

with casting


dragosmg Feb 17, 2022
03eb111

added TODO to revisit the casting step once #12240 is merged


dragosmg Feb 23, 2022
09d99b4

used `build_expr()` and simplified the implementation


dragosmg Mar 3, 2022
8ecf37a

typo


dragosmg Mar 3, 2022
c0688e1

:)


dragosmg Mar 3, 2022
c118700

changed one test to use `arrow_table()`


dragosmg Mar 5, 2022
a6c0b19

updated the `format()` binding to use `build_expr()`


dragosmg Mar 5, 2022
7878b37

keep dispatch for regular R objects in and add a unit test for `forma…


dragosmg Mar 5, 2022
ce5a0c1

additional unit test with regular R object


dragosmg Mar 8, 2022
9668f01

removed unevaluated args and added comment on why we use `base::forma…


dragosmg Mar 9, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 20 additions & 0 deletions
r/R/dplyr-funcs-datetime.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,3 +168,23 @@ register_bindings_datetime <- function() {
 build_expr("cast", x, options = list(to_type = date32()))
 })
}

binding_format_datetime <- function(x, format = "", tz = "", usetz = FALSE) {
 if (usetz) {
 format <- paste(format, "%Z")
 }

 if (call_binding("is.POSIXct", x)) {
 # the casting part might not be required once
 # https://issues.apache.org/jira/browse/ARROW-14442 is solved
 # TODO revisit the steps below once the PR for that issue is merged
 if (tz == "" && x$type()$timezone() != "") {
 tz <- x$type()$timezone()
Comment thread
dragosmg marked this conversation as resolved.

 } else if (tz == "") {
 tz <- Sys.timezone()
 }
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 x <- build_expr("cast", x, options = cast_options(to_type = timestamp(x$type()$unit(), tz)))
 }

 build_expr("strftime", x, options = list(format = format, locale = Sys.getlocale("LC_TIME")))
}

18 changes: 18 additions & 0 deletions
r/R/dplyr-funcs-type.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ register_bindings_type <- function() {
 register_bindings_type_cast()
 register_bindings_type_inspect()
 register_bindings_type_elementwise()
 register_bindings_type_format()
}

register_bindings_type_cast <- function() {
Expand DownExpand Up@@ -292,3 +293,20 @@ register_bindings_type_elementwise <- function() {
 is_inf & !call_binding("is.na", is_inf)
 })
}

register_bindings_type_format <- function() {
 register_binding("format", function(x, ...) {
 # We use R's format if we get a single R object here since we don't (yet)
 # support all of the possible options for casting to string
 if (!inherits(x, "Expression")) {
 return(format(x, ...))
 }
Comment thread
dragosmg marked this conversation as resolved.


 if (inherits(x, "Expression") &&
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 x$type_id() %in% Type[c("TIMESTAMP", "DATE32", "DATE64")]) {
 binding_format_datetime(x, ...)
 } else {
 build_expr("cast", x, options = cast_options(to_type = string()))
 }
 })
}

102 changes: 102 additions & 0 deletions
r/tests/testthat/test-dplyr-funcs-type.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -843,3 +843,105 @@ test_that("as.Date() converts successfully from date, timestamp, integer, char a
 test_df
 )
})

test_that("format date/time", {
 skip_on_os("windows") # https://issues.apache.org/jira/browse/ARROW-13168

 times <- tibble(
 datetime = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Pacific/Marquesas"), NA),
 date = c(as.Date("2021-01-01"), NA)
 )
 formats <- "%a %A %w %d %b %B %m %y %Y %H %I %p %M %z %Z %j %U %W %x %X %% %G %V %u"
 formats_date <- "%a %A %w %d %b %B %m %y %Y %H %I %p %M %j %U %W %x %X %% %G %V %u"

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(date, format = formats_date)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats, tz = "Europe/Bucharest")) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats, tz = "EST", usetz = TRUE)) %>%
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(1),
 y = format(13.7, nsmall = 3)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(start_date = format(as.POSIXct("2022-01-01 01:01:00"))) %>%
 collect(),
 times
 )

 withr::with_timezone(
 "Pacific/Marquesas",
 {
 compare_dplyr_binding(
 .input %>%
 mutate(
 x = format(datetime, format = formats, tz = "EST"),
 x_date = format(date, format = formats_date, tz = "EST")
 ) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(
 x = format(datetime, format = formats),
 x_date = format(date, format = formats_date)
 ) %>%
 collect(),
 times
 )
 }
 )
})
Comment thread
dragosmg marked this conversation as resolved.


test_that("format() for unsupported types returns the input as string", {
 expect_equal(
 example_data %>%
 record_batch() %>%
 mutate(x = format(int)) %>%
 collect(),
 example_data %>%
 record_batch() %>%
 mutate(x = as.character(int)) %>%
 collect()
 )
 expect_equal(
 example_data %>%
 arrow_table() %>%
 mutate(y = format(dbl)) %>%
 collect(),
 example_data %>%
 arrow_table() %>%
 mutate(y = as.character(dbl)) %>%
 collect()
 )
})

, '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-14199 [R] bindings for format (where possible)#12319

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

dragosmg
wants to merge
26
commits into

from

 Closed


ARROW-14199 [R] bindings for format (where possible)
#12319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
db29c42

first pass at implementing `format()` for date-time


dragosmg Jan 25, 2022
cb162d9

`arrow::format()` uses object timezone if available


dragosmg Feb 3, 2022
fb67975

lint


dragosmg Feb 3, 2022
a7707c2

`format()` dispatch for `Timestamp` and `Date32` types


dragosmg Feb 3, 2022
f5f199a

create helper function for date/time format


dragosmg Feb 3, 2022
3e09b5c

moved format date/time and helper (+tests) to dplyr-funcs-type


dragosmg Feb 3, 2022
def79dc

remove arg check


dragosmg Feb 3, 2022
46ee180

testing abandon ship for unsupported types


dragosmg Feb 3, 2022
976e172

improve `format()` abort message


dragosmg Feb 3, 2022
1bbcdac

improve test description


dragosmg Feb 3, 2022
cf514eb

use `"Etc/GMT+6"` as unlikely unit test


dragosmg Feb 4, 2022
f8c2ed2

test on windows too


dragosmg Feb 4, 2022
2ae6249

skip on win


dragosmg Feb 4, 2022
40e1914

moved `binding_format_datetime()` to dplyr-funcs-datetime.R


dragosmg Feb 17, 2022
f771682

cast as string for unsupported formats + update unit tests


dragosmg Feb 17, 2022
5411458

without casting


dragosmg Feb 17, 2022
8859ebb

with casting


dragosmg Feb 17, 2022
03eb111

added TODO to revisit the casting step once #12240 is merged


dragosmg Feb 23, 2022
09d99b4

used `build_expr()` and simplified the implementation


dragosmg Mar 3, 2022
8ecf37a

typo


dragosmg Mar 3, 2022
c0688e1

:)


dragosmg Mar 3, 2022
c118700

changed one test to use `arrow_table()`


dragosmg Mar 5, 2022
a6c0b19

updated the `format()` binding to use `build_expr()`


dragosmg Mar 5, 2022
7878b37

keep dispatch for regular R objects in and add a unit test for `forma…


dragosmg Mar 5, 2022
ce5a0c1

additional unit test with regular R object


dragosmg Mar 8, 2022
9668f01

removed unevaluated args and added comment on why we use `base::forma…


dragosmg Mar 9, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 20 additions & 0 deletions
r/R/dplyr-funcs-datetime.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,3 +168,23 @@ register_bindings_datetime <- function() {
 build_expr("cast", x, options = list(to_type = date32()))
 })
}

binding_format_datetime <- function(x, format = "", tz = "", usetz = FALSE) {
 if (usetz) {
 format <- paste(format, "%Z")
 }

 if (call_binding("is.POSIXct", x)) {
 # the casting part might not be required once
 # https://issues.apache.org/jira/browse/ARROW-14442 is solved
 # TODO revisit the steps below once the PR for that issue is merged
 if (tz == "" && x$type()$timezone() != "") {
 tz <- x$type()$timezone()
Comment thread
dragosmg marked this conversation as resolved.

 } else if (tz == "") {
 tz <- Sys.timezone()
 }
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 x <- build_expr("cast", x, options = cast_options(to_type = timestamp(x$type()$unit(), tz)))
 }

 build_expr("strftime", x, options = list(format = format, locale = Sys.getlocale("LC_TIME")))
}

18 changes: 18 additions & 0 deletions
r/R/dplyr-funcs-type.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ register_bindings_type <- function() {
 register_bindings_type_cast()
 register_bindings_type_inspect()
 register_bindings_type_elementwise()
 register_bindings_type_format()
}

register_bindings_type_cast <- function() {
Expand DownExpand Up@@ -292,3 +293,20 @@ register_bindings_type_elementwise <- function() {
 is_inf & !call_binding("is.na", is_inf)
 })
}

register_bindings_type_format <- function() {
 register_binding("format", function(x, ...) {
 # We use R's format if we get a single R object here since we don't (yet)
 # support all of the possible options for casting to string
 if (!inherits(x, "Expression")) {
 return(format(x, ...))
 }
Comment thread
dragosmg marked this conversation as resolved.


 if (inherits(x, "Expression") &&
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 x$type_id() %in% Type[c("TIMESTAMP", "DATE32", "DATE64")]) {
 binding_format_datetime(x, ...)
 } else {
 build_expr("cast", x, options = cast_options(to_type = string()))
 }
 })
}

102 changes: 102 additions & 0 deletions
r/tests/testthat/test-dplyr-funcs-type.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -843,3 +843,105 @@ test_that("as.Date() converts successfully from date, timestamp, integer, char a
 test_df
 )
})

test_that("format date/time", {
 skip_on_os("windows") # https://issues.apache.org/jira/browse/ARROW-13168

 times <- tibble(
 datetime = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Pacific/Marquesas"), NA),
 date = c(as.Date("2021-01-01"), NA)
 )
 formats <- "%a %A %w %d %b %B %m %y %Y %H %I %p %M %z %Z %j %U %W %x %X %% %G %V %u"
 formats_date <- "%a %A %w %d %b %B %m %y %Y %H %I %p %M %j %U %W %x %X %% %G %V %u"

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(date, format = formats_date)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats, tz = "Europe/Bucharest")) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(datetime, format = formats, tz = "EST", usetz = TRUE)) %>%
Comment thread
dragosmg marked this conversation as resolved.


Outdated

 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(x = format(1),
 y = format(13.7, nsmall = 3)) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(start_date = format(as.POSIXct("2022-01-01 01:01:00"))) %>%
 collect(),
 times
 )

 withr::with_timezone(
 "Pacific/Marquesas",
 {
 compare_dplyr_binding(
 .input %>%
 mutate(
 x = format(datetime, format = formats, tz = "EST"),
 x_date = format(date, format = formats_date, tz = "EST")
 ) %>%
 collect(),
 times
 )

 compare_dplyr_binding(
 .input %>%
 mutate(
 x = format(datetime, format = formats),
 x_date = format(date, format = formats_date)
 ) %>%
 collect(),
 times
 )
 }
 )
})
Comment thread
dragosmg marked this conversation as resolved.


test_that("format() for unsupported types returns the input as string", {
 expect_equal(
 example_data %>%
 record_batch() %>%
 mutate(x = format(int)) %>%
 collect(),
 example_data %>%
 record_batch() %>%
 mutate(x = as.character(int)) %>%
 collect()
 )
 expect_equal(
 example_data %>%
 arrow_table() %>%
 mutate(y = format(dbl)) %>%
 collect(),
 example_data %>%
 arrow_table() %>%
 mutate(y = as.character(dbl)) %>%
 collect()
 )
})