name fixes. Using __ consistently

apache · Sep 24, 2018 · 9e60555 · 9e60555
1 parent bf814bb
commit 9e60555
Show file tree

Hide file tree

Showing 4 changed files with 365 additions and 365 deletions.
diff --git a/r/R/RcppExports.R b/r/R/RcppExports.R
@@ -1,70 +1,6 @@
 # Generated by using Rcpp::compileAttributes() -> do not edit by hand
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
-Array__from_vector <- function(x) {
-    .Call(`_arrow_Array__from_vector`, x)
-}
-
-Array__as_vector <- function(array) {
-    .Call(`_arrow_Array__as_vector`, array)
-}
-
-Array__Slice1 <- function(array, offset) {
-    .Call(`_arrow_Array__Slice1`, array, offset)
-}
-
-Array__Slice2 <- function(array, offset, length) {
-    .Call(`_arrow_Array__Slice2`, array, offset, length)
-}
-
-Array__IsNull <- function(x, i) {
-    .Call(`_arrow_Array__IsNull`, x, i)
-}
-
-Array__IsValid <- function(x, i) {
-    .Call(`_arrow_Array__IsValid`, x, i)
-}
-
-Array__length <- function(x) {
-    .Call(`_arrow_Array__length`, x)
-}
-
-Array__offset <- function(x) {
-    .Call(`_arrow_Array__offset`, x)
-}
-
-Array__null_count <- function(x) {
-    .Call(`_arrow_Array__null_count`, x)
-}
-
-Array__type <- function(x) {
-    .Call(`_arrow_Array__type`, x)
-}
-
-Array__ToString <- function(x) {
-    .Call(`_arrow_Array__ToString`, x)
-}
-
-Array__type_id <- function(x) {
-    .Call(`_arrow_Array__type_id`, x)
-}
-
-Array__Equals <- function(lhs, rhs) {
-    .Call(`_arrow_Array__Equals`, lhs, rhs)
-}
-
-Array__ApproxEquals <- function(lhs, rhs) {
-    .Call(`_arrow_Array__ApproxEquals`, lhs, rhs)
-}
-
-Array__data <- function(array) {
-    .Call(`_arrow_Array__data`, array)
-}
-
-Array__RangeEquals <- function(self, other, start_idx, end_idx, other_start_idx) {
-    .Call(`_arrow_Array__RangeEquals`, self, other, start_idx, end_idx, other_start_idx)
-}
-
 ArrayData__get_type <- function(x) {
     .Call(`_arrow_ArrayData__get_type`, x)
 }
@@ -301,32 +237,16 @@ Object__pointer_address <- function(obj) {
     .Call(`_arrow_Object__pointer_address`, obj)
 }
 
