+RecordBatch$schema

romainfrancois · romainfrancois · commit b8dac548feda · 2018-09-24T20:15:02.000+02:00
diff --git a/r/R/R6.R b/r/R/R6.R
@@ -522,8 +522,12 @@ field <- function(name, type) `arrow::Field`$new(name, type)
     print = function(...) {
       cat( glue( "{s}", s = Schema_ToString(self)))
     },
-    initialize = function(...){
-      self$set_pointer(schema_(.fields(list(...))))
+    initialize = function(..., .xp){
+      if(missing(.xp)){
+        self$set_pointer(schema_(.fields(list(...))))
+      } else {
+        self$set_pointer(.xp)
+      }
     }
   )
 )
diff --git a/r/R/RcppExports.R b/r/R/RcppExports.R
@@ -81,6 +81,10 @@ RecordBatch_num_rows <- function(x) {
     .Call(`_arrow_RecordBatch_num_rows`, x)
 }
 
+RecordBatch_schema <- function(x) {
+    .Call(`_arrow_RecordBatch_schema`, x)
+}
+
 Field_initialize <- function(name, type, nullable = TRUE) {
     .Call(`_arrow_Field_initialize`, name, type, nullable)
 }
diff --git a/r/R/array.R b/r/R/array.R
@@ -93,7 +93,8 @@ array <- function(...){
       self$set_pointer(dataframe_to_RecordBatch(.data))
     },
     num_columns = function() RecordBatch_num_columns(self),
-    num_rows = function() RecordBatch_num_rows(self)
+    num_rows = function() RecordBatch_num_rows(self),
+    schema = function() schema(.xp = RecordBatch_schema(self))
   )
 )
 
diff --git a/r/src/RcppExports.cpp b/r/src/RcppExports.cpp
@@ -233,6 +233,17 @@ BEGIN_RCPP
     return rcpp_result_gen;
 END_RCPP
 }
+// RecordBatch_schema
+std::shared_ptr<arrow::Schema> RecordBatch_schema(const std::shared_ptr<arrow::RecordBatch>& x);
+RcppExport SEXP _arrow_RecordBatch_schema(SEXP xSEXP) {
+BEGIN_RCPP
+    Rcpp::RObject rcpp_result_gen;
+    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::traits::input_parameter< const std::shared_ptr<arrow::RecordBatch>& >::type x(xSEXP);
+    rcpp_result_gen = Rcpp::wrap(RecordBatch_schema(x));
+    return rcpp_result_gen;
+END_RCPP
+}
 // Field_initialize
 std::shared_ptr<arrow::Field> Field_initialize(const std::string& name, const std::shared_ptr<arrow::DataType>& type, bool nullable);
 RcppExport SEXP _arrow_Field_initialize(SEXP nameSEXP, SEXP typeSEXP, SEXP nullableSEXP) {
@@ -1538,6 +1549,7 @@ static const R_CallMethodDef CallEntries[] = {
     {"_arrow_dataframe_to_RecordBatch", (DL_FUNC) &_arrow_dataframe_to_RecordBatch, 1},
     {"_arrow_RecordBatch_num_columns", (DL_FUNC) &_arrow_RecordBatch_num_columns, 1},
     {"_arrow_RecordBatch_num_rows", (DL_FUNC) &_arrow_RecordBatch_num_rows, 1},
+    {"_arrow_RecordBatch_schema", (DL_FUNC) &_arrow_RecordBatch_schema, 1},
     {"_arrow_Field_initialize", (DL_FUNC) &_arrow_Field_initialize, 3},
     {"_arrow_Field_ToString", (DL_FUNC) &_arrow_Field_ToString, 1},
     {"_arrow_Field_name", (DL_FUNC) &_arrow_Field_name, 1},
diff --git a/r/src/buffer.cpp b/r/src/buffer.cpp
@@ -106,3 +106,8 @@ int RecordBatch_num_columns(const std::shared_ptr<arrow::RecordBatch>& x){
 int RecordBatch_num_rows(const std::shared_ptr<arrow::RecordBatch>& x){
   return x->num_rows();
 }
+
+// [[Rcpp::export]]
+std::shared_ptr<arrow::Schema> RecordBatch_schema(const std::shared_ptr<arrow::RecordBatch>& x){
+  return x->schema();
+}

Original file line number	Diff line number	Diff line change
@@ -522,8 +522,12 @@ field <- function(name, type) `arrow::Field`$new(name, type)
`522`	`522`	`print = function(...) {`
`523`	`523`	`cat( glue( "{s}", s = Schema_ToString(self)))`
`524`	`524`	`},`
`525`		`- initialize = function(...){`
`526`		`- self$set_pointer(schema_(.fields(list(...))))`
	`525`	`+ initialize = function(..., .xp){`
	`526`	`+ if(missing(.xp)){`
	`527`	`+ self$set_pointer(schema_(.fields(list(...))))`
	`528`	`+ } else {`
	`529`	`+ self$set_pointer(.xp)`
	`530`	`+ }`
`527`	`531`	`}`
`528`	`532`	`)`
`529`	`533`	`)`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,10 @@ RecordBatch_num_rows <- function(x) {`
`81`	`81`	.Call(`_arrow_RecordBatch_num_rows`, x)
`82`	`82`	`}`
`83`	`83`
	`84`	`+RecordBatch_schema <- function(x) {`
	`85`	+ .Call(`_arrow_RecordBatch_schema`, x)
	`86`	`+}`
	`87`	`+`
`84`	`88`	`Field_initialize <- function(name, type, nullable = TRUE) {`
`85`	`89`	.Call(`_arrow_Field_initialize`, name, type, nullable)
`86`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,8 @@ array <- function(...){`
`93`	`93`	`self$set_pointer(dataframe_to_RecordBatch(.data))`
`94`	`94`	`},`
`95`	`95`	`num_columns = function() RecordBatch_num_columns(self),`
`96`		`- num_rows = function() RecordBatch_num_rows(self)`
	`96`	`+ num_rows = function() RecordBatch_num_rows(self),`
	`97`	`+ schema = function() schema(.xp = RecordBatch_schema(self))`
`97`	`98`	`)`
`98`	`99`	`)`
`99`	`100`
Original file line number	Diff line number	Diff line change
`@@ -106,3 +106,8 @@ int RecordBatch_num_columns(const std::shared_ptr<arrow::RecordBatch>& x){`
`106`	`106`	`int RecordBatch_num_rows(const std::shared_ptr<arrow::RecordBatch>& x){`
`107`	`107`	`return x->num_rows();`
`108`	`108`	`}`
	`109`	`+`
	`110`	`+// [[Rcpp::export]]`
	`111`	`+std::shared_ptr<arrow::Schema> RecordBatch_schema(const std::shared_ptr<arrow::RecordBatch>& x){`
	`112`	`+ return x->schema();`
	`113`	`+}`