update growable for patch

Author: ben-schwen

src/data.table.h

@@ -341,20 +341,6 @@ void hash_set(hashtab *, SEXP key, R_xlen_t value);
 // Returns the value corresponding to the key present in the hash, otherwise returns ifnotfound.
 R_xlen_t hash_lookup(const hashtab *, SEXP key, R_xlen_t ifnotfound);
 
-// growable.c
-// Return a new vector of given type. Initially its xlength() is equal to size. Using growable_resize(), it can be increased to up to max_size.
-SEXP growable_allocate(SEXPTYPE type, R_xlen_t size, R_xlen_t max_size);
-// Return the max_size of a growable vector. Behaviour is undefined if x was not allocated by growable_allocate.
-R_xlen_t growable_max_size(SEXP x);
-// Resize a growable vector to newsize. Will signal an error if newsize exceeds max_size.
-void growable_resize(SEXP x, R_xlen_t newsize);
-// Return TRUE if growable_resize(x) and growable_max_size(x) are valid operations.
-Rboolean is_growable(SEXP x);
-// Transform x into a growable vector. The return value must be reprotected in place of x. What happens to x is deliberately not specified, but no copying occurs.
-SEXP make_growable(SEXP x);
-#if R_VERSION >= R_Version(4, 3, 0)
-void register_altrep_classes(DllInfo*);
-#endif
 // The dynamically-allocated hash table has a public field for the R protection wrapper.
 // Keep it PROTECTed while the table is in use.
 typedef struct dhash_tab {

src/growable.c

@@ -212,12 +212,8 @@ void attribute_visible R_init_data_table(DllInfo *info)
 
   SEXP tmp = PROTECT(allocVector(INTSXP,2));
   if (LENGTH(tmp)!=2) error(_("Checking LENGTH(allocVector(INTSXP,2)) [%d] is 2 %s"), LENGTH(tmp), msg);
-#if R_VERSION >= R_Version(4, 3, 0)
-  register_altrep_classes(info);
-#else
   // Use (long long) to cast R_xlen_t to a fixed type to robustly avoid -Wformat compiler warnings, see #5768
   if (TRUELENGTH(tmp)!=0) error(_("Checking TRUELENGTH(allocVector(INTSXP,2)) [%lld] is 0 %s"), (long long)TRUELENGTH(tmp), msg);
-#endif
   UNPROTECT(1);
 
   // According to IEEE (http://en.wikipedia.org/wiki/IEEE_754-1985#Zero) we can rely on 0.0 being all 0 bits.

src/init.c

@@ -24,17 +24,13 @@ SEXP reorder(SEXP x, SEXP order)
         error(_("Column %d is length %d which differs from length of column 1 (%d). Invalid data.table."), i+1, length(v), nrow);
       if (RTYPE_SIZEOF(v) > maxSize)
         maxSize=RTYPE_SIZEOF(v);
-#ifndef USE_GROWABLE_ALTREP
       if (ALTREP(v)) SET_VECTOR_ELT(x, i, copyAsPlain(v));
-#endif
     }
     copySharedColumns(x); // otherwise two columns which point to the same vector would be reordered and then re-reordered, issues linked in PR#3768
   } else {
     if (RTYPE_SIZEOF(x)!=4 && RTYPE_SIZEOF(x)!=8 && RTYPE_SIZEOF(x)!=16 && RTYPE_SIZEOF(x)!=1)
       error(_("reorder accepts vectors but this non-VECSXP is type '%s' which isn't yet supported (RTYPE_SIZEOF=%zu)"), type2char(TYPEOF(x)), RTYPE_SIZEOF(x));
-    #ifndef USE_GROWABLE_ALTREP
       if (ALTREP(x)) internal_error(__func__, "cannot reorder an ALTREP vector. Please see NEWS item 2 in v1.11.4"); // # nocov
-    #endif
     maxSize = RTYPE_SIZEOF(x);
     nrow = length(x);
     ncol = 1;
@@ -44,9 +40,7 @@ SEXP reorder(SEXP x, SEXP order)
   if (length(order) != nrow)
     error("nrow(x)[%d]!=length(order)[%d]", nrow, length(order)); // # notranslate
   int nprotect = 0;
-#ifndef USE_GROWABLE_ALTREP
   if (ALTREP(order)) { order=PROTECT(copyAsPlain(order)); nprotect++; }  // TODO: if it's an ALTREP sequence some optimizations are possible rather than expand
-#endif
 
   const int *restrict idx = INTEGER(order);
   int i=0;

src/reorder.c

@@ -203,9 +203,6 @@ inline bool INHERITS(SEXP x, SEXP char_) {
   return false;
 }
 
-#ifdef USE_GROWABLE_ALTREP
-SEXP copyAsPlain(SEXP x) { return duplicate(x); }
-#else
 SEXP copyAsPlain(SEXP x) {
   // v1.12.2 and before used standard R duplicate() to do this. But duplicate() is not guaranteed to not return an ALTREP.
   // e.g. ALTREP 'wrapper' on factor column (with materialized INTSXP) in package VIM under example(hotdeck)
@@ -265,7 +262,6 @@ SEXP copyAsPlain(SEXP x) {
   UNPROTECT(1);
   return ans;
 }
-#endif
 
 void copySharedColumns(SEXP x) {
   const int ncol = length(x);
@@ -278,9 +274,7 @@ void copySharedColumns(SEXP x) {
     SEXP thiscol = xp[i];
     if (
       hash_lookup(marks, thiscol, 0)<0
-#ifndef USE_GROWABLE_ALTREP
       || ALTREP(thiscol)
-#endif
     ) {
       shared[i] = true;  // we mark ALTREP as 'shared' too, whereas 'tocopy' would be better word to use for ALTREP
       nShared++;

src/utils.c

@@ -87,12 +87,6 @@ SEXP address(SEXP x)
   return(mkString(buffer));
 }
 
-#ifdef USE_GROWABLE_ALTREP
-SEXP expandAltRep(SEXP x) {
-  (void)x;
-  return R_NilValue;
-}
-#else
 SEXP expandAltRep(SEXP x)
 {
   // used by setDT to ensure altrep vectors in columns are expanded. Such altrep objects typically come from tests or demos, since
@@ -111,7 +105,6 @@ SEXP expandAltRep(SEXP x)
   }
   return R_NilValue;
 }
-#endif
 
 SEXP dim(SEXP x)
 {