From 5687fd7ac7eac1eeb2f12b954259ebf2672f6827 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Sat, 16 Mar 2019 00:20:34 +0000 Subject: [PATCH 01/18] [R] Progress towards completing windows support --- r/.gitignore | 2 +- r/src/Makevars.win | 20 ++++++++++++++++++++ r/tools/winlibs.R | 9 +++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 r/src/Makevars.win create mode 100644 r/tools/winlibs.R diff --git a/r/.gitignore b/r/.gitignore index 0f405f57136..9532537ff0d 100644 --- a/r/.gitignore +++ b/r/.gitignore @@ -10,4 +10,4 @@ inst/doc .Rproj.user .Rhistory src/Makevars - +windows/ diff --git a/r/src/Makevars.win b/r/src/Makevars.win new file mode 100644 index 00000000000..c8a927d83f9 --- /dev/null +++ b/r/src/Makevars.win @@ -0,0 +1,20 @@ +VERSION = 0.12.0.9000 +RWINLIB = ../windows/arrow-$(VERSION) +PKG_CPPFLAGS = -I$(RWINLIB)/include -DARROW_STATIC -DPARQUET_STATIC +CXX_STD = CXX11 + +PKG_LIBS = \ + -L$(RWINLIB)/lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH) \ + -L$(RWINLIB)/lib$(R_ARCH) \ + -lparquet -larrow -lthrift -lboost_regex-mt-s -ldouble-conversion -lWs2_32 + +#all: clean +all: $(SHLIB) + +$(OBJECTS): winlibs + +winlibs: + "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R" $(VERSION) + +clean: + rm -f $(SHLIB) $(OBJECTS) diff --git a/r/tools/winlibs.R b/r/tools/winlibs.R new file mode 100644 index 00000000000..e9bf112acf8 --- /dev/null +++ b/r/tools/winlibs.R @@ -0,0 +1,9 @@ +# Download static arrow from rwinlib +VERSION <- commandArgs(TRUE) +if(!file.exists(sprintf("../windows/arrow-%s/include/arrow/api.h", VERSION))){ + if(getRversion() < "3.3.0") setInternet2() + download.file(sprintf("https://github.com/rwinlib/arrow/archive/v%s.zip", VERSION), "lib.zip", quiet = TRUE) + dir.create("../windows", showWarnings = FALSE) + unzip("lib.zip", exdir = "../windows") + unlink("lib.zip") +} From f730b2b7d2f0c6c4428482c0a42acd74195b1ac5 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Fri, 22 Mar 2019 12:53:40 -0700 Subject: [PATCH 02/18] fix apache rat warnings --- r/src/Makevars.win | 17 +++++++++++++++++ r/tools/winlibs.R | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/r/src/Makevars.win b/r/src/Makevars.win index c8a927d83f9..bcb92cdf4ec 100644 --- a/r/src/Makevars.win +++ b/r/src/Makevars.win @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + VERSION = 0.12.0.9000 RWINLIB = ../windows/arrow-$(VERSION) PKG_CPPFLAGS = -I$(RWINLIB)/include -DARROW_STATIC -DPARQUET_STATIC diff --git a/r/tools/winlibs.R b/r/tools/winlibs.R index e9bf112acf8..12391c77d63 100644 --- a/r/tools/winlibs.R +++ b/r/tools/winlibs.R @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + # Download static arrow from rwinlib VERSION <- commandArgs(TRUE) if(!file.exists(sprintf("../windows/arrow-%s/include/arrow/api.h", VERSION))){ From dbef3ace401cff734041c40ba25d660ab0184ef4 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Mon, 18 Mar 2019 15:35:24 +0000 Subject: [PATCH 03/18] attempt to resolve gcc reference devtools install --- r/src/Makevars.win | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r/src/Makevars.win b/r/src/Makevars.win index bcb92cdf4ec..b21a24017b6 100644 --- a/r/src/Makevars.win +++ b/r/src/Makevars.win @@ -21,7 +21,7 @@ PKG_CPPFLAGS = -I$(RWINLIB)/include -DARROW_STATIC -DPARQUET_STATIC CXX_STD = CXX11 PKG_LIBS = \ - -L$(RWINLIB)/lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH) \ + -L$(RWINLIB)/lib-4.9.3$(R_ARCH) \ -L$(RWINLIB)/lib$(R_ARCH) \ -lparquet -larrow -lthrift -lboost_regex-mt-s -ldouble-conversion -lWs2_32 From ac15461a656b573f575e7c4cdad1dd511faac174 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Fri, 22 Mar 2019 00:27:58 +0000 Subject: [PATCH 04/18] sync makevars.win' --- r/src/Makevars.win | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/r/src/Makevars.win b/r/src/Makevars.win index b21a24017b6..22e20487dd4 100644 --- a/r/src/Makevars.win +++ b/r/src/Makevars.win @@ -21,9 +21,9 @@ PKG_CPPFLAGS = -I$(RWINLIB)/include -DARROW_STATIC -DPARQUET_STATIC CXX_STD = CXX11 PKG_LIBS = \ - -L$(RWINLIB)/lib-4.9.3$(R_ARCH) \ + -L$(RWINLIB)/lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH) \ -L$(RWINLIB)/lib$(R_ARCH) \ - -lparquet -larrow -lthrift -lboost_regex-mt-s -ldouble-conversion -lWs2_32 + -lparquet -larrow -lthrift -lboost_regex-mt-s -ldouble-conversion -lz -lws2_32 #all: clean all: $(SHLIB) From e8d5783bb9227f0f97b3e26ff75ff303e3aa974e Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Fri, 22 Mar 2019 00:28:15 +0000 Subject: [PATCH 05/18] fix compiler warnings --- r/src/array__to_vector.cpp | 2 ++ r/src/array_from_vector.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/r/src/array__to_vector.cpp b/r/src/array__to_vector.cpp index d4eec29c3db..5596d79df04 100644 --- a/r/src/array__to_vector.cpp +++ b/r/src/array__to_vector.cpp @@ -434,6 +434,8 @@ class Converter_Time : public Converter { case TimeUnit::NANO: return 1000000000; } + + return 0; } }; diff --git a/r/src/array_from_vector.cpp b/r/src/array_from_vector.cpp index 9e61e75da8a..0fce0bb98dc 100644 --- a/r/src/array_from_vector.cpp +++ b/r/src/array_from_vector.cpp @@ -566,6 +566,8 @@ inline int64_t get_time_multiplier(TimeUnit::type unit) { case TimeUnit::NANO: return 1000000000; } + + return 0; } template From 6bb7098ef6d25162c247fea9afa739df7d02cdcf Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Fri, 22 Mar 2019 00:28:49 +0000 Subject: [PATCH 06/18] skip compressed test due to windows failure --- r/tests/testthat/test-compressed.R | 2 ++ 1 file changed, 2 insertions(+) diff --git a/r/tests/testthat/test-compressed.R b/r/tests/testthat/test-compressed.R index 11574756d2a..7723ae65a11 100644 --- a/r/tests/testthat/test-compressed.R +++ b/r/tests/testthat/test-compressed.R @@ -18,6 +18,8 @@ context("arrow::io::Compressed.*Stream") test_that("can write Buffer to CompressedOutputStream and read back in CompressedInputStream", { + skip("Unsupported") + buf <- buffer(as.raw(sample(0:255, size = 1024, replace = TRUE))) tf1 <- tempfile() From c5e1f1509a14613d5f08d53d3bca48c56faba4c0 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Fri, 22 Mar 2019 00:29:53 +0000 Subject: [PATCH 07/18] fix s3 reexports r cmd check warnings --- r/R/reexports-bit64.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/r/R/reexports-bit64.R b/r/R/reexports-bit64.R index 90a6e458be0..5b30ff69c16 100644 --- a/r/R/reexports-bit64.R +++ b/r/R/reexports-bit64.R @@ -17,8 +17,8 @@ #' @importFrom bit64 print.integer64 #' @export -bit64::print.integer64 +NULL #' @importFrom bit64 str.integer64 #' @export -bit64::str.integer64 +NULL From 46f0b6be3112db4d5dae5a6079fc040a8dc6892b Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Fri, 22 Mar 2019 00:30:07 +0000 Subject: [PATCH 08/18] update rbuildignore --- r/.Rbuildignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/r/.Rbuildignore b/r/.Rbuildignore index be540f7f81a..b51d7bc46ab 100644 --- a/r/.Rbuildignore +++ b/r/.Rbuildignore @@ -7,3 +7,5 @@ LICENSE.md lint.sh Dockerfile .*\.tar\.gz +^windows +clang_format.sh From 63151e550faca29defad852825523eb4f855ffe6 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Fri, 22 Mar 2019 00:30:38 +0000 Subject: [PATCH 09/18] rebuild docs --- r/NAMESPACE | 3 +-- r/man/reexports.Rd | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/r/NAMESPACE b/r/NAMESPACE index aba8bbc2698..5b839962a10 100644 --- a/r/NAMESPACE +++ b/r/NAMESPACE @@ -85,6 +85,7 @@ S3method(write_feather_RecordBatch,"arrow::io::OutputStream") S3method(write_feather_RecordBatch,character) S3method(write_feather_RecordBatch,default) S3method(write_feather_RecordBatch,fs_path) +export() export(BufferOutputStream) export(BufferReader) export(CompressedInputStream) @@ -137,7 +138,6 @@ export(list_of) export(mmap_create) export(mmap_open) export(null) -export(print.integer64) export(read_arrow) export(read_csv_arrow) export(read_feather) @@ -148,7 +148,6 @@ export(read_schema) export(read_table) export(record_batch) export(schema) -export(str.integer64) export(struct) export(table) export(time32) diff --git a/r/man/reexports.Rd b/r/man/reexports.Rd index 66194feadbf..5171b3eb555 100644 --- a/r/man/reexports.Rd +++ b/r/man/reexports.Rd @@ -1,10 +1,8 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/reexports-bit64.R, R/reexports-tibble.R +% Please edit documentation in R/reexports-tibble.R \docType{import} \name{reexports} \alias{reexports} -\alias{print.integer64} -\alias{str.integer64} \alias{as_tibble} \title{Objects exported from other packages} \keyword{internal} @@ -13,8 +11,6 @@ These objects are imported from other packages. Follow the links below to see their documentation. \describe{ - \item{bit64}{\code{\link[bit64]{print.integer64}}, \code{\link[bit64]{str.integer64}}} - \item{tibble}{\code{\link[tibble]{as_tibble}}} }} From 591f765f69d547912af249f8d9bafbba7b8b71e5 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Fri, 22 Mar 2019 14:58:20 -0700 Subject: [PATCH 10/18] modivy R's makevars.win file on release script --- dev/release/00-prepare.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dev/release/00-prepare.sh b/dev/release/00-prepare.sh index 5f7c098e00c..c77207198aa 100755 --- a/dev/release/00-prepare.sh +++ b/dev/release/00-prepare.sh @@ -97,6 +97,14 @@ update_versions() { git add DESCRIPTION cd - + cd "${SOURCE_DIR}/../../r/src" + sed -i.bak -E -e \ + "s/^VERSION = .+/VERSION = ${r_version}/" \ + Makevars.win + rm -f Makevars.win.bak + git add Makevars.win + cd - + cd "${SOURCE_DIR}/../../ruby" sed -i.bak -E -e \ "s/^ VERSION = \".+\"/ VERSION = \"${version}\"/g" \ From e506858caec906b2d1fbcb17db3e4b8b4e95b074 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Mon, 25 Mar 2019 08:19:19 -0700 Subject: [PATCH 11/18] address pr feedback --- r/R/reexports-bit64.R | 4 ++-- r/src/array__to_vector.cpp | 4 ++-- r/src/array_from_vector.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/r/R/reexports-bit64.R b/r/R/reexports-bit64.R index 5b30ff69c16..173cfa7e364 100644 --- a/r/R/reexports-bit64.R +++ b/r/R/reexports-bit64.R @@ -17,8 +17,8 @@ #' @importFrom bit64 print.integer64 #' @export -NULL +bit64::print.integer64 #' @importFrom bit64 str.integer64 #' @export -NULL +bit64::print.integer64 diff --git a/r/src/array__to_vector.cpp b/r/src/array__to_vector.cpp index 5596d79df04..f4017c0ab5f 100644 --- a/r/src/array__to_vector.cpp +++ b/r/src/array__to_vector.cpp @@ -433,9 +433,9 @@ class Converter_Time : public Converter { return 1000000; case TimeUnit::NANO: return 1000000000; + default: + return 0; } - - return 0; } }; diff --git a/r/src/array_from_vector.cpp b/r/src/array_from_vector.cpp index 0fce0bb98dc..83d9f78ae5d 100644 --- a/r/src/array_from_vector.cpp +++ b/r/src/array_from_vector.cpp @@ -565,9 +565,9 @@ inline int64_t get_time_multiplier(TimeUnit::type unit) { return 1000000; case TimeUnit::NANO: return 1000000000; + default: + return 0; } - - return 0; } template From 72d87c99def41550687c7b5af982571974e45513 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Mon, 25 Mar 2019 08:19:28 -0700 Subject: [PATCH 12/18] rebuild docs --- r/NAMESPACE | 2 +- r/man/reexports.Rd | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/r/NAMESPACE b/r/NAMESPACE index 5b839962a10..2f69b19f90a 100644 --- a/r/NAMESPACE +++ b/r/NAMESPACE @@ -85,7 +85,6 @@ S3method(write_feather_RecordBatch,"arrow::io::OutputStream") S3method(write_feather_RecordBatch,character) S3method(write_feather_RecordBatch,default) S3method(write_feather_RecordBatch,fs_path) -export() export(BufferOutputStream) export(BufferReader) export(CompressedInputStream) @@ -138,6 +137,7 @@ export(list_of) export(mmap_create) export(mmap_open) export(null) +export(print.integer64) export(read_arrow) export(read_csv_arrow) export(read_feather) diff --git a/r/man/reexports.Rd b/r/man/reexports.Rd index 5171b3eb555..d8d10797764 100644 --- a/r/man/reexports.Rd +++ b/r/man/reexports.Rd @@ -1,8 +1,9 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/reexports-tibble.R +% Please edit documentation in R/reexports-bit64.R, R/reexports-tibble.R \docType{import} \name{reexports} \alias{reexports} +\alias{print.integer64} \alias{as_tibble} \title{Objects exported from other packages} \keyword{internal} @@ -11,6 +12,8 @@ These objects are imported from other packages. Follow the links below to see their documentation. \describe{ + \item{bit64}{\code{\link[bit64]{print.integer64}}, \code{\link[bit64]{print.integer64}}} + \item{tibble}{\code{\link[tibble]{as_tibble}}} }} From 7a9e8161ea787f1e633edfac68abd51e917196d3 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Tue, 26 Mar 2019 00:28:01 +0000 Subject: [PATCH 13/18] support using locally built rtools binaries --- r/src/Makevars.win | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/r/src/Makevars.win b/r/src/Makevars.win index 22e20487dd4..8a9664a22e0 100644 --- a/r/src/Makevars.win +++ b/r/src/Makevars.win @@ -16,13 +16,23 @@ # under the License. VERSION = 0.12.0.9000 -RWINLIB = ../windows/arrow-$(VERSION) -PKG_CPPFLAGS = -I$(RWINLIB)/include -DARROW_STATIC -DPARQUET_STATIC + +ifeq "$(ARROW_PATH)" "" + RWINLIB = ../windows/arrow-$(VERSION) + ARROW_INCLUDE = $(RWINLIB)/include + ARROW_LIBS = $(RWINLIB)/lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH) + OTHER_LIBS = -L$(RWINLIB)/lib$(R_ARCH) +else + ARROW_INCLUDE = $(ARROW_PATH)/include + ARROW_LIBS = $(ARROW_PATH)/lib +endif + +PKG_CPPFLAGS = -I$(ARROW_INCLUDE) -DARROW_STATIC -DPARQUET_STATIC CXX_STD = CXX11 PKG_LIBS = \ - -L$(RWINLIB)/lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH) \ - -L$(RWINLIB)/lib$(R_ARCH) \ + -L$(ARROW_LIBS) \ + $(OTHER_LIBS) \ -lparquet -larrow -lthrift -lboost_regex-mt-s -ldouble-conversion -lz -lws2_32 #all: clean From 1730e1b28fc2d8bf943869ca83f94d91483abe2f Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Mon, 25 Mar 2019 18:41:19 -0700 Subject: [PATCH 14/18] fix pr feedback --- r/R/reexports-bit64.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r/R/reexports-bit64.R b/r/R/reexports-bit64.R index 173cfa7e364..90a6e458be0 100644 --- a/r/R/reexports-bit64.R +++ b/r/R/reexports-bit64.R @@ -21,4 +21,4 @@ bit64::print.integer64 #' @importFrom bit64 str.integer64 #' @export -bit64::print.integer64 +bit64::str.integer64 From b180995f8735069a4479f643d52b2b4146ce0f66 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Mon, 25 Mar 2019 18:41:24 -0700 Subject: [PATCH 15/18] rebuild docs --- r/NAMESPACE | 1 + r/man/reexports.Rd | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/r/NAMESPACE b/r/NAMESPACE index 2f69b19f90a..aba8bbc2698 100644 --- a/r/NAMESPACE +++ b/r/NAMESPACE @@ -148,6 +148,7 @@ export(read_schema) export(read_table) export(record_batch) export(schema) +export(str.integer64) export(struct) export(table) export(time32) diff --git a/r/man/reexports.Rd b/r/man/reexports.Rd index d8d10797764..66194feadbf 100644 --- a/r/man/reexports.Rd +++ b/r/man/reexports.Rd @@ -4,6 +4,7 @@ \name{reexports} \alias{reexports} \alias{print.integer64} +\alias{str.integer64} \alias{as_tibble} \title{Objects exported from other packages} \keyword{internal} @@ -12,7 +13,7 @@ These objects are imported from other packages. Follow the links below to see their documentation. \describe{ - \item{bit64}{\code{\link[bit64]{print.integer64}}, \code{\link[bit64]{print.integer64}}} + \item{bit64}{\code{\link[bit64]{print.integer64}}, \code{\link[bit64]{str.integer64}}} \item{tibble}{\code{\link[tibble]{as_tibble}}} }} From 2053c1fcac39076107c09541f66187b448960e51 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Mon, 25 Mar 2019 21:15:21 -0700 Subject: [PATCH 16/18] mark compressoutputstream unsupported in windows --- r/R/compression.R | 4 ++++ r/tests/testthat/test-compressed.R | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/r/R/compression.R b/r/R/compression.R index 083774ae0fe..e10fef1bd2e 100644 --- a/r/R/compression.R +++ b/r/R/compression.R @@ -37,10 +37,14 @@ compression_codec <- function(type = "GZIP") { #' Compressed output stream #' +#' @details This function is not supported in Windows. +#' #' @param stream Underlying raw output stream #' @param codec a codec #' @export CompressedOutputStream <- function(stream, codec = compression_codec("GZIP")){ + if (.Platform$OS.type == "windows") stop("'CompressedOutputStream' is unsupported in Windows.") + UseMethod("CompressedOutputStream") } diff --git a/r/tests/testthat/test-compressed.R b/r/tests/testthat/test-compressed.R index 7723ae65a11..c703f0e6158 100644 --- a/r/tests/testthat/test-compressed.R +++ b/r/tests/testthat/test-compressed.R @@ -18,7 +18,7 @@ context("arrow::io::Compressed.*Stream") test_that("can write Buffer to CompressedOutputStream and read back in CompressedInputStream", { - skip("Unsupported") + if (.Platform$OS.type == "windows") skip("Unsupported") buf <- buffer(as.raw(sample(0:255, size = 1024, replace = TRUE))) From 702365911946715182e40e40261cb0118585acb6 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Mon, 25 Mar 2019 21:18:38 -0700 Subject: [PATCH 17/18] no need to export but64 methods to avoid exported but not registered error --- r/R/reexports-bit64.R | 2 -- 1 file changed, 2 deletions(-) diff --git a/r/R/reexports-bit64.R b/r/R/reexports-bit64.R index 90a6e458be0..c89d2b1509b 100644 --- a/r/R/reexports-bit64.R +++ b/r/R/reexports-bit64.R @@ -16,9 +16,7 @@ # under the License. #' @importFrom bit64 print.integer64 -#' @export bit64::print.integer64 #' @importFrom bit64 str.integer64 -#' @export bit64::str.integer64 From 5efa575dc72e00a24b9d052d632eedd59f599c05 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Mon, 25 Mar 2019 21:18:53 -0700 Subject: [PATCH 18/18] rebuild docs --- r/NAMESPACE | 2 -- r/man/CompressedOutputStream.Rd | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/r/NAMESPACE b/r/NAMESPACE index aba8bbc2698..4b799571966 100644 --- a/r/NAMESPACE +++ b/r/NAMESPACE @@ -137,7 +137,6 @@ export(list_of) export(mmap_create) export(mmap_open) export(null) -export(print.integer64) export(read_arrow) export(read_csv_arrow) export(read_feather) @@ -148,7 +147,6 @@ export(read_schema) export(read_table) export(record_batch) export(schema) -export(str.integer64) export(struct) export(table) export(time32) diff --git a/r/man/CompressedOutputStream.Rd b/r/man/CompressedOutputStream.Rd index 85c4d9209ac..d32070ebfd1 100644 --- a/r/man/CompressedOutputStream.Rd +++ b/r/man/CompressedOutputStream.Rd @@ -14,3 +14,6 @@ CompressedOutputStream(stream, codec = compression_codec("GZIP")) \description{ Compressed output stream } +\details{ +This function is not supported in Windows. +}