Skip to content

ARROW-7045: [R] Preserve factor in Parquet roundtrip #6135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yutannihilation wants to merge 3 commits into from
Closed

ARROW-7045: [R] Preserve factor in Parquet roundtrip #6135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dfd08cb
Add failing tests
yutannihilation Jan 7, 2020
4d8bb46
Remove default_arrow_writer_properties()
yutannihilation Jan 7, 2020
9227e7e
Fix test
yutannihilation Jan 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions r/R/arrowExports.R
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 6 additions & 10 deletions r/R/parquet.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,16 +205,12 @@ ParquetArrowWriterPropertiesBuilder <- R6Class("ParquetArrowWriterPropertiesBuil
ParquetArrowWriterProperties <- R6Class("ParquetArrowWriterProperties", inherit = Object)

ParquetArrowWriterProperties$create <- function(use_deprecated_int96_timestamps = FALSE, coerce_timestamps = NULL, allow_truncated_timestamps = FALSE) {
if (!use_deprecated_int96_timestamps && is.null(coerce_timestamps) && !allow_truncated_timestamps) {
shared_ptr(ParquetArrowWriterProperties, parquet___default_arrow_writer_properties())
} else {
builder <- shared_ptr(ParquetArrowWriterPropertiesBuilder, parquet___ArrowWriterProperties___Builder__create())
builder$store_schema()
builder$set_int96_support(use_deprecated_int96_timestamps)
builder$set_coerce_timestamps(coerce_timestamps)
builder$set_allow_truncated_timestamps(allow_truncated_timestamps)
shared_ptr(ParquetArrowWriterProperties, parquet___ArrowWriterProperties___Builder__build(builder))
}
builder <- shared_ptr(ParquetArrowWriterPropertiesBuilder, parquet___ArrowWriterProperties___Builder__create())
builder$store_schema()
builder$set_int96_support(use_deprecated_int96_timestamps)
builder$set_coerce_timestamps(coerce_timestamps)
builder$set_allow_truncated_timestamps(allow_truncated_timestamps)
shared_ptr(ParquetArrowWriterProperties, parquet___ArrowWriterProperties___Builder__build(builder))
}

valid_parquet_version <- c(
Expand Down
15 changes: 0 additions & 15 deletions r/src/arrowExports.cpp
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions r/src/parquet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,6 @@ std::shared_ptr<arrow::Table> parquet___arrow___FileReader__ReadTable2(
return table;
}

// [[arrow::export]]
std::shared_ptr<parquet::ArrowWriterProperties>
parquet___default_arrow_writer_properties() {
return parquet::default_arrow_writer_properties();
}

// [[arrow::export]]
std::shared_ptr<parquet::ArrowWriterProperties::Builder>
parquet___ArrowWriterProperties___Builder__create() {
Expand Down
14 changes: 14 additions & 0 deletions r/tests/testthat/test-parquet.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,17 @@ test_that("write_parquet() defaults to snappy compression", {
write_parquet(mtcars, tmp2, compression = "snappy")
expect_equal(file.size(tmp1), file.size(tmp2))
})

test_that("Factors are preserved when writing/reading from Parquet", {
fct <- factor(c("a", "b"), levels = c("c", "a", "b"))
ord <- factor(c("a", "b"), levels = c("c", "a", "b"), ordered = TRUE)
chr <- c("a", "b")
df <- tibble::tibble(fct = fct, ord = ord, chr = chr)

pq_tmp_file <- tempfile()
on.exit(unlink(pq_tmp_file))

write_parquet(df, pq_tmp_file)
df_read <- read_parquet(pq_tmp_file)
expect_identical(df, df_read)
})