ARROW-13448: [R] Bindings for strftime#11105

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
rok wants to merge 8 commits into from
Closed

ARROW-13448: [R] Bindings for strftime #11105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
588304e
Adding StrftimeOptions.
rok Sep 7, 2021
463f142
Review feedback implementation.
rok Sep 16, 2021
4678968
Update r/tests/testthat/test-dplyr-string-functions.R
rok Sep 17, 2021
a41a7d5
Review feedback.
rok Sep 20, 2021
9e633c7
Disabling %c flag.
rok Sep 21, 2021
6af5ad4
Adding format_ISO8601, movint %c check to c++.
rok Sep 22, 2021
3a74ae6
Update r/R/dplyr-functions.R
rok Sep 22, 2021
d45cd22
Update r/R/dplyr-functions.R
rok Sep 23, 2021
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
5 changes: 5 additions & 0 deletions cpp/src/arrow/compute/kernels/scalar_temporal.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -529,6 +529,11 @@ struct Strftime {
const StrftimeOptions& options = StrftimeState::Get(ctx);

auto timezone = GetInputTimezone(type);
// This check is due to surprising %c behavior.
// See https://github.com/HowardHinnant/date/issues/704
if ((options.format.find("%c") != std::string::npos) && (options.locale != "C")) {
return Status::Invalid("%c flag is not supported in non-C locales.");
}
if (timezone.empty()) {
if ((options.format.find("%z") != std::string::npos) ||
(options.format.find("%Z") != std::string::npos)) {
Expand Down
2 changes: 1 addition & 1 deletion python/pyarrow/tests/test_compute.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1560,7 +1560,7 @@ def _fix_timestamp(s):

formats = ["%a", "%A", "%w", "%d", "%b", "%B", "%m", "%y", "%Y", "%H",
"%I", "%p", "%M", "%z", "%Z", "%j", "%U", "%W", "%c", "%x",
"%X", "%%", "%G", "%V", "%u", "%V"]
"%X", "%%", "%G", "%V", "%u"]

for timezone in timezones:
ts = pd.to_datetime(times).tz_localize(timezone)
Expand Down
42 changes: 42 additions & 0 deletions r/R/dplyr-functions.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -672,6 +672,48 @@ nse_funcs$strptime <- function(x, format = "%Y-%m-%d %H:%M:%S", tz = NULL, unit
Expression$create("strptime", x, options = list(format = format, unit = unit))
}

nse_funcs$strftime <- function(x, format = "", tz = "", usetz = FALSE) {
if (usetz) {
format <- paste(format, "%Z")
}
if (tz == "") {
tz <- Sys.timezone()
}
# Arrow's strftime prints in timezone of the timestamp. To match R's strftime behavior we first
# cast the timestamp to desired timezone. This is a metadata only change.
ts <- Expression$create("cast", x, options = list(to_type = timestamp(x$type()$unit(), tz)))
Expression$create("strftime", ts, options = list(format = format, locale = Sys.getlocale("LC_TIME")))
}

nse_funcs$format_ISO8601 <- function(x, usetz = FALSE, precision = NULL, ...) {
ISO8601_precision_map <-
list(y = "%Y",
ym = "%Y-%m",
ymd = "%Y-%m-%d",
ymdh = "%Y-%m-%dT%H",
ymdhm = "%Y-%m-%dT%H:%M",
ymdhms = "%Y-%m-%dT%H:%M:%S")

if (is.null(precision)) {
precision <- "ymdhms"
}
if (!precision %in% names(ISO8601_precision_map)) {
abort(
paste(
"`precision` must be one of the following values:",
paste(names(ISO8601_precision_map), collapse = ", "),
"\nValue supplied was: ",
precision
)
)
}
format <- ISO8601_precision_map[[precision]]
if (usetz) {
format <- paste0(format, "%z")
}
Expression$create("strftime", x, options = list(format = format, locale = "C"))
}

nse_funcs$second <- function(x) {
Expression$create("add", Expression$create("second", x), Expression$create("subsecond", x))
}
Expand Down
7 changes: 7 additions & 0 deletions r/src/compute.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -332,6 +332,13 @@ std::shared_ptr<arrow::compute::FunctionOptions> make_compute_options(
cpp11::as_cpp<arrow::TimeUnit::type>(options["unit"]));
}

if (func_name == "strftime") {
using Options = arrow::compute::StrftimeOptions;
return std::make_shared<Options>(
Options(cpp11::as_cpp<std::string>(options["format"]),
cpp11::as_cpp<std::string>(options["locale"])));
}
Comment thread
rok marked this conversation as resolved.

if (func_name == "assume_timezone") {
using Options = arrow::compute::AssumeTimezoneOptions;
enum Options::Ambiguous ambiguous;
Expand Down
99 changes: 99 additions & 0 deletions r/tests/testthat/test-dplyr-string-functions.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ skip_if_not_available("dataset")
skip_if_not_available("utf8proc")

library(dplyr)
library(lubridate)
library(stringr)
library(stringi)

Expand DownExpand Up@@ -719,6 +720,104 @@ test_that("errors in strptime", {
)
})

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

times <- tibble(x = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Etc/GMT+6"), NA))
seconds <- tibble(x = c("05.000000", 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"

expect_dplyr_equal(
input %>%
mutate(x = strftime(x, format = formats)) %>%
collect(),
times
)

expect_dplyr_equal(
input %>%
mutate(x = strftime(x, format = formats, tz = "Pacific/Marquesas")) %>%
collect(),
times
)

expect_dplyr_equal(
input %>%
mutate(x = strftime(x, format = formats, tz = "EST", usetz = TRUE)) %>%
collect(),
times
)

withr::with_timezone("Pacific/Marquesas",
expect_dplyr_equal(
input %>%
mutate(x = strftime(x, format = formats, tz = "EST")) %>%
collect(),
times
)
)

# This check is due to differences in the way %c currently works in Arrow and R's strftime.
# We can revisit after https://github.com/HowardHinnant/date/issues/704 is resolved.
expect_error(
times %>%
Table$create() %>%
mutate(x = strftime(x, format = "%c")) %>%
collect(),
"%c flag is not supported in non-C locales."
)

# Output precision of %S depends on the input timestamp precision.
# Timestamps with second precision are represented as integers while
# milliseconds, microsecond and nanoseconds are represented as fixed floating
# point numbers with 3, 6 and 9 decimal places respectively.
expect_dplyr_equal(
input %>%
mutate(x = strftime(x, format = "%S")) %>%
transmute(as.double(substr(x, 1, 2))) %>%
collect(),
times,
tolerance = 1e-6
)
})

test_that("format_ISO8601", {
skip_on_os("windows") # https://issues.apache.org/jira/browse/ARROW-13168
times <- tibble(x = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Etc/GMT+6"), NA))

expect_dplyr_equal(
input %>%
mutate(x = format_ISO8601(x, precision = "ymd", usetz = FALSE)) %>%
collect(),
times
)

expect_dplyr_equal(
input %>%
mutate(x = format_ISO8601(x, precision = "ymd", usetz = TRUE)) %>%
collect(),
times
)

# See comment regarding %S flag in strftime tests
expect_dplyr_equal(
input %>%
mutate(x = format_ISO8601(x, precision = "ymdhms", usetz = FALSE)) %>%
mutate(x = gsub("\\.0*", "", x)) %>%
collect(),
times
)

# See comment regarding %S flag in strftime tests
expect_dplyr_equal(
input %>%
mutate(x = format_ISO8601(x, precision = "ymdhms", usetz = TRUE)) %>%
mutate(x = gsub("\\.0*", "", x)) %>%
collect(),
times
)
})

test_that("arrow_find_substring and arrow_find_substring_regex", {
df <- tibble(x = c("Foo and Bar", "baz and qux and quux"))

Expand Down
, '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-13448: [R] Bindings for strftime#11105

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

rok
wants to merge
8
commits into

from

 Closed


ARROW-13448: [R] Bindings for strftime
#11105
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
588304e

Adding StrftimeOptions.


rok Sep 7, 2021
463f142

Review feedback implementation.


rok Sep 16, 2021
4678968

Update r/tests/testthat/test-dplyr-string-functions.R


rok Sep 17, 2021
a41a7d5

Review feedback.


rok Sep 20, 2021
9e633c7

Disabling %c flag.


rok Sep 21, 2021
6af5ad4

Adding format_ISO8601, movint %c check to c++.


rok Sep 22, 2021
3a74ae6

Update r/R/dplyr-functions.R


rok Sep 22, 2021
d45cd22

Update r/R/dplyr-functions.R


rok Sep 23, 2021

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


5 changes: 5 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_temporal.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -529,6 +529,11 @@ struct Strftime {
 const StrftimeOptions& options = StrftimeState::Get(ctx);

 auto timezone = GetInputTimezone(type);
 // This check is due to surprising %c behavior.
 // See https://github.com/HowardHinnant/date/issues/704
 if ((options.format.find("%c") != std::string::npos) && (options.locale != "C")) {
 return Status::Invalid("%c flag is not supported in non-C locales.");
 }
 if (timezone.empty()) {
 if ((options.format.find("%z") != std::string::npos) ||
 (options.format.find("%Z") != std::string::npos)) {
Expand Down

2 changes: 1 addition & 1 deletion
python/pyarrow/tests/test_compute.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1560,7 +1560,7 @@ def _fix_timestamp(s):

 formats = ["%a", "%A", "%w", "%d", "%b", "%B", "%m", "%y", "%Y", "%H",
 "%I", "%p", "%M", "%z", "%Z", "%j", "%U", "%W", "%c", "%x",
 "%X", "%%", "%G", "%V", "%u", "%V"]
 "%X", "%%", "%G", "%V", "%u"]

 for timezone in timezones:
 ts = pd.to_datetime(times).tz_localize(timezone)
Expand Down

42 changes: 42 additions & 0 deletions
r/R/dplyr-functions.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -672,6 +672,48 @@ nse_funcs$strptime <- function(x, format = "%Y-%m-%d %H:%M:%S", tz = NULL, unit
 Expression$create("strptime", x, options = list(format = format, unit = unit))
}

nse_funcs$strftime <- function(x, format = "", tz = "", usetz = FALSE) {
 if (usetz) {
 format <- paste(format, "%Z")
 }
 if (tz == "") {
 tz <- Sys.timezone()
 }
 # Arrow's strftime prints in timezone of the timestamp. To match R's strftime behavior we first
 # cast the timestamp to desired timezone. This is a metadata only change.
 ts <- Expression$create("cast", x, options = list(to_type = timestamp(x$type()$unit(), tz)))
 Expression$create("strftime", ts, options = list(format = format, locale = Sys.getlocale("LC_TIME")))
}

nse_funcs$format_ISO8601 <- function(x, usetz = FALSE, precision = NULL, ...) {
 ISO8601_precision_map <-
 list(y = "%Y",
 ym = "%Y-%m",
 ymd = "%Y-%m-%d",
 ymdh = "%Y-%m-%dT%H",
 ymdhm = "%Y-%m-%dT%H:%M",
 ymdhms = "%Y-%m-%dT%H:%M:%S")

 if (is.null(precision)) {
 precision <- "ymdhms"
 }
 if (!precision %in% names(ISO8601_precision_map)) {
 abort(
 paste(
 "`precision` must be one of the following values:",
 paste(names(ISO8601_precision_map), collapse = ", "),
 "\nValue supplied was: ",
 precision
 )
 )
 }
 format <- ISO8601_precision_map[[precision]]
 if (usetz) {
 format <- paste0(format, "%z")
 }
 Expression$create("strftime", x, options = list(format = format, locale = "C"))
}

nse_funcs$second <- function(x) {
 Expression$create("add", Expression$create("second", x), Expression$create("subsecond", x))
}
Expand Down

7 changes: 7 additions & 0 deletions
r/src/compute.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,6 +332,13 @@ std::shared_ptr<arrow::compute::FunctionOptions> make_compute_options(
 cpp11::as_cpp<arrow::TimeUnit::type>(options["unit"]));
 }

 if (func_name == "strftime") {
 using Options = arrow::compute::StrftimeOptions;
 return std::make_shared<Options>(
 Options(cpp11::as_cpp<std::string>(options["format"]),
 cpp11::as_cpp<std::string>(options["locale"])));
 }
Comment thread
rok marked this conversation as resolved.


 if (func_name == "assume_timezone") {
 using Options = arrow::compute::AssumeTimezoneOptions;
 enum Options::Ambiguous ambiguous;
Expand Down

99 changes: 99 additions & 0 deletions
r/tests/testthat/test-dplyr-string-functions.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ skip_if_not_available("dataset")
skip_if_not_available("utf8proc")

library(dplyr)
library(lubridate)
library(stringr)
library(stringi)

Expand DownExpand Up@@ -719,6 +720,104 @@ test_that("errors in strptime", {
 )
})

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

 times <- tibble(x = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Etc/GMT+6"), NA))
 seconds <- tibble(x = c("05.000000", 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"

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats)) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "Pacific/Marquesas")) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "EST", usetz = TRUE)) %>%
 collect(),
 times
 )

 withr::with_timezone("Pacific/Marquesas",
 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "EST")) %>%
 collect(),
 times
 )
 )

 # This check is due to differences in the way %c currently works in Arrow and R's strftime.
 # We can revisit after https://github.com/HowardHinnant/date/issues/704 is resolved.
 expect_error(
 times %>%
 Table$create() %>%
 mutate(x = strftime(x, format = "%c")) %>%
 collect(),
 "%c flag is not supported in non-C locales."
 )

 # Output precision of %S depends on the input timestamp precision.
 # Timestamps with second precision are represented as integers while
 # milliseconds, microsecond and nanoseconds are represented as fixed floating
 # point numbers with 3, 6 and 9 decimal places respectively.
 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = "%S")) %>%
 transmute(as.double(substr(x, 1, 2))) %>%
 collect(),
 times,
 tolerance = 1e-6
 )
})

