ARROW-6532 [R] write_parquet() uses writer properties (general and arrow specific)

r/NAMESPACE

@@ -3,16 +3,12 @@
 S3method("!=",Object)
 S3method("$",RecordBatch)
 S3method("$",Table)
-S3method("==",Array)
-S3method("==",DataType)
-S3method("==",Field)
-S3method("==",Message)
-S3method("==",RecordBatch)
-S3method("==",Schema)
+S3method("==",Object)
 S3method("[",RecordBatch)
 S3method("[",Table)
 S3method("[[",RecordBatch)
 S3method("[[",Table)
+S3method(all,equal.Object)
 S3method(as.data.frame,RecordBatch)
 S3method(as.data.frame,Table)
 S3method(as.raw,Buffer)
@@ -84,6 +80,7 @@ export(MessageType)
 export(MockOutputStream)
 export(ParquetFileReader)
 export(ParquetReaderProperties)
+export(ParquetVersionType)
 export(RandomAccessFile)
 export(ReadableFile)
 export(RecordBatchFileReader)
@@ -173,6 +170,7 @@ importFrom(rlang,dots_n)
 importFrom(rlang,enquo)
 importFrom(rlang,enquos)
 importFrom(rlang,is_false)
+importFrom(rlang,is_integerish)
 importFrom(rlang,list2)
 importFrom(rlang,quo_is_null)
 importFrom(rlang,warn)

r/R/array.R

@@ -156,6 +156,3 @@ length.Array <- function(x) x$length()
 
 #' @export
 as.vector.Array <- function(x, mode) x$as_vector()
-
-#' @export
-`==.Array` <- function(x, y) x$Equals(y)

r/R/arrow-package.R

@@ -18,7 +18,7 @@
 #' @importFrom R6 R6Class
 #' @importFrom purrr map map_int map2
 #' @importFrom assertthat assert_that
-#' @importFrom rlang list2 %||% is_false abort dots_n warn enquo quo_is_null enquos
+#' @importFrom rlang list2 %||% is_false abort dots_n warn enquo quo_is_null enquos is_integerish
 #' @importFrom Rcpp sourceCpp
 #' @importFrom tidyselect vars_select
 #' @useDynLib arrow, .registration = TRUE
@@ -66,6 +66,16 @@ Object <- R6Class("Object",
 #' @export
 `!=.Object` <- function(lhs, rhs) !(lhs == rhs)
 
+#' @export
+`==.Object` <- function(x, y) {
+  x$Equals(y)
+}
+
+#' @export
+all.equal.Object <- function(target, current, ...) {
+  target == current
+}
+
 shared_ptr <- function(class, xp) {
   if (!shared_ptr_is_null(xp)) class$new(xp)
 }

r/R/buffer.R

@@ -38,7 +38,8 @@
 Buffer <- R6Class("Buffer", inherit = Object,
   public = list(
     ZeroPadding = function() Buffer__ZeroPadding(self),
-    data = function() Buffer__data(self)
+    data = function() Buffer__data(self),
+    Equals = function(other) Buffer__Equals(self, other)
   ),
 
   active = list(

r/R/chunked-array.R

@@ -83,6 +83,9 @@ ChunkedArray <- R6Class("ChunkedArray", inherit = Object,
         }
       }
       out
+    },
+    Equals = function(other) {
+      ChunkedArray__Equals(self, other)
     }
   ),
   active = list(

r/R/compression.R

@@ -36,18 +36,26 @@
 #' @rdname Codec
 #' @name Codec
 #' @export
-Codec <- R6Class("Codec", inherit = Object)
+Codec <- R6Class("Codec", inherit = Object,
+  active = list(
+    name = function() util___Codec__name(self),
+    level = function() abort("Codec$level() not yet implemented")
+  )
+)
 Codec$create <- function(type = "gzip", compression_level = NA) {
   if (is.character(type)) {
     type <- unique_ptr(Codec, util___Codec__Create(
-      CompressionType[[match.arg(toupper(type), names(CompressionType))]],
-      compression_level
+      compression_from_name(type), compression_level
     ))
   }
   assert_is(type, "Codec")
   type
 }
 
+compression_from_name <- function(name) {
+  map_int(name, ~CompressionType[[match.arg(toupper(.x), names(CompressionType))]])
+}
+
 #' @title Compressed stream classes
 #' @rdname compression
 #' @name compression

r/R/enums.R

@@ -84,3 +84,9 @@ CompressionType <- enum("Compression::type",
 FileType <- enum("FileType",
   NonExistent = 0L, Unknown = 1L, File = 2L, Directory = 3L
 )
+
+#' @export
+#' @rdname enums
+ParquetVersionType <- enum("ParquetVersionType",
+  PARQUET_1_0 = 0L, PARQUET_2_0 = 1L
+)

r/R/feather.R

@@ -17,8 +17,8 @@
 
 #' Write data in the Feather format
 #'
-#' @param data `data.frame` or RecordBatch
-#' @param stream A file path or an OutputStream
+#' @param x `data.frame` or RecordBatch
+#' @param sink A file path or an OutputStream
 #'
 #' @export
 #' @examples
@@ -30,20 +30,20 @@
 #' })
 #' }
 #' @include arrow-package.R
-write_feather <- function(data, stream) {
-  if (is.data.frame(data)) {
-    data <- record_batch(data)
+write_feather <- function(x, sink) {
+  if (is.data.frame(x)) {
+    x <- record_batch(x)
   }
-  assert_is(data, "RecordBatch")
+  assert_is(x, "RecordBatch")
 
-  if (is.character(stream)) {
-    stream <- FileOutputStream$create(stream)
-    on.exit(stream$close())
+  if (is.character(sink)) {
+    sink <- FileOutputStream$create(sink)
+    on.exit(sink$close())
   }
-  assert_is(stream, "OutputStream")
+  assert_is(sink, "OutputStream")
 
-  writer <- FeatherTableWriter$create(stream)
-  ipc___TableWriter__RecordBatch__WriteFeather(writer, data)
+  writer <- FeatherTableWriter$create(sink)
+  ipc___TableWriter__RecordBatch__WriteFeather(writer, x)
 }
 
 #' @title FeatherTableWriter class

r/R/field.R

@@ -67,11 +67,6 @@ Field$create <- function(name, type, metadata) {
   shared_ptr(Field, Field__initialize(name, type, TRUE))
 }
 
-#' @export
-`==.Field` <- function(lhs, rhs){
-  lhs$Equals(rhs)
-}
-
 #' @param name field name
 #' @param type logical type, instance of [DataType]
 #' @param metadata currently ignored

r/R/message.R

@@ -45,9 +45,6 @@ Message <- R6Class("Message", inherit = Object,
   )
 )
 
-#' @export
-`==.Message` <- function(x, y) x$Equals(y)
-
 #' @title class arrow::MessageReader
 #'
 #' @usage NULL