ARROW-9405: [R] Switch to cpp11

dev/release/rat_exclude_files.txt

@@ -248,6 +248,8 @@ r/man/*.Rd
 r/cran-comments.md
 r/vignettes/*.Rmd
 r/tests/testthat/test-*.txt
+r/inst/include/cpp11.hpp
+r/inst/include/cpp11/*.hpp
 .gitattributes
 ruby/red-arrow/.yardopts
 rust/arrow/test/data/*.csv

r/DESCRIPTION

@@ -23,15 +23,12 @@ Language: en-US
 LazyData: true
 SystemRequirements: C++11
 Biarch: true
-LinkingTo:
-    Rcpp (>= 1.0.1)
 Imports:
     assertthat,
     bit64,
     methods,
     purrr,
     R6,
-    Rcpp (>= 1.0.1),
     rlang,
     tidyselect,
     utils,

r/NAMESPACE

@@ -253,7 +253,6 @@ export(write_ipc_stream)
 export(write_parquet)
 export(write_to_raw)
 importFrom(R6,R6Class)
-importFrom(Rcpp,sourceCpp)
 importFrom(assertthat,assert_that)
 importFrom(assertthat,is.string)
 importFrom(bit64,print.integer64)

r/NEWS.md

@@ -35,6 +35,10 @@
 
 * S3 support is now enabled in binary macOS and Windows (Rtools40 only, i.e. R >= 4.0) packages
 
+## Other improvements
+
+* `arrow` now depends on [`cpp11`](https://cpp11.r-lib.org/), which brings more robust UTF-8 handling and faster compilation
+
 # arrow 1.0.1
 
 ## Bug fixes

r/R/arrow-package.R

@@ -19,7 +19,6 @@
 #' @importFrom purrr as_mapper map map2 map_chr map_dfr map_int map_lgl
 #' @importFrom assertthat assert_that is.string
 #' @importFrom rlang list2 %||% is_false abort dots_n warn enquo quo_is_null enquos is_integerish quos eval_tidy new_data_mask syms env env_bind as_label set_names
-#' @importFrom Rcpp sourceCpp
 #' @importFrom tidyselect vars_select
 #' @useDynLib arrow, .registration = TRUE
 #' @keywords internal

r/R/json.R

@@ -74,12 +74,7 @@ JsonTableReader$create <- function(file,
 #' @export
 JsonReadOptions <- R6Class("JsonReadOptions", inherit = ArrowObject)
 JsonReadOptions$create <- function(use_threads = option_use_threads(), block_size = 1048576L) {
-  shared_ptr(JsonReadOptions, json___ReadOptions__initialize(
-    list(
-      use_threads = use_threads,
-      block_size = block_size
-    )
-  ))
+  shared_ptr(JsonReadOptions, json___ReadOptions__initialize(use_threads, block_size))
 }
 
 #' @rdname CsvReadOptions
@@ -89,9 +84,5 @@ JsonReadOptions$create <- function(use_threads = option_use_threads(), block_siz
 #' @export
 JsonParseOptions <- R6Class("JsonParseOptions", inherit = ArrowObject)
 JsonParseOptions$create <- function(newlines_in_values = FALSE) {
-  shared_ptr(JsonParseOptions, json___ParseOptions__initialize(
-    list(
-      newlines_in_values = newlines_in_values
-    )
-  ))
+  shared_ptr(JsonParseOptions, json___ParseOptions__initialize(newlines_in_values))
 }

r/R/parquet.R

@@ -268,7 +268,8 @@ ParquetWriterPropertiesBuilder <- R6Class("ParquetWriterPropertiesBuilder", inhe
       )
     },
     set_compression_level = function(table, compression_level){
-      assert_that(is_integerish(compression_level))
+      # cast to integer but keep names
+      compression_level <- set_names(as.integer(compression_level), names(compression_level))
       private$.set(table, compression_level,
         parquet___ArrowWriterProperties___Builder__set_compression_levels
       )

r/R/schema.R

@@ -84,10 +84,7 @@ Schema <- R6Class("Schema",
   ),
   active = list(
     names = function() {
-      out <- Schema__field_names(self)
-      # Hack: Rcpp should set the encoding
-      Encoding(out) <- "UTF-8"
-      out
+      Schema__field_names(self)
     },
     num_fields = function() Schema__num_fields(self),
     fields = function() map(Schema__fields(self), shared_ptr, class = Field),

r/R/struct.R

@@ -24,7 +24,7 @@ StructType <- R6Class("StructType",
     GetFieldIndex = function(name) StructType__GetFieldIndex(self, name)
   )
 )
-StructType$create <- function(...) shared_ptr(StructType, struct_(.fields(list(...))))
+StructType$create <- function(...) shared_ptr(StructType, struct__(.fields(list(...))))
 
 #' @rdname data-type
 #' @export

r/R/table.R

@@ -192,7 +192,11 @@ Table$create <- function(..., schema = NULL) {
     names(dots) <- rep_len("", length(dots))
   }
   stopifnot(length(dots) > 0)
-  shared_ptr(Table, Table__from_dots(dots, schema))
+  if (all_record_batches(dots)) {
+    shared_ptr(Table, Table__from_record_batches(dots, schema))
+  } else {
+    shared_ptr(Table, Table__from_dots(dots, schema))
+  }
 }
 
 #' @export

r/README.md

@@ -107,7 +107,7 @@ Note that after any change to the C++ library, you must reinstall it and
 run `make clean` or `git clean -fdx .` to remove any cached object code
 in the `r/src/` directory before reinstalling the R package. This is
 only necessary if you make changes to the C++ library source; you do not
-need to manually purge object files if you are only editing R or Rcpp
+need to manually purge object files if you are only editing R or C++
 code inside `r/`.
 
 Once you’ve built the C++ library, you can install the R package and its
@@ -120,7 +120,7 @@ R -e 'install.packages(c("devtools", "roxygen2", "pkgdown", "covr")); devtools::
 R CMD INSTALL .
 ```
 
-If you need to set any compilation flags while building the Rcpp
+If you need to set any compilation flags while building the C++
 extensions, you can use the `ARROW_R_CXXFLAGS` environment variable. For
 example, if you are using `perf` to profile the R extensions, you may
 need to set
@@ -149,9 +149,9 @@ For any other build/configuration challenges, see the [C++ developer
 guide](https://arrow.apache.org/docs/developers/cpp/building.html) and
 `vignette("install", package = "arrow")`.
 
-### Editing Rcpp code
+### Editing C++ code
 
-The `arrow` package uses some customized tools on top of `Rcpp` to
+The `arrow` package uses some customized tools on top of `cpp11` to
 prepare its C++ code in `src/`. If you change C++ code in the R package,
 you will need to set the `ARROW_R_DEV` environment variable to `TRUE`
 (optionally, add it to your`~/.Renviron` file to persist across

r/data-raw/codegen.R

@@ -18,10 +18,10 @@
 # This file is used to generate code in the files
 # src/arrowExports.cpp and R/arrowExports.R
 #
-# This is similar to what Rcpp::compileAttributes() would do,
+# This is similar to what compileAttributes() would do,
 # with some arrow specific changes.
 #
-# Functions are decorated with [[arrow::export]] instead of [[Rcpp::export]]
+# Functions are decorated with [[arrow::export]]
 # and the generated code adds a layer of protection so that
 # the arrow package can be installed even when libarrow is not
 #
@@ -45,9 +45,6 @@ suppressPackageStartupMessages({
 get_exported_functions <- function(decorations, export_tag) {
   out <- decorations %>%
     filter(decoration %in% paste0(export_tag, "::export")) %>%
-    # the three lines below can be expressed with rap()
-    # more concisely
-    # rap(            ~ decor:::parse_cpp_function(context))
     mutate(functions = map(context, decor:::parse_cpp_function)) %>%
     { vec_cbind(., vec_rbind(!!!pull(., functions))) } %>%
     select(-functions) %>%
@@ -67,7 +64,7 @@ wrap_call <- function(name, return_type, args) {
   if(return_type == "void") {
     glue::glue("\t{call};\n\treturn R_NilValue;", .trim = FALSE)
   } else {
-    glue::glue("\treturn Rcpp::wrap({call});")
+    glue::glue("\treturn cpp11::as_sexp({call});")
   }
 }
 
@@ -81,13 +78,13 @@ cpp_functions_definitions <- arrow_exports %>%
     // {basename(file)}
     #if defined(ARROW_R_WITH_{toupper(decoration)})
     {return_type} {name}({real_params});
-    RcppExport SEXP _arrow_{name}({sexp_params}){{
-    BEGIN_RCPP
+    extern "C" SEXP _arrow_{name}({sexp_params}){{
+    BEGIN_CPP11
     {input_params}{return_line}{wrap_call(name, return_type, args)}
-    END_RCPP
+    END_CPP11
     }}
     #else
-    RcppExport SEXP _arrow_{name}({sexp_params}){{
+    extern "C" SEXP _arrow_{name}({sexp_params}){{
     \tRf_error("Cannot call {name}(). Please use arrow::install_arrow() to install required runtime libraries. ");
     }}
     #endif
@@ -96,7 +93,7 @@ cpp_functions_definitions <- arrow_exports %>%
       sep = "\n",
       real_params = glue_collapse_data(args, "{type} {name}"),
       sexp_params = glue_collapse_data(args, "SEXP {name}_sexp"),
-      input_params = glue_collapse_data(args, "\tRcpp::traits::input_parameter<{type}>::type {name}({name}_sexp);", sep = "\n"),
+      input_params = glue_collapse_data(args, "\tarrow::r::Input<{type}>::type {name}({name}_sexp);", sep = "\n"),
       return_line = if(nrow(args)) "\n" else ""
     )
   }) %>%
@@ -111,10 +108,10 @@ cpp_functions_registration <- arrow_exports %>%
 
 writeLines(con = "src/arrowExports.cpp", glue::glue('
 // Generated by using data-raw/codegen.R -> do not edit by hand
-#include "./arrow_exports.h"
-#include <Rcpp.h>
+#include <cpp11.hpp>
+#include <cpp11/declarations.hpp>
 
-using namespace Rcpp;
+#include "./arrow_exports.h"
 
 {cpp_functions_definitions}
 
@@ -145,7 +142,7 @@ static const R_CallMethodDef CallEntries[] = {{
 \t\t{{NULL, NULL, 0}}
 }};
 
-RcppExport void R_init_arrow(DllInfo* dll){{
+extern "C" void R_init_arrow(DllInfo* dll){{
   R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
   R_useDynamicSymbols(dll, FALSE);
 }}

r/inst/include/cpp11.hpp

@@ -0,0 +1,25 @@
+// cpp11 version: 0.2.1.9000
+// vendored on: 2020-08-20
+#pragma once
+
+#include "cpp11/R.hpp"
+#include "cpp11/altrep.hpp"
+#include "cpp11/as.hpp"
+#include "cpp11/attribute_proxy.hpp"
+#include "cpp11/data_frame.hpp"
+#include "cpp11/doubles.hpp"
+#include "cpp11/environment.hpp"
+#include "cpp11/external_pointer.hpp"
+#include "cpp11/function.hpp"
+#include "cpp11/integers.hpp"
+#include "cpp11/list.hpp"
+#include "cpp11/list_of.hpp"
+#include "cpp11/logicals.hpp"
+#include "cpp11/matrix.hpp"
+#include "cpp11/named_arg.hpp"
+#include "cpp11/protect.hpp"
+#include "cpp11/r_string.hpp"
+#include "cpp11/r_vector.hpp"
+#include "cpp11/raws.hpp"
+#include "cpp11/sexp.hpp"
+#include "cpp11/strings.hpp"

r/inst/include/cpp11/R.hpp

@@ -0,0 +1,49 @@
+// cpp11 version: 0.2.1.9000
+// vendored on: 2020-08-20
+#pragma once
+
+#include <limits>
+
+#include "R_ext/Arith.h"
+
+#undef FALSE
+#undef TRUE
+#undef NA_LOGICAL
+
+extern "C" {
+typedef enum {
+  FALSE = 0,
+  TRUE = 1,
+  NA_LOGICAL = std::numeric_limits<int>::min()
+} Rboolean;
+}
+
+#define R_EXT_BOOLEAN_H_
+
+#define R_NO_REMAP
+#define STRICT_R_HEADERS
+#include "Rinternals.h"
+#undef STRICT_R_HEADERS
+#undef R_NO_REMAP
+
+// clang-format off
+#ifdef __clang__
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wattributes"
+#endif
+
+#ifdef __GNUC__
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wattributes"
+#endif
+// clang-format on
+
+#include "cpp11/altrep.hpp"
+
+namespace cpp11 {
+namespace literals {
+
+constexpr R_xlen_t operator"" _xl(unsigned long long int value) { return value; }
+
+}  // namespace literals
+}  // namespace cpp11