test_that("format_ISO8601", {
 skip_on_os("windows") # https://issues.apache.org/jira/browse/ARROW-13168
 times <- tibble(x = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Etc/GMT+6"), NA))

 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymd", usetz = FALSE)) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymd", usetz = TRUE)) %>%
 collect(),
 times
 )

 # See comment regarding %S flag in strftime tests
 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymdhms", usetz = FALSE)) %>%
 mutate(x = gsub("\\.0*", "", x)) %>%
 collect(),
 times
 )

 # See comment regarding %S flag in strftime tests
 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymdhms", usetz = TRUE)) %>%
 mutate(x = gsub("\\.0*", "", x)) %>%
 collect(),
 times
 )
})

test_that("arrow_find_substring and arrow_find_substring_regex", {
 df <- tibble(x = c("Foo and Bar", "baz and qux and quux"))

Expand Down

, '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-13448: [R] Bindings for strftime#11105

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

rok
wants to merge
8
commits into

from

 Closed


ARROW-13448: [R] Bindings for strftime
#11105
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
588304e

Adding StrftimeOptions.


rok Sep 7, 2021
463f142

Review feedback implementation.


rok Sep 16, 2021
4678968

Update r/tests/testthat/test-dplyr-string-functions.R


rok Sep 17, 2021
a41a7d5

Review feedback.


rok Sep 20, 2021
9e633c7

Disabling %c flag.


rok Sep 21, 2021
6af5ad4

Adding format_ISO8601, movint %c check to c++.


rok Sep 22, 2021
3a74ae6

Update r/R/dplyr-functions.R


rok Sep 22, 2021
d45cd22

Update r/R/dplyr-functions.R


rok Sep 23, 2021

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


5 changes: 5 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_temporal.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -529,6 +529,11 @@ struct Strftime {
 const StrftimeOptions& options = StrftimeState::Get(ctx);

 auto timezone = GetInputTimezone(type);
 // This check is due to surprising %c behavior.
 // See https://github.com/HowardHinnant/date/issues/704
 if ((options.format.find("%c") != std::string::npos) && (options.locale != "C")) {
 return Status::Invalid("%c flag is not supported in non-C locales.");
 }
 if (timezone.empty()) {
 if ((options.format.find("%z") != std::string::npos) ||
 (options.format.find("%Z") != std::string::npos)) {
Expand Down

2 changes: 1 addition & 1 deletion
python/pyarrow/tests/test_compute.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1560,7 +1560,7 @@ def _fix_timestamp(s):

 formats = ["%a", "%A", "%w", "%d", "%b", "%B", "%m", "%y", "%Y", "%H",
 "%I", "%p", "%M", "%z", "%Z", "%j", "%U", "%W", "%c", "%x",
 "%X", "%%", "%G", "%V", "%u", "%V"]
 "%X", "%%", "%G", "%V", "%u"]

 for timezone in timezones:
 ts = pd.to_datetime(times).tz_localize(timezone)
Expand Down

42 changes: 42 additions & 0 deletions
r/R/dplyr-functions.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -672,6 +672,48 @@ nse_funcs$strptime <- function(x, format = "%Y-%m-%d %H:%M:%S", tz = NULL, unit
 Expression$create("strptime", x, options = list(format = format, unit = unit))
}

nse_funcs$strftime <- function(x, format = "", tz = "", usetz = FALSE) {
 if (usetz) {
 format <- paste(format, "%Z")
 }
 if (tz == "") {
 tz <- Sys.timezone()
 }
 # Arrow's strftime prints in timezone of the timestamp. To match R's strftime behavior we first
 # cast the timestamp to desired timezone. This is a metadata only change.
 ts <- Expression$create("cast", x, options = list(to_type = timestamp(x$type()$unit(), tz)))
 Expression$create("strftime", ts, options = list(format = format, locale = Sys.getlocale("LC_TIME")))
}

nse_funcs$format_ISO8601 <- function(x, usetz = FALSE, precision = NULL, ...) {
 ISO8601_precision_map <-
 list(y = "%Y",
 ym = "%Y-%m",
 ymd = "%Y-%m-%d",
 ymdh = "%Y-%m-%dT%H",
 ymdhm = "%Y-%m-%dT%H:%M",
 ymdhms = "%Y-%m-%dT%H:%M:%S")

 if (is.null(precision)) {
 precision <- "ymdhms"
 }
 if (!precision %in% names(ISO8601_precision_map)) {
 abort(
 paste(
 "`precision` must be one of the following values:",
 paste(names(ISO8601_precision_map), collapse = ", "),
 "\nValue supplied was: ",
 precision
 )
 )
 }
 format <- ISO8601_precision_map[[precision]]
 if (usetz) {
 format <- paste0(format, "%z")
 }
 Expression$create("strftime", x, options = list(format = format, locale = "C"))
}

nse_funcs$second <- function(x) {
 Expression$create("add", Expression$create("second", x), Expression$create("subsecond", x))
}
Expand Down

7 changes: 7 additions & 0 deletions
r/src/compute.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,6 +332,13 @@ std::shared_ptr<arrow::compute::FunctionOptions> make_compute_options(
 cpp11::as_cpp<arrow::TimeUnit::type>(options["unit"]));
 }

 if (func_name == "strftime") {
 using Options = arrow::compute::StrftimeOptions;
 return std::make_shared<Options>(
 Options(cpp11::as_cpp<std::string>(options["format"]),
 cpp11::as_cpp<std::string>(options["locale"])));
 }
Comment thread
rok marked this conversation as resolved.


 if (func_name == "assume_timezone") {
 using Options = arrow::compute::AssumeTimezoneOptions;
 enum Options::Ambiguous ambiguous;
Expand Down

99 changes: 99 additions & 0 deletions
r/tests/testthat/test-dplyr-string-functions.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ skip_if_not_available("dataset")
skip_if_not_available("utf8proc")

library(dplyr)
library(lubridate)
library(stringr)
library(stringi)

Expand DownExpand Up@@ -719,6 +720,104 @@ test_that("errors in strptime", {
 )
})

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

 times <- tibble(x = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Etc/GMT+6"), NA))
 seconds <- tibble(x = c("05.000000", 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"

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats)) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "Pacific/Marquesas")) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "EST", usetz = TRUE)) %>%
 collect(),
 times
 )

 withr::with_timezone("Pacific/Marquesas",
 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "EST")) %>%
 collect(),
 times
 )
 )

 # This check is due to differences in the way %c currently works in Arrow and R's strftime.
 # We can revisit after https://github.com/HowardHinnant/date/issues/704 is resolved.
 expect_error(
 times %>%
 Table$create() %>%
 mutate(x = strftime(x, format = "%c")) %>%
 collect(),
 "%c flag is not supported in non-C locales."
 )

 # Output precision of %S depends on the input timestamp precision.
 # Timestamps with second precision are represented as integers while
 # milliseconds, microsecond and nanoseconds are represented as fixed floating
 # point numbers with 3, 6 and 9 decimal places respectively.
 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = "%S")) %>%
 transmute(as.double(substr(x, 1, 2))) %>%
 collect(),
 times,
 tolerance = 1e-6
 )
})

