From 2df5caf715629f12495cc5ab1f50c85702023436 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Sun, 26 Jul 2020 16:12:18 -0700 Subject: [PATCH 1/3] a --- R/pkg/R/DataFrame.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/pkg/R/DataFrame.R b/R/pkg/R/DataFrame.R index 15b3ce293542..4d38f979c410 100644 --- a/R/pkg/R/DataFrame.R +++ b/R/pkg/R/DataFrame.R @@ -1233,7 +1233,7 @@ setMethod("collect", port = port, blocking = TRUE, open = "wb", timeout = connectionTimeout) output <- tryCatch({ doServerAuth(conn, authSecret) - arrowTable <- arrow::read_arrow(readRaw(conn)) + arrowTable <- arrow::read_ipc_stream(readRaw(conn)) # Arrow drops `as_tibble` since 0.14.0, see ARROW-5190. if (exists("as_tibble", envir = asNamespace("arrow"))) { as.data.frame(arrow::as_tibble(arrowTable), stringsAsFactors = stringsAsFactors) From caacdee058068b7fbeb9a092b39e637ebaa65ef7 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Sun, 26 Jul 2020 17:46:25 -0700 Subject: [PATCH 2/3] a --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 1fd91daae901..329e269bef64 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -57,6 +57,8 @@ environment: # "(converted from warning) unable to identify current timezone 'C':" for an unknown reason. # This environment variable works around to test SparkR against a higher version. R_REMOTES_NO_ERRORS_FROM_WARNINGS: true + # AppVeyor doesn't have python3 yet + PYSPARK_PYTHON: python test_script: - cmd: .\bin\spark-submit2.cmd --driver-java-options "-Dlog4j.configuration=file:///%CD:\=/%/R/log4j.properties" --conf spark.hadoop.fs.defaultFS="file:///" R\pkg\tests\run-all.R From af2acdf226d2f92a4ef0f70993496061d09a917a Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Sun, 26 Jul 2020 18:49:50 -0700 Subject: [PATCH 3/3] Revert "a" This reverts commit caacdee058068b7fbeb9a092b39e637ebaa65ef7. --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 329e269bef64..1fd91daae901 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -57,8 +57,6 @@ environment: # "(converted from warning) unable to identify current timezone 'C':" for an unknown reason. # This environment variable works around to test SparkR against a higher version. R_REMOTES_NO_ERRORS_FROM_WARNINGS: true - # AppVeyor doesn't have python3 yet - PYSPARK_PYTHON: python test_script: - cmd: .\bin\spark-submit2.cmd --driver-java-options "-Dlog4j.configuration=file:///%CD:\=/%/R/log4j.properties" --conf spark.hadoop.fs.defaultFS="file:///" R\pkg\tests\run-all.R