Switch to cpp11 (#585)

Author: hadley

DESCRIPTION

@@ -27,7 +27,6 @@ Imports:
     lifecycle,
     methods,
     prettyunits,
-    Rcpp,
     rlang (>= 1.1.0),
     tibble
 Suggests: 
@@ -43,8 +42,8 @@ Suggests:
     withr
 LinkingTo: 
     cli,
-    rapidjsonr,
-    Rcpp
+    cpp11,
+    rapidjsonr
 Config/Needs/website: tidyverse/tidytemplate
 Config/testthat/edition: 3
 Config/testthat/parallel: TRUE
@@ -53,7 +52,6 @@ Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
 RoxygenNote: 7.2.3
 Collate: 
-    'RcppExports.R'
     'bigrquery-package.R'
     'bq-auth.R'
     'bq-dataset.R'
@@ -72,6 +70,7 @@ Collate:
     'bq-test.R'
     'camelCase.R'
     'connections-page.R'
+    'cpp11.R'
     'dbi-driver.R'
     'dbi-connection.R'
     'dbi-result.R'

NAMESPACE

@@ -152,7 +152,6 @@ exportMethods(show)
 import(DBI)
 import(methods)
 import(rlang, except = unbox)
-importFrom(Rcpp,sourceCpp)
 importFrom(bit64,integer64)
 importFrom(gargle,token_fetch)
 importFrom(httr,DELETE)

R/RcppExports.R

@@ -23,7 +23,6 @@ the <- new_environment()
 #' @importFrom bit64 integer64
 #' @importFrom jsonlite unbox
 #' @importFrom lifecycle deprecated
-#' @importFrom Rcpp sourceCpp
 #' @importFrom tibble tibble
 ## usethis namespace: end
 NULL

R/bigrquery-package.R

@@ -0,0 +1,13 @@
+# Generated by cpp11: do not edit by hand
+
+bq_parse <- function(meta_s, data_s) {
+  .Call(`_bigrquery_bq_parse`, meta_s, data_s)
+}
+
+bq_field_init <- function(json, value) {
+  .Call(`_bigrquery_bq_field_init`, json, value)
+}
+
+bq_parse_files <- function(schema_path, file_paths, n, quiet) {
+  .Call(`_bigrquery_bq_parse_files`, schema_path, file_paths, n, quiet)
+}

R/cpp11.R

@@ -1,12 +1,13 @@
-// [[Rcpp::depends(rapidjsonr)]]
-#include <Rcpp.h>
+#include <cpp11.hpp>
+
 #include <rapidjson/document.h>
 #include <rapidjson/istreamwrapper.h>
 #include "rapidjson/filereadstream.h"
 #include <cli/progress.h>
 #include "integer64.h"
 #include "base64.h"
 
+#include <vector>
 #include <ctime>
 #include <cstdio>
 #include <climits>
@@ -27,7 +28,7 @@ int64_t parse_int64(const char* x) {
 // this will throw an exception with the appropriate error message
 // if the package is not installed
 void check_namespace(const char* pkg, const char* bq_type) {
-  Rcpp::Function checkNamespaceFun("bq_check_namespace", "bigrquery");
+  auto checkNamespaceFun = cpp11::package("bigrquery")["bq_check_namespace"];
   checkNamespaceFun(pkg, bq_type);
 }
 
@@ -96,7 +97,7 @@ class BqField {
 
   BqField(const rapidjson::Value& field) {
     if (!field.IsObject()) {
-      Rcpp::stop("Invalid field spec");
+      cpp11::stop("Invalid field spec");
     }
 
     name_ = field["name"].GetString();
@@ -118,40 +119,44 @@ class BqField {
 
   SEXP vectorInit(int n, bool array) const {
     if (array) {
-      return Rcpp::List(n);
+      return cpp11::writable::list(n);
     }
 
     switch(type_) {
     case BQ_INTEGER: {
-        Rcpp::DoubleVector out(n);
+        cpp11::writable::doubles out(n);
         out.attr("class") = "integer64";
         return out;
       }
     case BQ_FLOAT:
-      return Rcpp::DoubleVector(n);
+      return cpp11::writable::doubles(n);
     case BQ_BOOLEAN:
-      return Rcpp::LogicalVector(n);
+      return cpp11::writable::logicals(n);
     case BQ_STRING:
-      return Rcpp::CharacterVector(n);
-    case BQ_TIMESTAMP:
-      return Rcpp::DatetimeVector(n, "UTC");
+      return cpp11::writable::strings(n);
+    case BQ_TIMESTAMP: {
+        cpp11::writable::doubles out(n);
+        out.attr("class") = {"POSIXct", "POSIXt"};
+        out.attr("tzone") = "UTC";
+        return out;
+      }
     case BQ_RECORD:
-      return Rcpp::List(n);
+      return cpp11::writable::list(n);
     case BQ_GEOGRAPHY: {
         check_namespace("wk", "GEOGRAPHY");
-        Rcpp::CharacterVector out(n);
-        out.attr("class") = Rcpp::CharacterVector::create("wk_wkt", "wk_vctr");
+        cpp11::writable::strings out(n);
+        out.attr("class") = {"wk_wkt", "wk_vctr"};
         return out;
       }
     case BQ_BYTES: {
         check_namespace("blob", "BYTES");
-        Rcpp::List out(n);
-        out.attr("class") = Rcpp::CharacterVector::create("blob", "vctrs_list_of", "vctrs_vctr", "list");
-        out.attr("ptype") = Rcpp::RawVector::create();
+        cpp11::writable::list out(n);
+        out.attr("class") = {"blob", "vctrs_list_of", "vctrs_vctr", "list"};
+        out.attr("ptype") = cpp11::writable::raws((R_xlen_t) 0);
         return out;
       }
     default: {
-      Rcpp::CharacterVector out(n);
+      cpp11::writable::strings out(n);
       out.attr("bq_type") = type_str_;
       return out;
       }
@@ -165,10 +170,10 @@ class BqField {
   void vectorSet(SEXP x, int i, const rapidjson::Value& v, bool array) const {
     if (array && type_ != BQ_RECORD) {
       if (!v.IsArray())
-        Rcpp::stop("Not an array [1]");
+        cpp11::stop("Not an array [1]");
 
       int n = v.Size();
-      Rcpp::RObject out = vectorInit(n, false);
+      cpp11::sexp out = vectorInit(n, false);
       for (int j = 0; j < n; ++j) {
         vectorSet(out, j, v[j]["v"], false);
       }
@@ -196,7 +201,7 @@ class BqField {
     case BQ_UNKNOWN:
     case BQ_STRING:
       if (v.IsString()) {
-        Rcpp::RObject chr = Rf_mkCharLenCE(v.GetString(), v.GetStringLength(), CE_UTF8);
+        cpp11::sexp chr = Rf_mkCharLenCE(v.GetString(), v.GetStringLength(), CE_UTF8);
         SET_STRING_ELT(x, i, chr);
       } else {
         SET_STRING_ELT(x, i, NA_STRING);
@@ -207,17 +212,15 @@ class BqField {
       break;
     case BQ_GEOGRAPHY:
       if (v.IsString()) {
-        Rcpp::RObject chr = Rf_mkCharLenCE(v.GetString(), v.GetStringLength(), CE_UTF8);
+        cpp11::sexp chr = Rf_mkCharLenCE(v.GetString(), v.GetStringLength(), CE_UTF8);
         SET_STRING_ELT(x, i, chr);
       } else {
         SET_STRING_ELT(x, i, NA_STRING);
       }
       break;
     case BQ_BYTES:
       if (v.IsString()) {
-        Rcpp::RawVector chr(v.GetStringLength());
-        memcpy(&(chr[0]), v.GetString(), v.GetStringLength());
-        SET_VECTOR_ELT(x, i, base64_decode(chr));
+        SET_VECTOR_ELT(x, i, base64_decode(v.GetString(), v.GetStringLength()));
       } else {
         SET_VECTOR_ELT(x, i, R_NilValue);
       }
@@ -228,9 +231,8 @@ class BqField {
   SEXP recordValue(const rapidjson::Value& v) const {
     int p = fields_.size();
 
-    Rcpp::List out(p);
-    Rcpp::CharacterVector names(p);
-    out.attr("names") = names;
+    cpp11::writable::list out(p);
+    cpp11::writable::strings names(p);
 
     if (!array_) {
       if (!v.IsObject())
@@ -239,14 +241,14 @@ class BqField {
       const rapidjson::Value& f = v["f"];
       // f is array of fields
       if (!f.IsArray())
-        Rcpp::stop("Not array [2]");
+        cpp11::stop("Not array [2]");
 
       for (int j = 0; j < p; ++j) {
         const BqField& field = fields_[j];
         const rapidjson::Value& vs = f[j]["v"];
 
         int n = (field.array_) ? vs.Size() : 1;
-        Rcpp::RObject col = field.vectorInit(n, false);
+        cpp11::sexp col = field.vectorInit(n, false);
 
         if (field.array_) {
           for (int i = 0; i < n; ++i) {
@@ -267,23 +269,26 @@ class BqField {
         out[j] = field.vectorInit(n);
         names[j] = field.name_;
       }
-      out.attr("class") = Rcpp::CharacterVector::create("tbl_df", "tbl", "data.frame");
-      out.attr("row.names") = Rcpp::IntegerVector::create(NA_INTEGER, -n);
+      out.attr("class") = {"tbl_df", "tbl", "data.frame"};
+      out.attr("row.names") = {NA_INTEGER, -n};
 
-      if (n == 0)
+      if (n == 0) {
+        out.attr("names") = names;
         return out;
+      }
 
       for (int i = 0; i < n; ++i) {
         const rapidjson::Value& f = v[i]["v"]["f"];
         if (!f.IsArray())
-          Rcpp::stop("Not an array [3]");
+          cpp11::stop("Not an array [3]");
 
         for (int j = 0; j < p; ++j) {
           fields_[j].vectorSet(out[j], i, f[j]["v"]);
         }
       }
     }
 
+    out.attr("names") = names;
     return out;
   }
 
@@ -306,24 +311,24 @@ std::vector<BqField> bq_fields_parse(const rapidjson::Value& meta) {
   return fields;
 }
 
-Rcpp::List bq_fields_init(const std::vector<BqField>& fields, int n) {
+cpp11::list bq_fields_init(const std::vector<BqField>& fields, int n) {
   int p = fields.size();
 
-  Rcpp::List out(p);
-  Rcpp::CharacterVector names(p);
+  cpp11::writable::list out(p);
+  cpp11::writable::strings names(p);
   for (int j = 0; j < p; ++j) {
     out[j] = fields[j].vectorInit(n);
     names[j] = fields[j].name();
   };
-  out.attr("class") = Rcpp::CharacterVector::create("tbl_df", "tbl", "data.frame");
+  out.attr("class") = {"tbl_df", "tbl", "data.frame"};
   out.attr("names") = names;
-  out.attr("row.names") = Rcpp::IntegerVector::create(NA_INTEGER, -n);
+  out.attr("row.names") = {NA_INTEGER, -n};
 
   return out;
 }
 
 int bq_fields_set(const rapidjson::Value& data,
-                  Rcpp::List out,
+                  cpp11::writable::list out,
                   const std::vector<BqField>& fields,
                   int offset
                   ) {
@@ -345,7 +350,7 @@ int bq_fields_set(const rapidjson::Value& data,
   return n;
 }
 
-// [[Rcpp::export]]
+[[cpp11::register]]
 SEXP bq_parse(std::string meta_s, std::string data_s) {
   rapidjson::Document meta_d;
   meta_d.Parse(&meta_s[0]);
@@ -356,19 +361,19 @@ SEXP bq_parse(std::string meta_s, std::string data_s) {
 
   int n = (values_d.HasMember("rows")) ? values_d["rows"].Size() : 0;
 
-  Rcpp::List out = bq_fields_init(fields, n);
+  cpp11::writable::list out = bq_fields_init(fields, n);
   bq_fields_set(values_d, out, fields, 0);
 
   return out;
 }
 
-// [[Rcpp::export]]
+[[cpp11::register]]
 SEXP bq_field_init(std::string json, std::string value = "") {
   rapidjson::Document d1;
   d1.Parse(&json[0]);
 
   BqField field(d1);
-  Rcpp::RObject out = field.vectorInit(1);
+  cpp11::sexp out = field.vectorInit(1);
 
   if (value != "") {
     rapidjson::Document d2;
@@ -380,7 +385,7 @@ SEXP bq_field_init(std::string json, std::string value = "") {
   return out;
 }
 
-// [[Rcpp::export]]
+[[cpp11::register]]
 SEXP bq_parse_files(std::string schema_path,
                     std::vector<std::string> file_paths,
                     int n,
@@ -393,7 +398,7 @@ SEXP bq_parse_files(std::string schema_path,
   schema_doc.ParseStream(schema_stream_w);
 
   std::vector<BqField> fields = bq_fields_parse(schema_doc);
-  Rcpp::List out = bq_fields_init(fields, n);
+  cpp11::writable::list out = bq_fields_init(fields, n);
 
   std::vector<std::string>::const_iterator it = file_paths.begin(),
     it_end = file_paths.end();
@@ -414,15 +419,15 @@ SEXP bq_parse_files(std::string schema_path,
 
     if (values_doc.HasParseError()) {
       UNPROTECT(2);
-      Rcpp::stop("Failed to parse '%s'", *it);
+      cpp11::stop("Failed to parse '%s'", it->c_str());
       fclose(values_file);
     }
 
     total_seen += bq_fields_set(values_doc, out, fields, total_seen);
     if (!quiet) {
       if (CLI_SHOULD_TICK) cli_progress_add(pb, 1);
     } else {
-      Rcpp::checkUserInterrupt();
+      cpp11::check_user_interrupt();
     };
 
     fclose(values_file);
@@ -433,7 +438,7 @@ SEXP bq_parse_files(std::string schema_path,
 
   if (total_seen != n) {
     // Matches the error thrown from R if the first "test balloon" chunk is short.
-    Rcpp::stop("%d rows were requested, but only %d rows were received.\n  Leave `page_size` unspecified or use an even smaller value.", n, total_seen);
+    cpp11::stop("%d rows were requested, but only %d rows were received.\n  Leave `page_size` unspecified or use an even smaller value.", n, total_seen);
   }
 
   return out;