test_that("format_ISO8601", {
 skip_on_os("windows") # https://issues.apache.org/jira/browse/ARROW-13168
 times <- tibble(x = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Etc/GMT+6"), NA))

 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymd", usetz = FALSE)) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymd", usetz = TRUE)) %>%
 collect(),
 times
 )

 # See comment regarding %S flag in strftime tests
 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymdhms", usetz = FALSE)) %>%
 mutate(x = gsub("\\.0*", "", x)) %>%
 collect(),
 times
 )

 # See comment regarding %S flag in strftime tests
 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymdhms", usetz = TRUE)) %>%
 mutate(x = gsub("\\.0*", "", x)) %>%
 collect(),
 times
 )
})

test_that("arrow_find_substring and arrow_find_substring_regex", {
 df <- tibble(x = c("Foo and Bar", "baz and qux and quux"))

Expand Down

, '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-13448: [R] Bindings for strftime#11105

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

rok
wants to merge
8
commits into

from

 Closed


ARROW-13448: [R] Bindings for strftime
#11105
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
588304e

Adding StrftimeOptions.


rok Sep 7, 2021
463f142

Review feedback implementation.


rok Sep 16, 2021
4678968

Update r/tests/testthat/test-dplyr-string-functions.R


rok Sep 17, 2021
a41a7d5

Review feedback.


rok Sep 20, 2021
9e633c7

Disabling %c flag.


rok Sep 21, 2021
6af5ad4

Adding format_ISO8601, movint %c check to c++.


rok Sep 22, 2021
3a74ae6

Update r/R/dplyr-functions.R


rok Sep 22, 2021
d45cd22

Update r/R/dplyr-functions.R


rok Sep 23, 2021

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


5 changes: 5 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_temporal.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -529,6 +529,11 @@ struct Strftime {
 const StrftimeOptions& options = StrftimeState::Get(ctx);

 auto timezone = GetInputTimezone(type);
 // This check is due to surprising %c behavior.
 // See https://github.com/HowardHinnant/date/issues/704
 if ((options.format.find("%c") != std::string::npos) && (options.locale != "C")) {
 return Status::Invalid("%c flag is not supported in non-C locales.");
 }
 if (timezone.empty()) {
 if ((options.format.find("%z") != std::string::npos) ||
 (options.format.find("%Z") != std::string::npos)) {
Expand Down

2 changes: 1 addition & 1 deletion
python/pyarrow/tests/test_compute.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1560,7 +1560,7 @@ def _fix_timestamp(s):

 formats = ["%a", "%A", "%w", "%d", "%b", "%B", "%m", "%y", "%Y", "%H",
 "%I", "%p", "%M", "%z", "%Z", "%j", "%U", "%W", "%c", "%x",
 "%X", "%%", "%G", "%V", "%u", "%V"]
 "%X", "%%", "%G", "%V", "%u"]

 for timezone in timezones:
 ts = pd.to_datetime(times).tz_localize(timezone)
Expand Down

42 changes: 42 additions & 0 deletions
r/R/dplyr-functions.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -672,6 +672,48 @@ nse_funcs$strptime <- function(x, format = "%Y-%m-%d %H:%M:%S", tz = NULL, unit
 Expression$create("strptime", x, options = list(format = format, unit = unit))
}

nse_funcs$strftime <- function(x, format = "", tz = "", usetz = FALSE) {
 if (usetz) {
 format <- paste(format, "%Z")
 }
 if (tz == "") {
 tz <- Sys.timezone()
 }
 # Arrow's strftime prints in timezone of the timestamp. To match R's strftime behavior we first
 # cast the timestamp to desired timezone. This is a metadata only change.
 ts <- Expression$create("cast", x, options = list(to_type = timestamp(x$type()$unit(), tz)))
 Expression$create("strftime", ts, options = list(format = format, locale = Sys.getlocale("LC_TIME")))
}

nse_funcs$format_ISO8601 <- function(x, usetz = FALSE, precision = NULL, ...) {
 ISO8601_precision_map <-
 list(y = "%Y",
 ym = "%Y-%m",
 ymd = "%Y-%m-%d",
 ymdh = "%Y-%m-%dT%H",
 ymdhm = "%Y-%m-%dT%H:%M",
 ymdhms = "%Y-%m-%dT%H:%M:%S")

 if (is.null(precision)) {
 precision <- "ymdhms"
 }
 if (!precision %in% names(ISO8601_precision_map)) {
 abort(
 paste(
 "`precision` must be one of the following values:",
 paste(names(ISO8601_precision_map), collapse = ", "),
 "\nValue supplied was: ",
 precision
 )
 )
 }
 format <- ISO8601_precision_map[[precision]]
 if (usetz) {
 format <- paste0(format, "%z")
 }
 Expression$create("strftime", x, options = list(format = format, locale = "C"))
}

nse_funcs$second <- function(x) {
 Expression$create("add", Expression$create("second", x), Expression$create("subsecond", x))
}
Expand Down

7 changes: 7 additions & 0 deletions
r/src/compute.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,6 +332,13 @@ std::shared_ptr<arrow::compute::FunctionOptions> make_compute_options(
 cpp11::as_cpp<arrow::TimeUnit::type>(options["unit"]));
 }

 if (func_name == "strftime") {
 using Options = arrow::compute::StrftimeOptions;
 return std::make_shared<Options>(
 Options(cpp11::as_cpp<std::string>(options["format"]),
 cpp11::as_cpp<std::string>(options["locale"])));
 }
Comment thread
rok marked this conversation as resolved.


 if (func_name == "assume_timezone") {
 using Options = arrow::compute::AssumeTimezoneOptions;
 enum Options::Ambiguous ambiguous;
Expand Down

99 changes: 99 additions & 0 deletions
r/tests/testthat/test-dplyr-string-functions.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ skip_if_not_available("dataset")
skip_if_not_available("utf8proc")

library(dplyr)
library(lubridate)
library(stringr)
library(stringi)

Expand DownExpand Up@@ -719,6 +720,104 @@ test_that("errors in strptime", {
 )
})

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

 times <- tibble(x = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Etc/GMT+6"), NA))
 seconds <- tibble(x = c("05.000000", 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"

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats)) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "Pacific/Marquesas")) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "EST", usetz = TRUE)) %>%
 collect(),
 times
 )

 withr::with_timezone("Pacific/Marquesas",
 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "EST")) %>%
 collect(),
 times
 )
 )

 # This check is due to differences in the way %c currently works in Arrow and R's strftime.
 # We can revisit after https://github.com/HowardHinnant/date/issues/704 is resolved.
 expect_error(
 times %>%
 Table$create() %>%
 mutate(x = strftime(x, format = "%c")) %>%
 collect(),
 "%c flag is not supported in non-C locales."
 )

 # Output precision of %S depends on the input timestamp precision.
 # Timestamps with second precision are represented as integers while
 # milliseconds, microsecond and nanoseconds are represented as fixed floating
 # point numbers with 3, 6 and 9 decimal places respectively.
 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = "%S")) %>%
 transmute(as.double(substr(x, 1, 2))) %>%
 collect(),
 times,
 tolerance = 1e-6
 )
})

