Skip to content

GH-47941: [R] Fix codegen.R error from dplyr pipe to base pipe change #47985

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
+15 −3
Draft

GH-47941: [R] Fix codegen.R error from dplyr pipe to base pipe change #47985

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
b843f33
Facor code into function so it runs as expected
thisisnic Oct 28, 2025
5db2c37
Update configure to fail if codegen fails
thisisnic Oct 28, 2025
87a1a2a
Also check codegen on Windows builds
thisisnic Oct 28, 2025
274edfa
Try differrent syntax
thisisnic Oct 29, 2025
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 r/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ UNAME=`uname -s`
if [ "$ARROW_R_DEV" = "true" ] && [ -f "data-raw/codegen.R" ]; then
echo "*** Generating code with data-raw/codegen.R"
${R_HOME}/bin/Rscript data-raw/codegen.R
CODEGEN_STATUS=$?
if [ $CODEGEN_STATUS -ne 0 ]; then
echo "*** ERROR: codegen.R failed"
exit 1
fi
fi

# Arrow requires C++17, so check for it
Expand Down
5 changes: 5 additions & 0 deletions r/configure.win
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ ARROW_USE_PKG_CONFIG=`echo $ARROW_USE_PKG_CONFIG | tr '[:upper:]' '[:lower:]'`
if [ "$ARROW_R_DEV" == "true" ]; then
echo "*** Generating code with data-raw/codegen.R"
"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" data-raw/codegen.R
CODEGEN_STATUS=$?
if [ $CODEGEN_STATUS -ne 0 ]; then
echo "*** ERROR: codegen.R failed"
exit 1
fi
fi

# Test if pkg-config is available to use
Expand Down
8 changes: 5 additions & 3 deletions r/data-raw/codegen.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,15 @@ suppressPackageStartupMessages({
library(vctrs)
})

cbind_unnested_functions <- function(data) {
vec_cbind(data, vec_rbind(!!!pull(data, functions)))
}

get_exported_functions <- function(decorations, export_tag) {
out <- decorations |>
filter(decoration %in% paste0(export_tag, "::export")) |>
mutate(functions = map(context, decor:::parse_cpp_function)) |>
{
vec_cbind(., vec_rbind(!!!pull(., functions)))
} |>
cbind_unnested_functions() |>
select(-functions) |>
mutate(decoration = sub("::export", "", decoration))
message(glue(
Expand Down
Loading