diff --git a/DESCRIPTION b/DESCRIPTION index e3c510c..06487ba 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: sergeant.caffeinated Title: Tools to Transform and Query Data with 'Apache' 'Drill' ('JDBC') -Version: 0.2.0 +Version: 0.2.1 Authors@R: c( person("Bob", "Rudis", email = "bob@rud.is", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-5670-2640")) @@ -31,4 +31,4 @@ Suggests: rJava (>= 0.9-8), testthat (>= 1.0.2), covr (>= 3.0.0) -RoxygenNote: 6.1.1 +RoxygenNote: 7.0.2 diff --git a/NEWS.md b/NEWS.md index 4868b3e..f943b7a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,63 +1,4 @@ -# sergeant 0.6.0 - -- Authentication support for DBI/dplyr and `drill_connection()` pure REST interface - -# sergeant 0.5.2 - -- Make rJava & RJDBC optional (WIP) -- Hack to remove ";" at end of queries sent to `drill_query()` -- Added `dbplyr` windows functions to `sql_translate_env` - -# sergeant 0.4.0 - -- Getting ready for new `dplyr` (thx to Edward Visel) -- Cleaned up roxygen docs so that `src_drill` is exported now. - -# sergeant 0.3.2 - -- Finally got quoting done. I thought I had before but I guess I hadn't. -- Added documnentation for built-in and custom Drill function that are supported. - -# sergeant 0.3.1.9000 - -* fixed `src_drill()` example -* JDBC driver still in github repo but no longer included in pkg builds. See - README.md or `drill_jdbc()` help for more information on using the JDBC - driver with sergeant. - -# sergeant 0.3.0.9000 - -* New DBI interface (to the REST API) -* dplyr interface now uses the DBI interace to the REST API -* CRAN checks pass besides size (removing JDBC driver in next dev iteration) - -# sergeant 0.2.1.9000 - -* implemented a large subset of Drill SQL Functions - -# sergeant 0.2.0.9000 - -* experimental alpha dplyr driver - -# sergeant 0.1.2.9000 - -* can pass RJDBC connections made with `drill_jdbc()` to `drill_query()` -* finally enaled `nodes` parameter to be a multi-element character vector as it said - in the function description - -# sergeant 0.1.2.9000 - -* support embedded drill JDBC connection - -# sergeant 0.1.1.9000 - -* tweaked `drill_query()` and `drill_version()` - -# sergeant 0.1.0.9000 - -* Added JDBC connector and included JDBC driver in the package (for now) -* Changed idiom to piping in a connection object -* Added a `NEWS.md` file to track changes to the package. - +# sergeant.caffeinated 0.6.1 +- Updatd log4j noop driver diff --git a/inst/java/slf4j-nop-1.7.25.jar b/inst/java/slf4j-nop-1.7.25.jar deleted file mode 100644 index 7b704fa..0000000 Binary files a/inst/java/slf4j-nop-1.7.25.jar and /dev/null differ diff --git a/inst/java/slf4j-nop-2.0.0-alpha1.jar b/inst/java/slf4j-nop-2.0.0-alpha1.jar new file mode 100644 index 0000000..91ce269 Binary files /dev/null and b/inst/java/slf4j-nop-2.0.0-alpha1.jar differ diff --git a/man/DrillJDBC.Rd b/man/DrillJDBC.Rd index 5839348..f0d8210 100644 --- a/man/DrillJDBC.Rd +++ b/man/DrillJDBC.Rd @@ -10,9 +10,10 @@ DrillJDBC() Drill's JDBC driver main class loader } \seealso{ -Other Drill JDBC API: \code{\link{dbConnect,DrillJDBCDriver-method}}, - \code{\link{dbDataType,DrillJDBCConnection-method}}, - \code{\link{db_data_type.DrillJDBCConnection}}, - \code{\link{drill_jdbc}} +Other Drill JDBC API: +\code{\link{dbConnect,DrillJDBCDriver-method}}, +\code{\link{dbDataType,DrillJDBCConnection-method}}, +\code{\link{db_data_type.DrillJDBCConnection}()}, +\code{\link{drill_jdbc}()} } \concept{Drill JDBC API} diff --git a/man/dbConnect-DrillJDBCDriver-method.Rd b/man/dbConnect-DrillJDBCDriver-method.Rd index 1f0a733..0d1508e 100644 --- a/man/dbConnect-DrillJDBCDriver-method.Rd +++ b/man/dbConnect-DrillJDBCDriver-method.Rd @@ -1,12 +1,10 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/jdbc.r -\docType{methods} \name{dbConnect,DrillJDBCDriver-method} \alias{dbConnect,DrillJDBCDriver-method} \title{Connect to Drill JDBC with your own connection string} \usage{ -\S4method{dbConnect}{DrillJDBCDriver}(drv, url, user = "", - password = "", ...) +\S4method{dbConnect}{DrillJDBCDriver}(drv, url, user = "", password = "", ...) } \arguments{ \item{drv}{what you get back from \code{\link[=DrillJDBC]{DrillJDBC()}}} @@ -23,9 +21,10 @@ You should really use \code{\link[=drill_jdbc]{drill_jdbc()}} as it handles some you, but you can specify the full JDBC connection string } \seealso{ -Other Drill JDBC API: \code{\link{DrillJDBC}}, - \code{\link{dbDataType,DrillJDBCConnection-method}}, - \code{\link{db_data_type.DrillJDBCConnection}}, - \code{\link{drill_jdbc}} +Other Drill JDBC API: +\code{\link{DrillJDBC}()}, +\code{\link{dbDataType,DrillJDBCConnection-method}}, +\code{\link{db_data_type.DrillJDBCConnection}()}, +\code{\link{drill_jdbc}()} } \concept{Drill JDBC API} diff --git a/man/dbDataType-DrillJDBCConnection-method.Rd b/man/dbDataType-DrillJDBCConnection-method.Rd index c3c2828..b684b1f 100644 --- a/man/dbDataType-DrillJDBCConnection-method.Rd +++ b/man/dbDataType-DrillJDBCConnection-method.Rd @@ -1,6 +1,5 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/jdbc.r -\docType{methods} \name{dbDataType,DrillJDBCConnection-method} \alias{dbDataType,DrillJDBCConnection-method} \title{Drill JDBC dbDataType} @@ -18,9 +17,10 @@ Drill JDBC dbDataType } \seealso{ -Other Drill JDBC API: \code{\link{DrillJDBC}}, - \code{\link{dbConnect,DrillJDBCDriver-method}}, - \code{\link{db_data_type.DrillJDBCConnection}}, - \code{\link{drill_jdbc}} +Other Drill JDBC API: +\code{\link{DrillJDBC}()}, +\code{\link{dbConnect,DrillJDBCDriver-method}}, +\code{\link{db_data_type.DrillJDBCConnection}()}, +\code{\link{drill_jdbc}()} } \concept{Drill JDBC API} diff --git a/man/drill_jdbc.Rd b/man/drill_jdbc.Rd index 6610a25..730e284 100644 --- a/man/drill_jdbc.Rd +++ b/man/drill_jdbc.Rd @@ -6,11 +6,19 @@ \alias{tbl.src_drill_jdbc} \title{Connect to Drill using JDBC} \usage{ -drill_jdbc(nodes = "localhost:2181", cluster_id = NULL, - schema = NULL, use_zk = TRUE) +drill_jdbc( + nodes = "localhost:2181", + cluster_id = NULL, + schema = NULL, + use_zk = TRUE +) -src_drill_jdbc(nodes = "localhost:2181", cluster_id = NULL, - schema = NULL, use_zk = TRUE) +src_drill_jdbc( + nodes = "localhost:2181", + cluster_id = NULL, + schema = NULL, + use_zk = TRUE +) \method{tbl}{src_drill_jdbc}(src, from, ...) } @@ -61,19 +69,22 @@ con <- drill_jdbc("localhost:31010", use_zk=FALSE) \url{https://drill.apache.org/docs/using-the-jdbc-driver/#using-the-jdbc-url-for-a-random-drillbit-connection} } \seealso{ -Other Drill JDBC API: \code{\link{DrillJDBC}}, - \code{\link{dbConnect,DrillJDBCDriver-method}}, - \code{\link{dbDataType,DrillJDBCConnection-method}}, - \code{\link{db_data_type.DrillJDBCConnection}} +Other Drill JDBC API: +\code{\link{DrillJDBC}()}, +\code{\link{dbConnect,DrillJDBCDriver-method}}, +\code{\link{dbDataType,DrillJDBCConnection-method}}, +\code{\link{db_data_type.DrillJDBCConnection}()} -Other Drill JDBC API: \code{\link{DrillJDBC}}, - \code{\link{dbConnect,DrillJDBCDriver-method}}, - \code{\link{dbDataType,DrillJDBCConnection-method}}, - \code{\link{db_data_type.DrillJDBCConnection}} +Other Drill JDBC API: +\code{\link{DrillJDBC}()}, +\code{\link{dbConnect,DrillJDBCDriver-method}}, +\code{\link{dbDataType,DrillJDBCConnection-method}}, +\code{\link{db_data_type.DrillJDBCConnection}()} -Other Drill JDBC API: \code{\link{DrillJDBC}}, - \code{\link{dbConnect,DrillJDBCDriver-method}}, - \code{\link{dbDataType,DrillJDBCConnection-method}}, - \code{\link{db_data_type.DrillJDBCConnection}} +Other Drill JDBC API: +\code{\link{DrillJDBC}()}, +\code{\link{dbConnect,DrillJDBCDriver-method}}, +\code{\link{dbDataType,DrillJDBCConnection-method}}, +\code{\link{db_data_type.DrillJDBCConnection}()} } \concept{Drill JDBC API} diff --git a/man/drill_jdbc_internals.Rd b/man/drill_jdbc_internals.Rd index 85b2146..fe989f6 100644 --- a/man/drill_jdbc_internals.Rd +++ b/man/drill_jdbc_internals.Rd @@ -15,8 +15,7 @@ \method{db_data_type}{tbl_drill_jdbc}(con, fields, ...) -\S4method{dbSendQuery}{DrillJDBCConnection,character}(conn, statement, ..., - list = NULL) +\S4method{dbSendQuery}{DrillJDBCConnection,character}(conn, statement, ..., list = NULL) \method{sql_escape_ident}{DrillJDBCConnection}(con, x) @@ -31,10 +30,11 @@ "SHOW DATABASES" } \seealso{ -Other Drill JDBC API: \code{\link{DrillJDBC}}, - \code{\link{dbConnect,DrillJDBCDriver-method}}, - \code{\link{dbDataType,DrillJDBCConnection-method}}, - \code{\link{drill_jdbc}} +Other Drill JDBC API: +\code{\link{DrillJDBC}()}, +\code{\link{dbConnect,DrillJDBCDriver-method}}, +\code{\link{dbDataType,DrillJDBCConnection-method}}, +\code{\link{drill_jdbc}()} } \concept{Drill JDBC API} \keyword{internal} diff --git a/man/sergeant-caffeinated-exports.Rd b/man/sergeant-caffeinated-exports.Rd index bdc9cb3..088b3c4 100644 --- a/man/sergeant-caffeinated-exports.Rd +++ b/man/sergeant-caffeinated-exports.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/sergeant-caffeinated-package.r +% Please edit documentation in R/sergeant-caffeinated-package.R \name{sergeant-caffeinated-exports} \alias{sergeant-caffeinated-exports} \alias{\%>\%} diff --git a/man/sergeant.caffeinated.Rd b/man/sergeant.caffeinated.Rd index 661063e..7bfc359 100644 --- a/man/sergeant.caffeinated.Rd +++ b/man/sergeant.caffeinated.Rd @@ -1,9 +1,8 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/sergeant-caffeinated-package.r +% Please edit documentation in R/sergeant-caffeinated-package.R \docType{package} \name{sergeant.caffeinated} \alias{sergeant.caffeinated} -\alias{sergeant.caffeinated-package} \title{Tools to Transform and Query Data with 'Apache' 'Drill'} \description{ Drill is an innovative low-latency distributed query engine designed to enable data