test_that("format_ISO8601", {
 skip_on_os("windows") # https://issues.apache.org/jira/browse/ARROW-13168
 times <- tibble(x = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Etc/GMT+6"), NA))

 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymd", usetz = FALSE)) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymd", usetz = TRUE)) %>%
 collect(),
 times
 )

 # See comment regarding %S flag in strftime tests
 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymdhms", usetz = FALSE)) %>%
 mutate(x = gsub("\\.0*", "", x)) %>%
 collect(),
 times
 )

 # See comment regarding %S flag in strftime tests
 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymdhms", usetz = TRUE)) %>%
 mutate(x = gsub("\\.0*", "", x)) %>%
 collect(),
 times
 )
})

test_that("arrow_find_substring and arrow_find_substring_regex", {
 df <- tibble(x = c("Foo and Bar", "baz and qux and quux"))

Expand Down

, '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-13448: [R] Bindings for strftime#11105

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

rok
wants to merge
8
commits into

from

 Closed


ARROW-13448: [R] Bindings for strftime
#11105
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
588304e

Adding StrftimeOptions.


rok Sep 7, 2021
463f142

Review feedback implementation.


rok Sep 16, 2021
4678968

Update r/tests/testthat/test-dplyr-string-functions.R


rok Sep 17, 2021
a41a7d5

Review feedback.


rok Sep 20, 2021
9e633c7

Disabling %c flag.


rok Sep 21, 2021
6af5ad4

Adding format_ISO8601, movint %c check to c++.


rok Sep 22, 2021
3a74ae6

Update r/R/dplyr-functions.R


rok Sep 22, 2021
d45cd22

Update r/R/dplyr-functions.R


rok Sep 23, 2021

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


5 changes: 5 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_temporal.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -529,6 +529,11 @@ struct Strftime {
 const StrftimeOptions& options = StrftimeState::Get(ctx);

 auto timezone = GetInputTimezone(type);
 // This check is due to surprising %c behavior.
 // See https://github.com/HowardHinnant/date/issues/704
 if ((options.format.find("%c") != std::string::npos) && (options.locale != "C")) {
 return Status::Invalid("%c flag is not supported in non-C locales.");
 }
 if (timezone.empty()) {
 if ((options.format.find("%z") != std::string::npos) ||
 (options.format.find("%Z") != std::string::npos)) {
Expand Down

2 changes: 1 addition & 1 deletion
python/pyarrow/tests/test_compute.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1560,7 +1560,7 @@ def _fix_timestamp(s):

 formats = ["%a", "%A", "%w", "%d", "%b", "%B", "%m", "%y", "%Y", "%H",
 "%I", "%p", "%M", "%z", "%Z", "%j", "%U", "%W", "%c", "%x",
 "%X", "%%", "%G", "%V", "%u", "%V"]
 "%X", "%%", "%G", "%V", "%u"]

 for timezone in timezones:
 ts = pd.to_datetime(times).tz_localize(timezone)
Expand Down

42 changes: 42 additions & 0 deletions
r/R/dplyr-functions.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -672,6 +672,48 @@ nse_funcs$strptime <- function(x, format = "%Y-%m-%d %H:%M:%S", tz = NULL, unit
 Expression$create("strptime", x, options = list(format = format, unit = unit))
}

nse_funcs$strftime <- function(x, format = "", tz = "", usetz = FALSE) {
 if (usetz) {
 format <- paste(format, "%Z")
 }
 if (tz == "") {
 tz <- Sys.timezone()
 }
 # Arrow's strftime prints in timezone of the timestamp. To match R's strftime behavior we first
 # cast the timestamp to desired timezone. This is a metadata only change.
 ts <- Expression$create("cast", x, options = list(to_type = timestamp(x$type()$unit(), tz)))
 Expression$create("strftime", ts, options = list(format = format, locale = Sys.getlocale("LC_TIME")))
}

nse_funcs$format_ISO8601 <- function(x, usetz = FALSE, precision = NULL, ...) {
 ISO8601_precision_map <-
 list(y = "%Y",
 ym = "%Y-%m",
 ymd = "%Y-%m-%d",
 ymdh = "%Y-%m-%dT%H",
 ymdhm = "%Y-%m-%dT%H:%M",
 ymdhms = "%Y-%m-%dT%H:%M:%S")

 if (is.null(precision)) {
 precision <- "ymdhms"
 }
 if (!precision %in% names(ISO8601_precision_map)) {
 abort(
 paste(
 "`precision` must be one of the following values:",
 paste(names(ISO8601_precision_map), collapse = ", "),
 "\nValue supplied was: ",
 precision
 )
 )
 }
 format <- ISO8601_precision_map[[precision]]
 if (usetz) {
 format <- paste0(format, "%z")
 }
 Expression$create("strftime", x, options = list(format = format, locale = "C"))
}

nse_funcs$second <- function(x) {
 Expression$create("add", Expression$create("second", x), Expression$create("subsecond", x))
}
Expand Down

7 changes: 7 additions & 0 deletions
r/src/compute.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,6 +332,13 @@ std::shared_ptr<arrow::compute::FunctionOptions> make_compute_options(
 cpp11::as_cpp<arrow::TimeUnit::type>(options["unit"]));
 }

 if (func_name == "strftime") {
 using Options = arrow::compute::StrftimeOptions;
 return std::make_shared<Options>(
 Options(cpp11::as_cpp<std::string>(options["format"]),
 cpp11::as_cpp<std::string>(options["locale"])));
 }
Comment thread
rok marked this conversation as resolved.


 if (func_name == "assume_timezone") {
 using Options = arrow::compute::AssumeTimezoneOptions;
 enum Options::Ambiguous ambiguous;
Expand Down

99 changes: 99 additions & 0 deletions
r/tests/testthat/test-dplyr-string-functions.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ skip_if_not_available("dataset")
skip_if_not_available("utf8proc")

library(dplyr)
library(lubridate)
library(stringr)
library(stringi)

Expand DownExpand Up@@ -719,6 +720,104 @@ test_that("errors in strptime", {
 )
})

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

 times <- tibble(x = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Etc/GMT+6"), NA))
 seconds <- tibble(x = c("05.000000", 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"

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats)) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "Pacific/Marquesas")) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "EST", usetz = TRUE)) %>%
 collect(),
 times
 )

 withr::with_timezone("Pacific/Marquesas",
 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "EST")) %>%
 collect(),
 times
 )
 )

 # This check is due to differences in the way %c currently works in Arrow and R's strftime.
 # We can revisit after https://github.com/HowardHinnant/date/issues/704 is resolved.
 expect_error(
 times %>%
 Table$create() %>%
 mutate(x = strftime(x, format = "%c")) %>%
 collect(),
 "%c flag is not supported in non-C locales."
 )

 # Output precision of %S depends on the input timestamp precision.
 # Timestamps with second precision are represented as integers while
 # milliseconds, microsecond and nanoseconds are represented as fixed floating
 # point numbers with 3, 6 and 9 decimal places respectively.
 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = "%S")) %>%
 transmute(as.double(substr(x, 1, 2))) %>%
 collect(),
 times,
 tolerance = 1e-6
 )
})

