From 09a853d2ab368e812d96a81c418129840feeda9c Mon Sep 17 00:00:00 2001 From: hrbrmstr Date: Mon, 1 Jun 2020 13:48:50 -0400 Subject: [PATCH] v0.9.0 --- .Rbuildignore | 1 + CRAN-RELEASE | 2 ++ DESCRIPTION | 4 ++-- R/custom.r | 2 +- R/dplyr.r | 6 +++--- R/rest-api.r | 5 ++--- README.md | 4 ++-- cran-comments.md | 34 ++++++---------------------------- man/drill_active.Rd | 4 ++-- man/drill_custom_functions.Rd | 4 ++-- man/src_drill.Rd | 6 +++--- man/src_tbls.Rd | 4 ++-- 12 files changed, 28 insertions(+), 48 deletions(-) create mode 100644 CRAN-RELEASE diff --git a/.Rbuildignore b/.Rbuildignore index 5a30fb6..b93fea4 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -13,3 +13,4 @@ ^cdh4-repository_1\.0_all\.deb$ ^cran-comments\.md$ ^pre$ +^CRAN-RELEASE$ diff --git a/CRAN-RELEASE b/CRAN-RELEASE new file mode 100644 index 0000000..1317f8d --- /dev/null +++ b/CRAN-RELEASE @@ -0,0 +1,2 @@ +This package was submitted to CRAN on 2020-06-01. +Once it is accepted, delete this file and tag the release (commit facda32646). diff --git a/DESCRIPTION b/DESCRIPTION index ddc748d..9b4d51a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -12,9 +12,9 @@ Authors@R: c( person("James", "Lamb", email = "jaylamb20@gmail.com", role = "ctb") ) Description: Apache Drill is a low-latency distributed query engine designed to enable - data exploration and analytics on both relational and non-relational datastores, + data exploration and analysis on both relational and non-relational data stores, scaling to petabytes of data. Methods are provided that enable working with Apache - Drill instances via the REST API, JDBC interface (optional), DBI methods + Drill instances via the REST API, DBI methods and using 'dplyr'/'dbplyr' idioms. Helper functions are included to facilitate using official Drill Docker images/containers. Depends: diff --git a/R/custom.r b/R/custom.r index df8952c..df13fd9 100644 --- a/R/custom.r +++ b/R/custom.r @@ -74,7 +74,7 @@ #' as well. #' #' @md -#' @family Drill REST `dplyr` API +#' @family Drill REST API (dplyr) #' @name drill_custom_functions NULL diff --git a/R/dplyr.r b/R/dplyr.r index 5d8a5a4..00d8266 100644 --- a/R/dplyr.r +++ b/R/dplyr.r @@ -9,7 +9,7 @@ #' @param host Drill host (will pick up the value from `DRILL_HOST` env var) #' @param port Drill port (will pick up the value from `DRILL_PORT` env var) #' @param ssl use ssl? -#' @family Drill REST `dplyr` API +#' @family Drill REST API (dplyr) #' @param username,password if not `NULL` the credentials for the Drill service. #' @note This is a DBI wrapper around the Drill REST API. #' @export @@ -81,7 +81,7 @@ src_drill <- function(host = Sys.getenv("DRILL_HOST", "localhost"), #' @rdname src_tbls #' @param x x #' @param ... ignored -#' @family Drill REST `dplyr` API +#' @family Drill REST API (dplyr) #' @export src_tbls.src_drill <- function(x, ...) { tmp <- dbGetQuery(x$con, "SHOW DATABASES") @@ -119,7 +119,7 @@ copy_to.src_drill <- function(dest, df, name, overwrite, ...) { #' @rdname src_drill #' @param src A Drill "src" created with \code{src_drill()} #' @param from A Drill view or table specification -#' @family Drill REST `dplyr` API +#' @family Drill REST API (dplyr) #' @param ... Extra parameters #' @export tbl.src_drill <- function(src, from, ...) { diff --git a/R/rest-api.r b/R/rest-api.r index 3b5ae31..455b4c2 100644 --- a/R/rest-api.r +++ b/R/rest-api.r @@ -41,10 +41,9 @@ drill_connection <- function(host=Sys.getenv("DRILL_HOST", "localhost"), #' @param drill_con drill server connection object setup by \code{drill_connection()} #' @export #' @family Drill direct REST API Interface -#' @examples -#' try({ +#' @examples \dontrun{ #' drill_connection() %>% drill_active() -#' }, silent=TRUE) +#' } drill_active <- function(drill_con) { drill_server <- make_server(drill_con) !is.null(s_head(drill_server, httr::timeout(2))$result) diff --git a/README.md b/README.md index 9bf93b1..114f48d 100644 --- a/README.md +++ b/README.md @@ -374,6 +374,6 @@ select columns[2] as city, columns[4] as lon, columns[3] as lat ## Code of Conduct -Please note that this project is released with a [Contributor Code of -Conduct](CONDUCT.md). By participating in this project you agree to +Please note that this project is released with a Contributor Code of +Conduct By participating in this project you agree to abide by its terms. diff --git a/cran-comments.md b/cran-comments.md index 8684d1c..96ab7d4 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,34 +1,12 @@ ## Test environments -* local macOS install, R 3.4.1 -* local ubuntu 14.04 install, R 3.4.1 -* ubuntu 12.04 (on travis-ci), R 3.4.1 and oldrel -* win-builder +* local R installation, R 4.0.1 +* ubuntu 16.04 (on travis-ci), R 4.0.1 +* win-builder (devel and release) ## R CMD check results -0 errors | 0 warnings | 0 notes +0 errors | 0 warnings | 0 note -* This is a new release. +* This is an update release. -## Reverse dependencies - -This is a new release, so there are no reverse dependencies. - ---- - -* WinBuilder seems to be working now (it found httr and covr in the last build). - -* Removed png causing WinBuilder pandoc problems. - -* R-hub is reporting httr and covr are not available so - I have not been able to get it to work successfully on that platform. - -* The examples and tests are wrapped in \dontrun{} or testthat:::skip_on_cran() - since they absolutely require a running Apache Drill server. Full tests - are run on Travis (weekly) with results avaialble for review: - https://travis-ci.org/hrbrmstr/sergeant - - The Travis tests install Apache Drill and test out the REST API calls - as well as the dplyr/dbplyr interface with live queries. - -* Code coverage is run and is currently at 40% +* addresses CRAN email note and then some :-) diff --git a/man/drill_active.Rd b/man/drill_active.Rd index 3f09b1b..3d1a23f 100644 --- a/man/drill_active.Rd +++ b/man/drill_active.Rd @@ -13,9 +13,9 @@ drill_active(drill_con) This is a very simple test (performs \code{HEAD /} request on the Drill server/cluster) } \examples{ -try({ +\dontrun{ drill_connection() \%>\% drill_active() -}, silent=TRUE) +} } \seealso{ Other Drill direct REST API Interface: diff --git a/man/drill_custom_functions.Rd b/man/drill_custom_functions.Rd index 332df45..319e49d 100644 --- a/man/drill_custom_functions.Rd +++ b/man/drill_custom_functions.Rd @@ -80,8 +80,8 @@ You can get a compact list of these with: as well. } \seealso{ -Other Drill REST \code{dplyr} API: +Other Drill REST API (dplyr): \code{\link{src_drill}()}, \code{\link{src_tbls.src_drill}()} } -\concept{Drill REST \code{dplyr} API} +\concept{Drill REST API (dplyr)} diff --git a/man/src_drill.Rd b/man/src_drill.Rd index fa9c25c..3f62ea9 100644 --- a/man/src_drill.Rd +++ b/man/src_drill.Rd @@ -87,12 +87,12 @@ select(emp, full_name) \%>\% }, silent=TRUE) } \seealso{ -Other Drill REST \code{dplyr} API: +Other Drill REST API (dplyr): \code{\link{drill_custom_functions}}, \code{\link{src_tbls.src_drill}()} -Other Drill REST \code{dplyr} API: +Other Drill REST API (dplyr): \code{\link{drill_custom_functions}}, \code{\link{src_tbls.src_drill}()} } -\concept{Drill REST \code{dplyr} API} +\concept{Drill REST API (dplyr)} diff --git a/man/src_tbls.Rd b/man/src_tbls.Rd index bfcbdc3..f034a62 100644 --- a/man/src_tbls.Rd +++ b/man/src_tbls.Rd @@ -36,9 +36,9 @@ "SHOW DATABASES" } \seealso{ -Other Drill REST \code{dplyr} API: +Other Drill REST API (dplyr): \code{\link{drill_custom_functions}}, \code{\link{src_drill}()} } -\concept{Drill REST \code{dplyr} API} +\concept{Drill REST API (dplyr)} \keyword{internal}