Add telemetry for voluntary fallback

tidyverse · Mar 10, 2024 · ee6291b · ee6291b
1 parent 6d57f58
commit ee6291b
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 6 deletions.
diff --git a/R/dplyr_col_modify.R b/R/dplyr_col_modify.R
@@ -4,7 +4,7 @@ dplyr_col_modify.duckplyr_df <- function(data, cols) {
   # Our implementation
   rel_try(
     # Always fall back to dplyr
-    "No relational implementation for dplyr_col_modify()" = TRUE,
+    "-" = TRUE,
     {
       return(out)
     }

diff --git a/R/dplyr_row_slice.R b/R/dplyr_row_slice.R
@@ -4,7 +4,7 @@ dplyr_row_slice.duckplyr_df <- function(data, i, ...) {
   # Our implementation
   rel_try(
     # Always fall back to dplyr
-    "No relational implementation for dplyr_row_slice()" = TRUE,
+    "-" = TRUE,
     {
       return(out)
     }

diff --git a/R/group_data.R b/R/group_data.R
@@ -4,7 +4,7 @@ group_data.duckplyr_df <- function(.data) {
   # Our implementation
   rel_try(
     # Always fall back to dplyr
-    "No relational implementation for group_data()" = TRUE,
+    "-" = TRUE,
     {
       return(out)
     }

diff --git a/R/relational.R b/R/relational.R
@@ -26,8 +26,13 @@ rel_try <- function(rel, ..., call = NULL) {
     if (isTRUE(dots[[i]])) {
       stats$fallback <- stats$fallback + 1L
       if (!dplyr_mode) {
+        message <- names(dots)[[i]]
+        if (message != "-") {
+          tel_collect(message, call)
+        }
+
         if (Sys.getenv("DUCKPLYR_FALLBACK_INFO") == "TRUE") {
-          inform(message = c("Requested fallback for relational:", i = names(dots)[[i]]))
+          inform(message = c("Requested fallback for relational:", i = message))
         }
         if (Sys.getenv("DUCKPLYR_FORCE") == "TRUE") {
           cli::cli_abort("Fallback not available with {.envvar DUCKPLYR_FORCE}.")

diff --git a/tests/testthat/_snaps/fallback.md b/tests/testthat/_snaps/fallback.md
@@ -208,3 +208,16 @@
       1               1     2
       2               1     3
 
+# rel_try()
+
+    Code
+      tibble(a = 1) %>% as_duckplyr_df() %>% left_join(tibble(a = 1), by = "a", copy = TRUE)
+    Message
+      i dplyr fallback recorded
+        {"version":"0.3.1","message":"No relational implementation for left_join(copy = TRUE)","name":"left_join","x":{"...1":"numeric"},"y":{"...1":"numeric"},"args":{"by":{"condition":"==","filter":"none","x":["...1"],"y":["...1"]},"copy":true,"na_matches":["na","never"],"multiple":"all","unmatched":"drop"}}
+    Output
+      # A tibble: 1 x 1
+            a
+        <dbl>
+      1     1
+
diff --git a/tests/testthat/test-fallback.R b/tests/testthat/test-fallback.R
@@ -221,3 +221,18 @@ test_that("__row_number", {
       arrange(b)
   })
 })
+
+test_that("rel_try()", {
+  withr::local_envvar(c(
+    "DUCKPLYR_FALLBACK_COLLECT" = "1",
+    "DUCKPLYR_FALLBACK_VERBOSE" = "TRUE",
+    "DUCKPLYR_FALLBACK_LOG_DIR" = tempdir(),
+    "DUCKPLYR_OUTPUT_ORDER" = "TRUE"
+  ))
+
+  expect_snapshot({
+    tibble(a = 1) %>%
+      as_duckplyr_df() %>%
+      left_join(tibble(a = 1), by = "a", copy = TRUE)
+  })
+})
diff --git a/tests/testthat/test-telemetry.R b/tests/testthat/test-telemetry.R
@@ -7,7 +7,7 @@ test_that("telemetry and anti_join()", {
       anti_join(
         tibble(a = 1:3, b = 4:6),
         by = "a",
-        copy = TRUE,
+        copy = FALSE,
         na_matches = "na"
       )
   })
@@ -18,7 +18,7 @@ test_that("telemetry and anti_join()", {
       anti_join(
         tibble(a = 1:3, b = 4:6),
         by = c("a" = "b"),
-        copy = TRUE,
+        copy = FALSE,
         na_matches = "na"
       )
   })