test_that("format_ISO8601", {
 skip_on_os("windows") # https://issues.apache.org/jira/browse/ARROW-13168
 times <- tibble(x = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Etc/GMT+6"), NA))

 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymd", usetz = FALSE)) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymd", usetz = TRUE)) %>%
 collect(),
 times
 )

 # See comment regarding %S flag in strftime tests
 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymdhms", usetz = FALSE)) %>%
 mutate(x = gsub("\\.0*", "", x)) %>%
 collect(),
 times
 )

 # See comment regarding %S flag in strftime tests
 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymdhms", usetz = TRUE)) %>%
 mutate(x = gsub("\\.0*", "", x)) %>%
 collect(),
 times
 )
})

test_that("arrow_find_substring and arrow_find_substring_regex", {
 df <- tibble(x = c("Foo and Bar", "baz and qux and quux"))

Expand Down

, '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-13448: [R] Bindings for strftime#11105

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

rok
wants to merge
8
commits into

from

 Closed


ARROW-13448: [R] Bindings for strftime
#11105
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
588304e

Adding StrftimeOptions.


rok Sep 7, 2021
463f142

Review feedback implementation.


rok Sep 16, 2021
4678968

Update r/tests/testthat/test-dplyr-string-functions.R


rok Sep 17, 2021
a41a7d5

Review feedback.


rok Sep 20, 2021
9e633c7

Disabling %c flag.


rok Sep 21, 2021
6af5ad4

Adding format_ISO8601, movint %c check to c++.


rok Sep 22, 2021
3a74ae6

Update r/R/dplyr-functions.R


rok Sep 22, 2021
d45cd22

Update r/R/dplyr-functions.R


rok Sep 23, 2021

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


5 changes: 5 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_temporal.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -529,6 +529,11 @@ struct Strftime {
 const StrftimeOptions& options = StrftimeState::Get(ctx);

 auto timezone = GetInputTimezone(type);
 // This check is due to surprising %c behavior.
 // See https://github.com/HowardHinnant/date/issues/704
 if ((options.format.find("%c") != std::string::npos) && (options.locale != "C")) {
 return Status::Invalid("%c flag is not supported in non-C locales.");
 }
 if (timezone.empty()) {
 if ((options.format.find("%z") != std::string::npos) ||
 (options.format.find("%Z") != std::string::npos)) {
Expand Down

2 changes: 1 addition & 1 deletion
python/pyarrow/tests/test_compute.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1560,7 +1560,7 @@ def _fix_timestamp(s):

 formats = ["%a", "%A", "%w", "%d", "%b", "%B", "%m", "%y", "%Y", "%H",
 "%I", "%p", "%M", "%z", "%Z", "%j", "%U", "%W", "%c", "%x",
 "%X", "%%", "%G", "%V", "%u", "%V"]
 "%X", "%%", "%G", "%V", "%u"]

 for timezone in timezones:
 ts = pd.to_datetime(times).tz_localize(timezone)
Expand Down

42 changes: 42 additions & 0 deletions
r/R/dplyr-functions.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -672,6 +672,48 @@ nse_funcs$strptime <- function(x, format = "%Y-%m-%d %H:%M:%S", tz = NULL, unit
 Expression$create("strptime", x, options = list(format = format, unit = unit))
}

nse_funcs$strftime <- function(x, format = "", tz = "", usetz = FALSE) {
 if (usetz) {
 format <- paste(format, "%Z")
 }
 if (tz == "") {
 tz <- Sys.timezone()
 }
 # Arrow's strftime prints in timezone of the timestamp. To match R's strftime behavior we first
 # cast the timestamp to desired timezone. This is a metadata only change.
 ts <- Expression$create("cast", x, options = list(to_type = timestamp(x$type()$unit(), tz)))
 Expression$create("strftime", ts, options = list(format = format, locale = Sys.getlocale("LC_TIME")))
}

nse_funcs$format_ISO8601 <- function(x, usetz = FALSE, precision = NULL, ...) {
 ISO8601_precision_map <-
 list(y = "%Y",
 ym = "%Y-%m",
 ymd = "%Y-%m-%d",
 ymdh = "%Y-%m-%dT%H",
 ymdhm = "%Y-%m-%dT%H:%M",
 ymdhms = "%Y-%m-%dT%H:%M:%S")

 if (is.null(precision)) {
 precision <- "ymdhms"
 }
 if (!precision %in% names(ISO8601_precision_map)) {
 abort(
 paste(
 "`precision` must be one of the following values:",
 paste(names(ISO8601_precision_map), collapse = ", "),
 "\nValue supplied was: ",
 precision
 )
 )
 }
 format <- ISO8601_precision_map[[precision]]
 if (usetz) {
 format <- paste0(format, "%z")
 }
 Expression$create("strftime", x, options = list(format = format, locale = "C"))
}

nse_funcs$second <- function(x) {
 Expression$create("add", Expression$create("second", x), Expression$create("subsecond", x))
}
Expand Down

7 changes: 7 additions & 0 deletions
r/src/compute.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,6 +332,13 @@ std::shared_ptr<arrow::compute::FunctionOptions> make_compute_options(
 cpp11::as_cpp<arrow::TimeUnit::type>(options["unit"]));
 }

 if (func_name == "strftime") {
 using Options = arrow::compute::StrftimeOptions;
 return std::make_shared<Options>(
 Options(cpp11::as_cpp<std::string>(options["format"]),
 cpp11::as_cpp<std::string>(options["locale"])));
 }
Comment thread
rok marked this conversation as resolved.


 if (func_name == "assume_timezone") {
 using Options = arrow::compute::AssumeTimezoneOptions;
 enum Options::Ambiguous ambiguous;
Expand Down

99 changes: 99 additions & 0 deletions
r/tests/testthat/test-dplyr-string-functions.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ skip_if_not_available("dataset")
skip_if_not_available("utf8proc")

library(dplyr)
library(lubridate)
library(stringr)
library(stringi)

Expand DownExpand Up@@ -719,6 +720,104 @@ test_that("errors in strptime", {
 )
})

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

 times <- tibble(x = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Etc/GMT+6"), NA))
 seconds <- tibble(x = c("05.000000", 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"

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats)) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "Pacific/Marquesas")) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "EST", usetz = TRUE)) %>%
 collect(),
 times
 )

 withr::with_timezone("Pacific/Marquesas",
 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "EST")) %>%
 collect(),
 times
 )
 )

 # This check is due to differences in the way %c currently works in Arrow and R's strftime.
 # We can revisit after https://github.com/HowardHinnant/date/issues/704 is resolved.
 expect_error(
 times %>%
 Table$create() %>%
 mutate(x = strftime(x, format = "%c")) %>%
 collect(),
 "%c flag is not supported in non-C locales."
 )

 # Output precision of %S depends on the input timestamp precision.
 # Timestamps with second precision are represented as integers while
 # milliseconds, microsecond and nanoseconds are represented as fixed floating
 # point numbers with 3, 6 and 9 decimal places respectively.
 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = "%S")) %>%
 transmute(as.double(substr(x, 1, 2))) %>%
 collect(),
 times,
 tolerance = 1e-6
 )
})

