pass optional ownership info

Author: paleolimbot

r/src/vctr_builder.cc

@@ -311,7 +311,7 @@ SEXP nanoarrow_c_convert_array2(SEXP array_xptr, SEXP ptype_sexp) {
     Rf_error("builder->Reserve() failed: %s", error.message);
   }
 
-  result = builder->PushNext(array, &error);
+  result = builder->PushNext(array_xptr, array, &error);
   if (result != NANOARROW_OK) {
     Rf_error("builder->PushNext() failed: %s", error.message);
   }

r/src/vctr_builder_base.h

@@ -76,7 +76,8 @@ struct VctrBuilder {
   // Push an array into this builder and do not take ownership of array. This is
   // called when the caller cannot safely relinquish ownership of an array (e.g.,
   // convert_array()). Calling this method may longjmp.
-  virtual ArrowErrorCode PushNext(const ArrowArray* array, ArrowError* error) {
+  virtual ArrowErrorCode PushNext(SEXP array_shelter, const ArrowArray* array,
+                                  ArrowError* error) {
     NANOARROW_RETURN_NOT_OK(ArrowArrayViewSetArray(&array_view_, array, error));
     return NANOARROW_OK;
   }
@@ -85,7 +86,7 @@ struct VctrBuilder {
   // ownership. This is called when the caller can relinquish ownership (e.g.,
   // convert_array_stream()). Calling this method may longjmp.
   virtual ArrowErrorCode PushNextOwning(ArrowArray* array, ArrowError* error) {
-    return PushNext(array, error);
+    return PushNext(R_NilValue, array, error);
   }
 
   // Perform any final calculations required to calculate the return value.

r/src/vctr_builder_blob.h

@@ -36,8 +36,9 @@ class BlobBuilder : public VctrBuilder {
     return NANOARROW_OK;
   }
 
-  ArrowErrorCode PushNext(const ArrowArray* array, ArrowError* error) override {
-    NANOARROW_RETURN_NOT_OK(VctrBuilder::PushNext(array, error));
+  ArrowErrorCode PushNext(SEXP array_shelter, const ArrowArray* array,
+                          ArrowError* error) override {
+    NANOARROW_RETURN_NOT_OK(VctrBuilder::PushNext(array_shelter, array, error));
     R_xlen_t length = array_view_.length;
 
     switch (array_view_.storage_type) {

r/src/vctr_builder_chr.h

@@ -41,8 +41,9 @@ class ChrBuilder : public VctrBuilder {
     return NANOARROW_OK;
   }
 
-  ArrowErrorCode PushNext(const ArrowArray* array, ArrowError* error) override {
-    NANOARROW_RETURN_NOT_OK(VctrBuilder::PushNext(array, error));
+  ArrowErrorCode PushNext(SEXP array_shelter, const ArrowArray* array,
+                          ArrowError* error) override {
+    NANOARROW_RETURN_NOT_OK(VctrBuilder::PushNext(array_shelter, array, error));
     R_xlen_t length = array_view_.length;
 
     switch (array_view_.storage_type) {

r/src/vctr_builder_dbl.h

@@ -48,8 +48,9 @@ class DblBuilder : public VctrBuilder {
     return NANOARROW_OK;
   }
 
-  virtual ArrowErrorCode PushNext(const ArrowArray* array, ArrowError* error) override {
-    NANOARROW_RETURN_NOT_OK(VctrBuilder::PushNext(array, error));
+  virtual ArrowErrorCode PushNext(SEXP array_shelter, const ArrowArray* array,
+                                  ArrowError* error) override {
+    NANOARROW_RETURN_NOT_OK(VctrBuilder::PushNext(array_shelter, array, error));
 
     double* result = REAL(value_);
     int64_t n_bad_values = 0;

r/src/vctr_builder_difftime.h

@@ -80,9 +80,10 @@ class DifftimeBuilder : public DblBuilder {
     return NANOARROW_OK;
   }
 
-  ArrowErrorCode PushNext(const ArrowArray* array, ArrowError* error) override {
+  ArrowErrorCode PushNext(SEXP array_shelter, const ArrowArray* array,
+                          ArrowError* error) override {
     R_xlen_t value_size0 = value_size_;
-    NANOARROW_RETURN_NOT_OK(DblBuilder::PushNext(array, error));
+    NANOARROW_RETURN_NOT_OK(DblBuilder::PushNext(array_shelter, array, error));
 
     if (scale_ != 1) {
       double* result = REAL(value_);

r/src/vctr_builder_int.h

@@ -38,8 +38,9 @@ class IntBuilder : public VctrBuilder {
     return NANOARROW_OK;
   }
 
-  ArrowErrorCode PushNext(const ArrowArray* array, ArrowError* error) override {
-    NANOARROW_RETURN_NOT_OK(VctrBuilder::PushNext(array, error));
+  ArrowErrorCode PushNext(SEXP array_shelter, const ArrowArray* array,
+                          ArrowError* error) override {
+    NANOARROW_RETURN_NOT_OK(VctrBuilder::PushNext(array_shelter, array, error));
 
     int* result = INTEGER(value_);
     int64_t n_bad_values = 0;

r/src/vctr_builder_int64.h

@@ -39,8 +39,9 @@ class Integer64Builder : public VctrBuilder {
     return NANOARROW_OK;
   }
 
-  ArrowErrorCode PushNext(const ArrowArray* array, ArrowError* error) override {
-    NANOARROW_RETURN_NOT_OK(VctrBuilder::PushNext(array, error));
+  ArrowErrorCode PushNext(SEXP array_shelter, const ArrowArray* array,
+                          ArrowError* error) override {
+    NANOARROW_RETURN_NOT_OK(VctrBuilder::PushNext(array_shelter, array, error));
 
     int64_t* result = reinterpret_cast<int64_t*>(REAL(value_));
     int64_t n_bad_values = 0;

r/src/vctr_builder_lgl.h

@@ -38,8 +38,9 @@ class LglBuilder : public VctrBuilder {
     return NANOARROW_OK;
   }
 
-  ArrowErrorCode PushNext(const ArrowArray* array, ArrowError* error) override {
-    NANOARROW_RETURN_NOT_OK(VctrBuilder::PushNext(array, error));
+  ArrowErrorCode PushNext(SEXP array_shelter, const ArrowArray* array,
+                          ArrowError* error) override {
+    NANOARROW_RETURN_NOT_OK(VctrBuilder::PushNext(array_shelter, array, error));
 
     // True for all the types supported here
     const uint8_t* is_valid = array_view_.buffer_views[0].data.as_uint8;

r/src/vctr_builder_other.h

@@ -47,7 +47,8 @@ class OtherBuilder : public VctrBuilder {
 
   ArrowErrorCode Reserve(R_xlen_t n, ArrowError* error) override { return NANOARROW_OK; }
 
-  ArrowErrorCode PushNext(const ArrowArray* array, ArrowError* error) override {
+  ArrowErrorCode PushNext(SEXP array_shelter, const ArrowArray* array,
+                          ArrowError* error) override {
     // Fill this in
     return NANOARROW_OK;
   }