-Field__initialize <- function(name, type, nullable = TRUE) {
-    .Call(`_arrow_Field__initialize`, name, type, nullable)
-}
-
-Field__ToString <- function(type) {
-    .Call(`_arrow_Field__ToString`, type)
-}
-
-Field__name <- function(type) {
-    .Call(`_arrow_Field__name`, type)
-}
-
-Field__nullable <- function(type) {
-    .Call(`_arrow_Field__nullable`, type)
-}
-
-MemoryPool_default <- function() {
-    .Call(`_arrow_MemoryPool_default`)
+MemoryPool__default <- function() {
+    .Call(`_arrow_MemoryPool__default`)
 }
 
-MemoryPool_bytes_allocated <- function(pool) {
-    .Call(`_arrow_MemoryPool_bytes_allocated`, pool)
+MemoryPool__bytes_allocated <- function(pool) {
+    .Call(`_arrow_MemoryPool__bytes_allocated`, pool)
 }
 
-MemoryPool_max_memory <- function(pool) {
-    .Call(`_arrow_MemoryPool_max_memory`, pool)
+MemoryPool__max_memory <- function(pool) {
+    .Call(`_arrow_MemoryPool__max_memory`, pool)
 }
 
 RecordBatch__num_columns <- function(x) {
@@ -345,8 +265,8 @@ RecordBatch__column <- function(batch, i) {
     .Call(`_arrow_RecordBatch__column`, batch, i)
 }
 
-RecordBatch_to_dataframe <- function(batch) {
-    .Call(`_arrow_RecordBatch_to_dataframe`, batch)
+RecordBatch__to_dataframe <- function(batch) {
+    .Call(`_arrow_RecordBatch__to_dataframe`, batch)
 }
 
 read_record_batch_ <- function(path) {
@@ -417,3 +337,83 @@ Table__column <- function(table, i) {
     .Call(`_arrow_Table__column`, table, i)
 }
 
+Array__from_vector <- function(x) {
+    .Call(`_arrow_Array__from_vector`, x)
+}
+
+Array__as_vector <- function(array) {
+    .Call(`_arrow_Array__as_vector`, array)
+}
+
+Array__Slice1 <- function(array, offset) {
+    .Call(`_arrow_Array__Slice1`, array, offset)
+}
+
+Array__Slice2 <- function(array, offset, length) {
+    .Call(`_arrow_Array__Slice2`, array, offset, length)
+}
+
+Array__IsNull <- function(x, i) {
+    .Call(`_arrow_Array__IsNull`, x, i)
+}
+
+Array__IsValid <- function(x, i) {
+    .Call(`_arrow_Array__IsValid`, x, i)
+}
+
+Array__length <- function(x) {
+    .Call(`_arrow_Array__length`, x)
+}
+
+Array__offset <- function(x) {
+    .Call(`_arrow_Array__offset`, x)
+}
+
+Array__null_count <- function(x) {
+    .Call(`_arrow_Array__null_count`, x)
+}
+
+Array__type <- function(x) {
+    .Call(`_arrow_Array__type`, x)
+}
+
+Array__ToString <- function(x) {
+    .Call(`_arrow_Array__ToString`, x)
+}
+
+Array__type_id <- function(x) {
+    .Call(`_arrow_Array__type_id`, x)
+}
+
+Array__Equals <- function(lhs, rhs) {
+    .Call(`_arrow_Array__Equals`, lhs, rhs)
+}
+
+Array__ApproxEquals <- function(lhs, rhs) {
+    .Call(`_arrow_Array__ApproxEquals`, lhs, rhs)
+}
+
+Array__data <- function(array) {
+    .Call(`_arrow_Array__data`, array)
+}
+
+Array__RangeEquals <- function(self, other, start_idx, end_idx, other_start_idx) {
+    .Call(`_arrow_Array__RangeEquals`, self, other, start_idx, end_idx, other_start_idx)
+}
+
+Field__initialize <- function(name, type, nullable = TRUE) {
+    .Call(`_arrow_Field__initialize`, name, type, nullable)
+}
+
+Field__ToString <- function(type) {
+    .Call(`_arrow_Field__ToString`, type)
+}
+
+Field__name <- function(type) {
+    .Call(`_arrow_Field__name`, type)
+}
+
+Field__nullable <- function(type) {
+    .Call(`_arrow_Field__nullable`, type)
+}
+
diff --git a/r/src/MemoryPool.cpp b/r/src/MemoryPool.cpp
@@ -20,16 +20,16 @@
 using namespace Rcpp;
 
 // [[Rcpp::export]]
-std::shared_ptr<arrow::MemoryPool> MemoryPool_default(){
+std::shared_ptr<arrow::MemoryPool> MemoryPool__default(){
   return std::shared_ptr<arrow::MemoryPool>(arrow::default_memory_pool(), NoDelete<arrow::MemoryPool>());
 }
 
 // [[Rcpp::export]]
-int MemoryPool_bytes_allocated(std::shared_ptr<arrow::MemoryPool> pool){
+int MemoryPool__bytes_allocated(std::shared_ptr<arrow::MemoryPool> pool){
   return pool->bytes_allocated();
 }
 
 // [[Rcpp::export]]
-int MemoryPool_max_memory(std::shared_ptr<arrow::MemoryPool> pool){
+int MemoryPool__max_memory(std::shared_ptr<arrow::MemoryPool> pool){
   return pool->max_memory();
 }