test_that("format_ISO8601", {
 skip_on_os("windows") # https://issues.apache.org/jira/browse/ARROW-13168
 times <- tibble(x = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Etc/GMT+6"), NA))

 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymd", usetz = FALSE)) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymd", usetz = TRUE)) %>%
 collect(),
 times
 )

 # See comment regarding %S flag in strftime tests
 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymdhms", usetz = FALSE)) %>%
 mutate(x = gsub("\\.0*", "", x)) %>%
 collect(),
 times
 )

 # See comment regarding %S flag in strftime tests
 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymdhms", usetz = TRUE)) %>%
 mutate(x = gsub("\\.0*", "", x)) %>%
 collect(),
 times
 )
})

test_that("arrow_find_substring and arrow_find_substring_regex", {
 df <- tibble(x = c("Foo and Bar", "baz and qux and quux"))

Expand Down

, '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-13448: [R] Bindings for strftime#11105

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

rok
wants to merge
8
commits into

from

 Closed


ARROW-13448: [R] Bindings for strftime
#11105
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
588304e

Adding StrftimeOptions.


rok Sep 7, 2021
463f142

Review feedback implementation.


rok Sep 16, 2021
4678968

Update r/tests/testthat/test-dplyr-string-functions.R


rok Sep 17, 2021
a41a7d5

Review feedback.


rok Sep 20, 2021
9e633c7

Disabling %c flag.


rok Sep 21, 2021
6af5ad4

Adding format_ISO8601, movint %c check to c++.


rok Sep 22, 2021
3a74ae6

Update r/R/dplyr-functions.R


rok Sep 22, 2021
d45cd22

Update r/R/dplyr-functions.R


rok Sep 23, 2021

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


5 changes: 5 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_temporal.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -529,6 +529,11 @@ struct Strftime {
 const StrftimeOptions& options = StrftimeState::Get(ctx);

 auto timezone = GetInputTimezone(type);
 // This check is due to surprising %c behavior.
 // See https://github.com/HowardHinnant/date/issues/704
 if ((options.format.find("%c") != std::string::npos) && (options.locale != "C")) {
 return Status::Invalid("%c flag is not supported in non-C locales.");
 }
 if (timezone.empty()) {
 if ((options.format.find("%z") != std::string::npos) ||
 (options.format.find("%Z") != std::string::npos)) {
Expand Down

2 changes: 1 addition & 1 deletion
python/pyarrow/tests/test_compute.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1560,7 +1560,7 @@ def _fix_timestamp(s):

 formats = ["%a", "%A", "%w", "%d", "%b", "%B", "%m", "%y", "%Y", "%H",
 "%I", "%p", "%M", "%z", "%Z", "%j", "%U", "%W", "%c", "%x",
 "%X", "%%", "%G", "%V", "%u", "%V"]
 "%X", "%%", "%G", "%V", "%u"]

 for timezone in timezones:
 ts = pd.to_datetime(times).tz_localize(timezone)
Expand Down

42 changes: 42 additions & 0 deletions
r/R/dplyr-functions.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -672,6 +672,48 @@ nse_funcs$strptime <- function(x, format = "%Y-%m-%d %H:%M:%S", tz = NULL, unit
 Expression$create("strptime", x, options = list(format = format, unit = unit))
}

nse_funcs$strftime <- function(x, format = "", tz = "", usetz = FALSE) {
 if (usetz) {
 format <- paste(format, "%Z")
 }
 if (tz == "") {
 tz <- Sys.timezone()
 }
 # Arrow's strftime prints in timezone of the timestamp. To match R's strftime behavior we first
 # cast the timestamp to desired timezone. This is a metadata only change.
 ts <- Expression$create("cast", x, options = list(to_type = timestamp(x$type()$unit(), tz)))
 Expression$create("strftime", ts, options = list(format = format, locale = Sys.getlocale("LC_TIME")))
}

nse_funcs$format_ISO8601 <- function(x, usetz = FALSE, precision = NULL, ...) {
 ISO8601_precision_map <-
 list(y = "%Y",
 ym = "%Y-%m",
 ymd = "%Y-%m-%d",
 ymdh = "%Y-%m-%dT%H",
 ymdhm = "%Y-%m-%dT%H:%M",
 ymdhms = "%Y-%m-%dT%H:%M:%S")

 if (is.null(precision)) {
 precision <- "ymdhms"
 }
 if (!precision %in% names(ISO8601_precision_map)) {
 abort(
 paste(
 "`precision` must be one of the following values:",
 paste(names(ISO8601_precision_map), collapse = ", "),
 "\nValue supplied was: ",
 precision
 )
 )
 }
 format <- ISO8601_precision_map[[precision]]
 if (usetz) {
 format <- paste0(format, "%z")
 }
 Expression$create("strftime", x, options = list(format = format, locale = "C"))
}

nse_funcs$second <- function(x) {
 Expression$create("add", Expression$create("second", x), Expression$create("subsecond", x))
}
Expand Down

7 changes: 7 additions & 0 deletions
r/src/compute.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,6 +332,13 @@ std::shared_ptr<arrow::compute::FunctionOptions> make_compute_options(
 cpp11::as_cpp<arrow::TimeUnit::type>(options["unit"]));
 }

 if (func_name == "strftime") {
 using Options = arrow::compute::StrftimeOptions;
 return std::make_shared<Options>(
 Options(cpp11::as_cpp<std::string>(options["format"]),
 cpp11::as_cpp<std::string>(options["locale"])));
 }
Comment thread
rok marked this conversation as resolved.


 if (func_name == "assume_timezone") {
 using Options = arrow::compute::AssumeTimezoneOptions;
 enum Options::Ambiguous ambiguous;
Expand Down

99 changes: 99 additions & 0 deletions
r/tests/testthat/test-dplyr-string-functions.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ skip_if_not_available("dataset")
skip_if_not_available("utf8proc")

library(dplyr)
library(lubridate)
library(stringr)
library(stringi)

Expand DownExpand Up@@ -719,6 +720,104 @@ test_that("errors in strptime", {
 )
})

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

 times <- tibble(x = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Etc/GMT+6"), NA))
 seconds <- tibble(x = c("05.000000", 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"

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats)) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "Pacific/Marquesas")) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "EST", usetz = TRUE)) %>%
 collect(),
 times
 )

 withr::with_timezone("Pacific/Marquesas",
 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "EST")) %>%
 collect(),
 times
 )
 )

 # This check is due to differences in the way %c currently works in Arrow and R's strftime.
 # We can revisit after https://github.com/HowardHinnant/date/issues/704 is resolved.
 expect_error(
 times %>%
 Table$create() %>%
 mutate(x = strftime(x, format = "%c")) %>%
 collect(),
 "%c flag is not supported in non-C locales."
 )

 # Output precision of %S depends on the input timestamp precision.
 # Timestamps with second precision are represented as integers while
 # milliseconds, microsecond and nanoseconds are represented as fixed floating
 # point numbers with 3, 6 and 9 decimal places respectively.
 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = "%S")) %>%
 transmute(as.double(substr(x, 1, 2))) %>%
 collect(),
 times,
 tolerance = 1e-6
 )
})

