Skip to content

feat: Use r_base::%in% #292

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

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

feat: Use r_base::%in% #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf00756
DRAFT
krlmlr Oct 27, 2024
ac742ef
21
krlmlr Oct 27, 2024
82a18b0
Load
krlmlr Oct 27, 2024
b3e03aa
Merge branch 'main' into f-in
krlmlr Nov 6, 2024
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
12 changes: 9 additions & 3 deletions R/relational-duckdb.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ to_duckdb_expr <- function(x) {
relational_relexpr_constant = {
# FIXME: Should be duckdb's responsibility
# Example: https://github.com/dschafer/activatr/issues/18
check_df_for_rel(tibble(constant = x$val))
# check_df_for_rel(tibble(constant = x$val))

if ("experimental" %in% names(formals(duckdb$expr_constant))) {
experimental <- (Sys.getenv("DUCKPLYR_EXPERIMENTAL") == "TRUE")
Expand Down Expand Up @@ -498,14 +498,20 @@ to_duckdb_expr_meta <- function(x) {
out
},
relational_relexpr_constant = {
if (is.atomic(x$val)) {
val <- x$val
} else {
val <- parse(text = constructive::construct(x$val))[[1]]
}

out <- expr(
# FIXME: always pass experimental flag once it's merged
if ("experimental" %in% names(formals(duckdb$expr_constant))) {
# experimental is set at the top,
# the sym() gymnastics are to satisfy R CMD check
duckdb$expr_constant(!!x$val, experimental = !!sym("experimental"))
duckdb$expr_constant(!!val, experimental = !!sym("experimental"))
} else {
duckdb$expr_constant(!!x$val)
duckdb$expr_constant(!!val)
}
)

Expand Down
2 changes: 2 additions & 0 deletions R/translate.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,8 @@ rel_translate_lang <- function(
}

lhs <- do_translate(expr[[2]])
meta_ext_register()
return(relexpr_function("r_base::%in%", list(lhs, relexpr_constant(list(values)))))

if (anyNA(values)) {
has_na <- TRUE
Expand Down
172 changes: 40 additions & 132 deletions tests/testthat/test-rel_api.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3496,8 +3496,6 @@ test_that("relational filter(a %in% 2:3, g == 2) order-preserving", {
con <- DBI::dbConnect(drv)
experimental <- FALSE
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
invisible(DBI::dbExecute(con, 'CREATE MACRO "|"(x, y) AS (x OR y)'))
df1 <- data.frame(a = seq(1, 6, by = 1), b = rep(2, 6L), g = c(1L, 2L, 2L, 3L, 3L, 3L))

"filter"
Expand Down Expand Up @@ -3533,39 +3531,13 @@ test_that("relational filter(a %in% 2:3, g == 2) order-preserving", {
rel2,
list(
duckdb$expr_function(
"___coalesce",
"r_base::%in%",
list(
duckdb$expr_function(
"|",
list(
duckdb$expr_function(
"r_base::==",
list(
duckdb$expr_reference("a"),
if ("experimental" %in% names(formals(duckdb$expr_constant))) {
duckdb$expr_constant(2L, experimental = experimental)
} else {
duckdb$expr_constant(2L)
}
)
),
duckdb$expr_function(
"r_base::==",
list(
duckdb$expr_reference("a"),
if ("experimental" %in% names(formals(duckdb$expr_constant))) {
duckdb$expr_constant(3L, experimental = experimental)
} else {
duckdb$expr_constant(3L)
}
)
)
)
),
duckdb$expr_reference("a"),
if ("experimental" %in% names(formals(duckdb$expr_constant))) {
duckdb$expr_constant(FALSE, experimental = experimental)
duckdb$expr_constant(list(2:3), experimental = experimental)
} else {
duckdb$expr_constant(FALSE)
duckdb$expr_constant(list(2:3))
}
)
),
Expand Down Expand Up @@ -3622,8 +3594,6 @@ test_that("relational filter(a %in% 2:3 & g == 2) order-preserving", {
experimental <- FALSE
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
invisible(DBI::dbExecute(con, 'CREATE MACRO "&"(x, y) AS (x AND y)'))
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
invisible(DBI::dbExecute(con, 'CREATE MACRO "|"(x, y) AS (x OR y)'))
df1 <- data.frame(a = seq(1, 6, by = 1), b = rep(2, 6L), g = c(1L, 2L, 2L, 3L, 3L, 3L))

"filter"
Expand Down Expand Up @@ -3662,39 +3632,13 @@ test_that("relational filter(a %in% 2:3 & g == 2) order-preserving", {
"&",
list(
duckdb$expr_function(
"___coalesce",
"r_base::%in%",
list(
duckdb$expr_function(
"|",
list(
duckdb$expr_function(
"r_base::==",
list(
duckdb$expr_reference("a"),
if ("experimental" %in% names(formals(duckdb$expr_constant))) {
duckdb$expr_constant(2L, experimental = experimental)
} else {
duckdb$expr_constant(2L)
}
)
),
duckdb$expr_function(
"r_base::==",
list(
duckdb$expr_reference("a"),
if ("experimental" %in% names(formals(duckdb$expr_constant))) {
duckdb$expr_constant(3L, experimental = experimental)
} else {
duckdb$expr_constant(3L)
}
)
)
)
),
duckdb$expr_reference("a"),
if ("experimental" %in% names(formals(duckdb$expr_constant))) {
duckdb$expr_constant(FALSE, experimental = experimental)
duckdb$expr_constant(list(2:3), experimental = experimental)
} else {
duckdb$expr_constant(FALSE)
duckdb$expr_constant(list(2:3))
}
)
),
Expand Down Expand Up @@ -3899,8 +3843,6 @@ test_that("relational filter(a %in% 2:3, g == 2) order-enforcing", {
con <- DBI::dbConnect(drv)
experimental <- FALSE
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
invisible(DBI::dbExecute(con, 'CREATE MACRO "|"(x, y) AS (x OR y)'))
df1 <- data.frame(a = seq(1, 6, by = 1), b = rep(2, 6L), g = c(1L, 2L, 2L, 3L, 3L, 3L))

"filter"
Expand All @@ -3910,39 +3852,13 @@ test_that("relational filter(a %in% 2:3, g == 2) order-enforcing", {
rel1,
list(
duckdb$expr_function(
"___coalesce",
"r_base::%in%",
list(
duckdb$expr_function(
"|",
list(
duckdb$expr_function(
"r_base::==",
list(
duckdb$expr_reference("a"),
if ("experimental" %in% names(formals(duckdb$expr_constant))) {
duckdb$expr_constant(2L, experimental = experimental)
} else {
duckdb$expr_constant(2L)
}
)
),
duckdb$expr_function(
"r_base::==",
list(
duckdb$expr_reference("a"),
if ("experimental" %in% names(formals(duckdb$expr_constant))) {
duckdb$expr_constant(3L, experimental = experimental)
} else {
duckdb$expr_constant(3L)
}
)
)
)
),
duckdb$expr_reference("a"),
if ("experimental" %in% names(formals(duckdb$expr_constant))) {
duckdb$expr_constant(FALSE, experimental = experimental)
duckdb$expr_constant(list(2:3), experimental = experimental)
} else {
duckdb$expr_constant(FALSE)
duckdb$expr_constant(list(2:3))
}
)
),
Expand Down Expand Up @@ -3981,8 +3897,6 @@ test_that("relational filter(a %in% 2:3 & g == 2) order-enforcing", {
experimental <- FALSE
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
invisible(DBI::dbExecute(con, 'CREATE MACRO "&"(x, y) AS (x AND y)'))
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
invisible(DBI::dbExecute(con, 'CREATE MACRO "|"(x, y) AS (x OR y)'))
df1 <- data.frame(a = seq(1, 6, by = 1), b = rep(2, 6L), g = c(1L, 2L, 2L, 3L, 3L, 3L))

"filter"
Expand All @@ -3995,39 +3909,13 @@ test_that("relational filter(a %in% 2:3 & g == 2) order-enforcing", {
"&",
list(
duckdb$expr_function(
"___coalesce",
"r_base::%in%",
list(
duckdb$expr_function(
"|",
list(
duckdb$expr_function(
"r_base::==",
list(
duckdb$expr_reference("a"),
if ("experimental" %in% names(formals(duckdb$expr_constant))) {
duckdb$expr_constant(2L, experimental = experimental)
} else {
duckdb$expr_constant(2L)
}
)
),
duckdb$expr_function(
"r_base::==",
list(
duckdb$expr_reference("a"),
if ("experimental" %in% names(formals(duckdb$expr_constant))) {
duckdb$expr_constant(3L, experimental = experimental)
} else {
duckdb$expr_constant(3L)
}
)
)
)
),
duckdb$expr_reference("a"),
if ("experimental" %in% names(formals(duckdb$expr_constant))) {
duckdb$expr_constant(FALSE, experimental = experimental)
duckdb$expr_constant(list(2:3), experimental = experimental)
} else {
duckdb$expr_constant(FALSE)
duckdb$expr_constant(list(2:3))
}
)
),
Expand Down Expand Up @@ -9069,7 +8957,7 @@ test_that("relational mutate(d = a %in% NA_real_) order-preserving", {
drv <- duckdb::duckdb()
con <- DBI::dbConnect(drv)
experimental <- FALSE
invisible(DBI::dbExecute(con, 'CREATE MACRO "is.na"(x) AS (x IS NULL OR isnan(x))'))
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
df1 <- data.frame(a = seq(1, 6, by = 1), b = rep(2, 6L), g = c(1L, 2L, 2L, 3L, 3L, 3L))

"mutate"
Expand All @@ -9094,7 +8982,17 @@ test_that("relational mutate(d = a %in% NA_real_) order-preserving", {
tmp_expr
},
{
tmp_expr <- duckdb$expr_function("is.na", list(duckdb$expr_reference("a")))
tmp_expr <- duckdb$expr_function(
"r_base::%in%",
list(
duckdb$expr_reference("a"),
if ("experimental" %in% names(formals(duckdb$expr_constant))) {
duckdb$expr_constant(list(NA_real_), experimental = experimental)
} else {
duckdb$expr_constant(list(NA_real_))
}
)
)
duckdb$expr_set_alias(tmp_expr, "d")
tmp_expr
}
Expand Down Expand Up @@ -13142,7 +13040,7 @@ test_that("relational mutate(d = a %in% NA_real_) order-enforcing", {
drv <- duckdb::duckdb()
con <- DBI::dbConnect(drv)
experimental <- FALSE
invisible(DBI::dbExecute(con, 'CREATE MACRO "is.na"(x) AS (x IS NULL OR isnan(x))'))
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
df1 <- data.frame(a = seq(1, 6, by = 1), b = rep(2, 6L), g = c(1L, 2L, 2L, 3L, 3L, 3L))

"mutate"
Expand All @@ -13167,7 +13065,17 @@ test_that("relational mutate(d = a %in% NA_real_) order-enforcing", {
tmp_expr
},
{
tmp_expr <- duckdb$expr_function("is.na", list(duckdb$expr_reference("a")))
tmp_expr <- duckdb$expr_function(
"r_base::%in%",
list(
duckdb$expr_reference("a"),
if ("experimental" %in% names(formals(duckdb$expr_constant))) {
duckdb$expr_constant(list(NA_real_), experimental = experimental)
} else {
duckdb$expr_constant(list(NA_real_))
}
)
)
duckdb$expr_set_alias(tmp_expr, "d")
tmp_expr
}
Expand Down
Loading