- MakeArray

romainfrancois · romainfrancois · commit f27eebafaf76 · 2018-09-24T20:15:02.000+02:00
diff --git a/r/NAMESPACE b/r/NAMESPACE
@@ -9,6 +9,11 @@ S3method("==","arrow::DataType")
 S3method("==","arrow::Field")
 S3method(length,"arrow::Array")
 S3method(print,"arrow-enum")
+export(DateUnit)
+export(StatusCode)
+export(TimeUnit)
+export(Type)
+export(array)
 export(boolean)
 export(date32)
 export(date64)
@@ -22,6 +27,7 @@ export(int64)
 export(int8)
 export(list_of)
 export(null)
+export(record_batch)
 export(schema)
 export(struct)
 export(table)
diff --git a/r/R/RcppExports.R b/r/R/RcppExports.R
@@ -17,10 +17,6 @@ ArrayData_get_offset <- function(x) {
     .Call(`_arrow_ArrayData_get_offset`, x)
 }
 
-Array_initialize <- function(data_) {
-    .Call(`_arrow_Array_initialize`, data_)
-}
-
 Array_IsNull <- function(x, i) {
     .Call(`_arrow_Array_IsNull`, x, i)
 }
diff --git a/r/R/array.R b/r/R/array.R
@@ -52,12 +52,6 @@
 #' @export
 `!=.arrow::Array` <- function(x, y) !x$Equals(y)
 
-#' @export
-MakeArray <- function(data){
-  assert_that(inherits(data, "arrow::ArrayData"))
-  `arrow::Array`$new(Array_initialize(data))
-}
-
 #' create an arrow::Array from an R vector
 #'
 #' @param \dots Vectors to coerce
diff --git a/r/man/DataType.Rd b/r/man/DataType.Rd
diff --git a/r/src/RcppExports.cpp b/r/src/RcppExports.cpp
@@ -50,17 +50,6 @@ BEGIN_RCPP
     return rcpp_result_gen;
 END_RCPP
 }
-// Array_initialize
-std::shared_ptr<arrow::Array> Array_initialize(const std::shared_ptr<arrow::ArrayData>& data_);
-RcppExport SEXP _arrow_Array_initialize(SEXP data_SEXP) {
-BEGIN_RCPP
-    Rcpp::RObject rcpp_result_gen;
-    Rcpp::RNGScope rcpp_rngScope_gen;
-    Rcpp::traits::input_parameter< const std::shared_ptr<arrow::ArrayData>& >::type data_(data_SEXP);
-    rcpp_result_gen = Rcpp::wrap(Array_initialize(data_));
-    return rcpp_result_gen;
-END_RCPP
-}
 // Array_IsNull
 bool Array_IsNull(const std::shared_ptr<arrow::Array>& x, int i);
 RcppExport SEXP _arrow_Array_IsNull(SEXP xSEXP, SEXP iSEXP) {
@@ -851,7 +840,6 @@ static const R_CallMethodDef CallEntries[] = {
     {"_arrow_ArrayData_get_length", (DL_FUNC) &_arrow_ArrayData_get_length, 1},
     {"_arrow_ArrayData_get_null_count", (DL_FUNC) &_arrow_ArrayData_get_null_count, 1},
     {"_arrow_ArrayData_get_offset", (DL_FUNC) &_arrow_ArrayData_get_offset, 1},
-    {"_arrow_Array_initialize", (DL_FUNC) &_arrow_Array_initialize, 1},
     {"_arrow_Array_IsNull", (DL_FUNC) &_arrow_Array_IsNull, 2},
     {"_arrow_Array_IsValid", (DL_FUNC) &_arrow_Array_IsValid, 2},
     {"_arrow_Array_length", (DL_FUNC) &_arrow_Array_length, 1},
diff --git a/r/src/array.cpp b/r/src/array.cpp
@@ -40,11 +40,6 @@ int ArrayData_get_offset(const std::shared_ptr<arrow::ArrayData>& x){
   return x->offset;
 }
 
-// [[Rcpp::export]]
-std::shared_ptr<arrow::Array> Array_initialize(const std::shared_ptr<arrow::ArrayData>& data_){
-  return MakeArray(data_);
-}
-
 // [[Rcpp::export]]
 bool Array_IsNull(const std::shared_ptr<arrow::Array>& x, int i){
   return x->IsNull(i);

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,6 @@ ArrayData_get_offset <- function(x) {`
`17`	`17`	.Call(`_arrow_ArrayData_get_offset`, x)
`18`	`18`	`}`
`19`	`19`
`20`		`-Array_initialize <- function(data_) {`
`21`		- .Call(`_arrow_Array_initialize`, data_)
`22`		`-}`
`23`		`-`
`24`	`20`	`Array_IsNull <- function(x, i) {`
`25`	`21`	.Call(`_arrow_Array_IsNull`, x, i)
`26`	`22`	`}`