feat: last_rel (#529)

Author: krlmlr

R/cpp11.R

@@ -172,8 +172,8 @@ rapi_rel_from_table_function <- function(con, function_name, positional_paramete
   .Call(`_duckdb_rapi_rel_from_table_function`, con, function_name, positional_parameters_sexps, named_parameters_sexps)
 }
 
-rapi_get_last_rel_mat <- function() {
-  .Call(`_duckdb_rapi_get_last_rel_mat`)
+rapi_get_last_rel <- function() {
+  .Call(`_duckdb_rapi_get_last_rel`)
 }
 
 # allow_materialization = TRUE: compatibility with duckplyr <= 0.4.1

R/relational.R

@@ -476,6 +476,6 @@ load_rfuns <- function() {
   rethrow_rapi_load_rfuns()
 }
 
-get_last_rel_mat <- function() {
-  rethrow_rapi_get_last_rel_mat()
+get_last_rel <- function() {
+  rethrow_rapi_get_last_rel()
 }

R/rethrow-gen.R

@@ -387,9 +387,9 @@ rethrow_rapi_rel_from_table_function <- function(con, function_name, positional_
   )
 }
 
-rethrow_rapi_get_last_rel_mat <- function(call = parent.frame(2)) {
+rethrow_rapi_get_last_rel <- function(call = parent.frame(2)) {
   rlang::try_fetch(
-    rapi_get_last_rel_mat(),
+    rapi_get_last_rel(),
     error = function(e) {
       rethrow_error_from_rapi(e, call)
     }
@@ -585,7 +585,7 @@ rethrow_restore <- function() {
   rethrow_rapi_rel_from_sql <<- rapi_rel_from_sql
   rethrow_rapi_rel_from_table <<- rapi_rel_from_table
   rethrow_rapi_rel_from_table_function <<- rapi_rel_from_table_function
-  rethrow_rapi_get_last_rel_mat <<- rapi_get_last_rel_mat
+  rethrow_rapi_get_last_rel <<- rapi_get_last_rel
   rethrow_rapi_rel_to_altrep <<- rapi_rel_to_altrep
   rethrow_rapi_rel_from_altrep_df <<- rapi_rel_from_altrep_df
   rethrow_rapi_release <<- rapi_release

src/cpp11.cpp

@@ -315,10 +315,10 @@ extern "C" SEXP _duckdb_rapi_rel_from_table_function(SEXP con, SEXP function_nam
   END_CPP11
 }
 // reltoaltrep.cpp
-std::string rapi_get_last_rel_mat();
-extern "C" SEXP _duckdb_rapi_get_last_rel_mat() {
+SEXP rapi_get_last_rel();
+extern "C" SEXP _duckdb_rapi_get_last_rel() {
   BEGIN_CPP11
-    return cpp11::as_sexp(rapi_get_last_rel_mat());
+    return cpp11::as_sexp(rapi_get_last_rel());
   END_CPP11
 }
 // reltoaltrep.cpp
@@ -452,7 +452,7 @@ static const R_CallMethodDef CallEntries[] = {
     {"_duckdb_rapi_expr_set_alias",          (DL_FUNC) &_duckdb_rapi_expr_set_alias,          2},
     {"_duckdb_rapi_expr_tostring",           (DL_FUNC) &_duckdb_rapi_expr_tostring,           1},
     {"_duckdb_rapi_expr_window",             (DL_FUNC) &_duckdb_rapi_expr_window,             9},
-    {"_duckdb_rapi_get_last_rel_mat",        (DL_FUNC) &_duckdb_rapi_get_last_rel_mat,        0},
+    {"_duckdb_rapi_get_last_rel",            (DL_FUNC) &_duckdb_rapi_get_last_rel,            0},
     {"_duckdb_rapi_get_null_SEXP_ptr",       (DL_FUNC) &_duckdb_rapi_get_null_SEXP_ptr,       0},
     {"_duckdb_rapi_get_substrait",           (DL_FUNC) &_duckdb_rapi_get_substrait,           3},
     {"_duckdb_rapi_get_substrait_json",      (DL_FUNC) &_duckdb_rapi_get_substrait_json,      3},

src/include/rapi.hpp

@@ -218,3 +218,17 @@ cpp11::r_string rapi_ptr_to_str(SEXP extptr);
 void duckdb_r_transform(duckdb::Vector &src_vec, SEXP dest, duckdb::idx_t dest_offset, duckdb::idx_t n, bool integer64);
 SEXP duckdb_r_allocate(const duckdb::LogicalType &type, duckdb::idx_t nrows);
 void duckdb_r_decorate(const duckdb::LogicalType &type, SEXP dest, bool integer64);
+
+template <typename T, typename... ARGS>
+cpp11::external_pointer<T> make_external(const std::string &rclass, ARGS &&... args) {
+	auto extptr = cpp11::external_pointer<T>(new T(std::forward<ARGS>(args)...));
+	((cpp11::sexp)extptr).attr("class") = rclass;
+	return extptr;
+}
+
+template <typename T, typename... ARGS>
+cpp11::external_pointer<T> make_external_prot(const std::string &rclass, SEXP prot, ARGS &&... args) {
+	auto extptr = cpp11::external_pointer<T>(new T(std::forward<ARGS>(args)...), true, true, prot);
+	((cpp11::sexp)extptr).attr("class") = rclass;
+	return extptr;
+}

src/relational.cpp

@@ -33,19 +33,6 @@
 using namespace duckdb;
 using namespace cpp11;
 
-template <typename T, typename... ARGS>
-external_pointer<T> make_external(const string &rclass, ARGS &&... args) {
-	auto extptr = external_pointer<T>(new T(std::forward<ARGS>(args)...));
-	((sexp)extptr).attr("class") = rclass;
-	return extptr;
-}
-
-template <typename T, typename... ARGS>
-external_pointer<T> make_external_prot(const string &rclass, SEXP prot, ARGS &&... args) {
-	auto extptr = external_pointer<T>(new T(std::forward<ARGS>(args)...), true, true, prot);
-	((sexp)extptr).attr("class") = rclass;
-	return extptr;
-}
 // DuckDB Expressions
 
 [[cpp11::register]] SEXP rapi_expr_reference(r_vector<r_string> rnames) {

src/reltoaltrep.cpp

@@ -101,7 +101,7 @@ struct AltrepRelationWrapper {
 
 			auto option = Rf_GetOption(RStrings::get().materialize_sym, R_BaseEnv);
 			if (option != R_NilValue && !Rf_isNull(option) && LOGICAL_ELT(option, 0) == true) {
-				Rprintf("duckplyr: materializing, review details with duckplyr::last_rel_mat()\n");
+				Rprintf("duckplyr: materializing, review details with duckplyr::last_rel()\n");
 			}
 
 			last_rel = rel;
@@ -338,11 +338,9 @@ static R_altrep_class_t LogicalTypeToAltrepType(const LogicalType &type) {
 	}
 }
 
-[[cpp11::register]] std::string rapi_get_last_rel_mat() {
-	if (!AltrepRelationWrapper::last_rel) {
-		return "";
-	}
-	return AltrepRelationWrapper::last_rel->ToString();
+[[cpp11::register]] SEXP rapi_get_last_rel() {
+	auto last_rel = AltrepRelationWrapper::last_rel;
+	return sexp(make_external_prot<RelationWrapper>("duckdb_relation", R_NilValue, std::move(last_rel)));
 }
 
 [[cpp11::register]] SEXP rapi_rel_to_altrep(duckdb::rel_extptr_t rel, bool allow_materialization) {