diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 97843d2ef0cb..ac35dcfeedc1 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -713,6 +713,13 @@ tasks: R_DUCKDB_DEV: TRUE image: ubuntu-r-only-r + test-r-dataset-without-parquet: + ci: github + template: docker-tests/github.linux.yml + params: + flags: '-e ARROW_DATASET=ON -e ARROW_PARQUET=OFF' + image: ubuntu-r-only-r + test-r-offline-maximal: ci: github template: r/github.linux.offline.build.yml diff --git a/r/src/arrowExports.cpp b/r/src/arrowExports.cpp index 14c6330074a2..23710fb30d77 100644 --- a/r/src/arrowExports.cpp +++ b/r/src/arrowExports.cpp @@ -1836,7 +1836,7 @@ extern "C" SEXP _arrow_dataset___FileFormat__DefaultWriteOptions(SEXP fmt_sexp){ #endif // dataset.cpp -#if defined(ARROW_R_WITH_DATASET) +#if defined(ARROW_R_WITH_DATASET) && defined(ARROW_R_WITH_PARQUET) std::shared_ptr dataset___ParquetFileFormat__Make(const std::shared_ptr& options, cpp11::strings dict_columns); extern "C" SEXP _arrow_dataset___ParquetFileFormat__Make(SEXP options_sexp, SEXP dict_columns_sexp){ BEGIN_CPP11 @@ -1867,7 +1867,7 @@ extern "C" SEXP _arrow_dataset___FileWriteOptions__type_name(SEXP options_sexp){ #endif // dataset.cpp -#if defined(ARROW_R_WITH_DATASET) +#if defined(ARROW_R_WITH_DATASET) && defined(ARROW_R_WITH_PARQUET) void dataset___ParquetFileWriteOptions__update(const std::shared_ptr& options, const std::shared_ptr& writer_props, const std::shared_ptr& arrow_writer_props); extern "C" SEXP _arrow_dataset___ParquetFileWriteOptions__update(SEXP options_sexp, SEXP writer_props_sexp, SEXP arrow_writer_props_sexp){ BEGIN_CPP11 @@ -2033,7 +2033,7 @@ extern "C" SEXP _arrow_dataset___JsonFragmentScanOptions__Make(SEXP parse_option #endif // dataset.cpp -#if defined(ARROW_R_WITH_DATASET) +#if defined(ARROW_R_WITH_DATASET) && defined(ARROW_R_WITH_PARQUET) std::shared_ptr dataset___ParquetFragmentScanOptions__Make(bool use_buffered_stream, int64_t buffer_size, bool pre_buffer, int32_t thrift_string_size_limit, int32_t thrift_container_size_limit); extern "C" SEXP _arrow_dataset___ParquetFragmentScanOptions__Make(SEXP use_buffered_stream_sexp, SEXP buffer_size_sexp, SEXP pre_buffer_sexp, SEXP thrift_string_size_limit_sexp, SEXP thrift_container_size_limit_sexp){ BEGIN_CPP11 diff --git a/r/src/dataset.cpp b/r/src/dataset.cpp index e53fc03bdb41..2a47f477ef9d 100644 --- a/r/src/dataset.cpp +++ b/r/src/dataset.cpp @@ -27,7 +27,10 @@ #include #include #include + +#if defined(ARROW_R_WITH_PARQUET) #include +#endif namespace ds = ::arrow::dataset; namespace fs = ::arrow::fs; @@ -223,6 +226,7 @@ std::shared_ptr dataset___FileFormat__DefaultWriteOptions( return fmt->DefaultWriteOptions(); } +#if defined(ARROW_R_WITH_PARQUET) // [[dataset::export]] std::shared_ptr dataset___ParquetFileFormat__Make( const std::shared_ptr& options, @@ -237,6 +241,7 @@ std::shared_ptr dataset___ParquetFileFormat__Make( return fmt; } +#endif // [[dataset::export]] std::string dataset___FileWriteOptions__type_name( @@ -339,6 +344,7 @@ std::shared_ptr dataset___JsonFragmentScanOptions__ return options; } +#if defined(ARROW_R_WITH_PARQUET) // [[dataset::export]] std::shared_ptr dataset___ParquetFragmentScanOptions__Make(bool use_buffered_stream, int64_t buffer_size, @@ -362,6 +368,7 @@ dataset___ParquetFragmentScanOptions__Make(bool use_buffered_stream, int64_t buf thrift_container_size_limit); return options; } +#endif // DirectoryPartitioning, HivePartitioning