test_that("format_ISO8601", {
 skip_on_os("windows") # https://issues.apache.org/jira/browse/ARROW-13168
 times <- tibble(x = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Etc/GMT+6"), NA))

 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymd", usetz = FALSE)) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymd", usetz = TRUE)) %>%
 collect(),
 times
 )

 # See comment regarding %S flag in strftime tests
 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymdhms", usetz = FALSE)) %>%
 mutate(x = gsub("\\.0*", "", x)) %>%
 collect(),
 times
 )

 # See comment regarding %S flag in strftime tests
 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymdhms", usetz = TRUE)) %>%
 mutate(x = gsub("\\.0*", "", x)) %>%
 collect(),
 times
 )
})

test_that("arrow_find_substring and arrow_find_substring_regex", {
 df <- tibble(x = c("Foo and Bar", "baz and qux and quux"))

Expand Down

, '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-13448: [R] Bindings for strftime#11105

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

rok
wants to merge
8
commits into

from

 Closed


ARROW-13448: [R] Bindings for strftime
#11105
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
588304e

Adding StrftimeOptions.


rok Sep 7, 2021
463f142

Review feedback implementation.


rok Sep 16, 2021
4678968

Update r/tests/testthat/test-dplyr-string-functions.R


rok Sep 17, 2021
a41a7d5

Review feedback.


rok Sep 20, 2021
9e633c7

Disabling %c flag.


rok Sep 21, 2021
6af5ad4

Adding format_ISO8601, movint %c check to c++.


rok Sep 22, 2021
3a74ae6

Update r/R/dplyr-functions.R


rok Sep 22, 2021
d45cd22

Update r/R/dplyr-functions.R


rok Sep 23, 2021

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


5 changes: 5 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_temporal.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -529,6 +529,11 @@ struct Strftime {
 const StrftimeOptions& options = StrftimeState::Get(ctx);

 auto timezone = GetInputTimezone(type);
 // This check is due to surprising %c behavior.
 // See https://github.com/HowardHinnant/date/issues/704
 if ((options.format.find("%c") != std::string::npos) && (options.locale != "C")) {
 return Status::Invalid("%c flag is not supported in non-C locales.");
 }
 if (timezone.empty()) {
 if ((options.format.find("%z") != std::string::npos) ||
 (options.format.find("%Z") != std::string::npos)) {
Expand Down

2 changes: 1 addition & 1 deletion
python/pyarrow/tests/test_compute.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1560,7 +1560,7 @@ def _fix_timestamp(s):

 formats = ["%a", "%A", "%w", "%d", "%b", "%B", "%m", "%y", "%Y", "%H",
 "%I", "%p", "%M", "%z", "%Z", "%j", "%U", "%W", "%c", "%x",
 "%X", "%%", "%G", "%V", "%u", "%V"]
 "%X", "%%", "%G", "%V", "%u"]

 for timezone in timezones:
 ts = pd.to_datetime(times).tz_localize(timezone)
Expand Down

42 changes: 42 additions & 0 deletions
r/R/dplyr-functions.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -672,6 +672,48 @@ nse_funcs$strptime <- function(x, format = "%Y-%m-%d %H:%M:%S", tz = NULL, unit
 Expression$create("strptime", x, options = list(format = format, unit = unit))
}

nse_funcs$strftime <- function(x, format = "", tz = "", usetz = FALSE) {
 if (usetz) {
 format <- paste(format, "%Z")
 }
 if (tz == "") {
 tz <- Sys.timezone()
 }
 # Arrow's strftime prints in timezone of the timestamp. To match R's strftime behavior we first
 # cast the timestamp to desired timezone. This is a metadata only change.
 ts <- Expression$create("cast", x, options = list(to_type = timestamp(x$type()$unit(), tz)))
 Expression$create("strftime", ts, options = list(format = format, locale = Sys.getlocale("LC_TIME")))
}

nse_funcs$format_ISO8601 <- function(x, usetz = FALSE, precision = NULL, ...) {
 ISO8601_precision_map <-
 list(y = "%Y",
 ym = "%Y-%m",
 ymd = "%Y-%m-%d",
 ymdh = "%Y-%m-%dT%H",
 ymdhm = "%Y-%m-%dT%H:%M",
 ymdhms = "%Y-%m-%dT%H:%M:%S")

 if (is.null(precision)) {
 precision <- "ymdhms"
 }
 if (!precision %in% names(ISO8601_precision_map)) {
 abort(
 paste(
 "`precision` must be one of the following values:",
 paste(names(ISO8601_precision_map), collapse = ", "),
 "\nValue supplied was: ",
 precision
 )
 )
 }
 format <- ISO8601_precision_map[[precision]]
 if (usetz) {
 format <- paste0(format, "%z")
 }
 Expression$create("strftime", x, options = list(format = format, locale = "C"))
}

nse_funcs$second <- function(x) {
 Expression$create("add", Expression$create("second", x), Expression$create("subsecond", x))
}
Expand Down

7 changes: 7 additions & 0 deletions
r/src/compute.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,6 +332,13 @@ std::shared_ptr<arrow::compute::FunctionOptions> make_compute_options(
 cpp11::as_cpp<arrow::TimeUnit::type>(options["unit"]));
 }

 if (func_name == "strftime") {
 using Options = arrow::compute::StrftimeOptions;
 return std::make_shared<Options>(
 Options(cpp11::as_cpp<std::string>(options["format"]),
 cpp11::as_cpp<std::string>(options["locale"])));
 }
Comment thread
rok marked this conversation as resolved.


 if (func_name == "assume_timezone") {
 using Options = arrow::compute::AssumeTimezoneOptions;
 enum Options::Ambiguous ambiguous;
Expand Down

99 changes: 99 additions & 0 deletions
r/tests/testthat/test-dplyr-string-functions.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ skip_if_not_available("dataset")
skip_if_not_available("utf8proc")

library(dplyr)
library(lubridate)
library(stringr)
library(stringi)

Expand DownExpand Up@@ -719,6 +720,104 @@ test_that("errors in strptime", {
 )
})

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

 times <- tibble(x = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Etc/GMT+6"), NA))
 seconds <- tibble(x = c("05.000000", 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"

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats)) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "Pacific/Marquesas")) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "EST", usetz = TRUE)) %>%
 collect(),
 times
 )

 withr::with_timezone("Pacific/Marquesas",
 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = formats, tz = "EST")) %>%
 collect(),
 times
 )
 )

 # This check is due to differences in the way %c currently works in Arrow and R's strftime.
 # We can revisit after https://github.com/HowardHinnant/date/issues/704 is resolved.
 expect_error(
 times %>%
 Table$create() %>%
 mutate(x = strftime(x, format = "%c")) %>%
 collect(),
 "%c flag is not supported in non-C locales."
 )

 # Output precision of %S depends on the input timestamp precision.
 # Timestamps with second precision are represented as integers while
 # milliseconds, microsecond and nanoseconds are represented as fixed floating
 # point numbers with 3, 6 and 9 decimal places respectively.
 expect_dplyr_equal(
 input %>%
 mutate(x = strftime(x, format = "%S")) %>%
 transmute(as.double(substr(x, 1, 2))) %>%
 collect(),
 times,
 tolerance = 1e-6
 )
})

test_that("format_ISO8601", {
 skip_on_os("windows") # https://issues.apache.org/jira/browse/ARROW-13168
 times <- tibble(x = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Etc/GMT+6"), NA))

 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymd", usetz = FALSE)) %>%
 collect(),
 times
 )

 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymd", usetz = TRUE)) %>%
 collect(),
 times
 )

 # See comment regarding %S flag in strftime tests
 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymdhms", usetz = FALSE)) %>%
 mutate(x = gsub("\\.0*", "", x)) %>%
 collect(),
 times
 )

 # See comment regarding %S flag in strftime tests
 expect_dplyr_equal(
 input %>%
 mutate(x = format_ISO8601(x, precision = "ymdhms", usetz = TRUE)) %>%
 mutate(x = gsub("\\.0*", "", x)) %>%
 collect(),
 times
 )
})

test_that("arrow_find_substring and arrow_find_substring_regex", {
 df <- tibble(x = c("Foo and Bar", "baz and qux and quux"))

Expand Down