using assert_that()

kszucs · Sep 27, 2019 · 72caaab · 72caaab
1 parent 738ea6e
commit 72caaab
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 19 deletions.
diff --git a/r/NAMESPACE b/r/NAMESPACE
@@ -174,6 +174,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)

diff --git a/r/R/arrow-package.R b/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

diff --git a/r/R/parquet.R b/r/R/parquet.R
@@ -83,8 +83,6 @@ ParquetWriterProperties_Builder <- R6Class("ParquetWriterProperties_Builder", in
     set_compression = function(table, compression){
       if (is.character(compression) && is.null(names(compression)) && length(compression) == 1L) {
         parquet___ArrowWriterProperties___Builder__default_compression(self, compression_from_name(compression))
-      } else if (inherits(compression, "Codec")) {
-        parquet___ArrowWriterProperties___Builder__default_compression(self, compression_from_name(compression$name))
       } else {
         column_names <- names(table)
         if (is.character(compression) && is.null(names(compression)) && length(compression) == length(column_names)) {
@@ -98,9 +96,8 @@ ParquetWriterProperties_Builder <- R6Class("ParquetWriterProperties_Builder", in
     },
 
     set_compression_level = function(table, compression_level){
-      if (!rlang::is_integerish(compression_level)) {
-        abort("unsupported compression_level= specification")
-      }
+      assert_that(is_integerish(compression_level), msg = "unsupported compression_level= specification")
+
       column_names <- names(table)
       if (is.null(given_names <- names(compression_level))) {
         if (length(compression_level) == 1L) {
@@ -116,9 +113,7 @@ ParquetWriterProperties_Builder <- R6Class("ParquetWriterProperties_Builder", in
     },
 
     set_dictionary = function(table, use_dictionary) {
-      if (!is.logical(use_dictionary)) {
-        abort("unsupported use_dictionary= specification")
-      }
+      assert_that(is.logical(use_dictionary), msg = "unsupported use_dictionary= specification")
 
       column_names <- names(table)
       if (is.null(given_names <- names(use_dictionary))) {
@@ -135,9 +130,7 @@ ParquetWriterProperties_Builder <- R6Class("ParquetWriterProperties_Builder", in
     },
 
     set_write_statistics = function(table, write_statistics) {
-      if (!is.logical(write_statistics)) {
-        abort("unsupported write_statistics= specification")
-      }
+      assert_that(is.logical(write_statistics), msg = "unsupported write_statistics= specification")
 
       column_names <- names(table)
       if (is.null(given_names <- names(write_statistics))) {
@@ -212,14 +205,13 @@ ParquetFileWriter$create <- function(
 #' [Parquet](https://parquet.apache.org/) is a columnar storage file format.
 #' This function enables you to write Parquet files from R.
 #'
-#' @param table An [arrow::Table][Table], or an object convertible to it with [to_arrow()]
+#' @param table An [arrow::Table][Table], or an object convertible to it.
 #' @param sink an [arrow::io::OutputStream][OutputStream] or a string which is interpreted as a file path
 #' @param chunk_size chunk size. If NULL, the number of rows of the table is used
 #'
 #' @param version parquet version
 #' @param compression compression specification. Possible values:
 #'  - a single string: uses that compression algorithm for all columns
-#'  - a single [Codec][Codec] instance: uses that compression algorithm for all columns
 #'  - an unnamed string vector: specify a compression algorithm for each, same order as the columns
 #'  - a named string vector: specify compression algorithm individually
 #' @param compression_level compression level. A single integer, a named integer vector

diff --git a/r/man/write_parquet.Rd b/r/man/write_parquet.Rd
diff --git a/r/tests/testthat/test-parquet.R b/r/tests/testthat/test-parquet.R
@@ -57,9 +57,6 @@ test_that("write_parquet() handles various compression= specs", {
   # a single string
   expect_error(write_parquet(tab, tf, compression = "snappy"), NA)
 
-  # a single Codec
-  expect_error(write_parquet(tab, tf, compression = Codec$create("snappy")), NA)
-
   # one string per column
   expect_error(write_parquet(tab, tf, compression = rep("snappy", 3L)), NA)