Skip to content

Commit

Permalink
v0.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
hrbrmstr committed Jun 1, 2020
1 parent facda32 commit 09a853d
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 48 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
^cdh4-repository_1\.0_all\.deb$
^cran-comments\.md$
^pre$
^CRAN-RELEASE$
2 changes: 2 additions & 0 deletions CRAN-RELEASE
Original file line number Diff line number Diff line change
@@ -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).
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ Authors@R: c(
person("James", "Lamb", email = "[email protected]", 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:
Expand Down
2 changes: 1 addition & 1 deletion R/custom.r
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
#' as well.
#'
#' @md
#' @family Drill REST `dplyr` API
#' @family Drill REST API (dplyr)
#' @name drill_custom_functions
NULL

Expand Down
6 changes: 3 additions & 3 deletions R/dplyr.r
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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, ...) {
Expand Down
5 changes: 2 additions & 3 deletions R/rest-api.r
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
34 changes: 6 additions & 28 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -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 :-)
4 changes: 2 additions & 2 deletions man/drill_active.Rd

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

4 changes: 2 additions & 2 deletions man/drill_custom_functions.Rd

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

6 changes: 3 additions & 3 deletions man/src_drill.Rd

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

4 changes: 2 additions & 2 deletions man/src_tbls.Rd

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

0 comments on commit 09a853d

Please sign in to comment.