Browse Source

restored contributors

boB Rudis 9 months ago
parent
commit
350b6e2ef2
No known key found for this signature in database
6 changed files with 24 additions and 14 deletions
  1. 2
    0
      .Rbuildignore
  2. 2
    0
      .gitignore
  3. 4
    2
      DESCRIPTION
  4. 8
    5
      R/jdbc.r
  5. 7
    6
      man/dbConnect-AthenaDriver-method.Rd
  6. 1
    1
      vignettes/athena-connection-parameters.Rmd

+ 2
- 0
.Rbuildignore View File

@@ -1,3 +1,5 @@
1
+^Meta$
2
+^doc$
1 3
 ^LICENSE\.md$
2 4
 ^.*\.Rproj$
3 5
 ^\.Rproj\.user$

+ 2
- 0
.gitignore View File

@@ -1,3 +1,5 @@
1
+Meta
2
+doc
1 3
 inst/doc
2 4
 .DS_Store
3 5
 .Rproj.user

+ 4
- 2
DESCRIPTION View File

@@ -5,7 +5,9 @@ Version: 0.3.0
5 5
 Date: 2019-02-14
6 6
 Authors@R: c(
7 7
     person("Bob", "Rudis", email = "bob@rud.is", role = c("aut", "cre"),
8
-           comment = c(ORCID = "0000-0001-5670-2640"))
8
+           comment = c(ORCID = "0000-0001-5670-2640")),
9
+    person("Derek", "Abdine", comment = "Authentication driver update"),
10
+    person("Zachary", "Kurtz", email = "zdkurtz@gmail.com", role = "ctb")
9 11
   )
10 12
 Maintainer: Bob Rudis <bob@rud.is>
11 13
 Encoding: UTF-8
@@ -31,5 +33,5 @@ Imports:
31 33
     aws.signature
32 34
 RoxygenNote: 6.1.1
33 35
 Remotes:
34
-    hrbrmstr/metis.jars
36
+    hrbrmstr/metis-jars
35 37
 VignetteBuilder: knitr

+ 8
- 5
R/jdbc.r View File

@@ -37,7 +37,7 @@ Athena <- function(identifier.quote = '`') {
37 37
 
38 38
 #' AthenaJDBC
39 39
 #'
40
-#' Connect to Athena
40
+#' Connect to Athenadb
41 41
 #'
42 42
 #' Mandatory JDBC connection parameters are also named function
43 43
 #' parameters. You can use `...` to supply additional/optional
@@ -64,9 +64,9 @@ Athena <- function(identifier.quote = '`') {
64 64
 #' @param S3OutputLocation A write-able bucket on S3 that you have permissions for
65 65
 #' @param MaxErrorRetry,ConnectTimeout,SocketTimeout
66 66
 #'     technical connection info that you should only muck with if you know what you're doing.
67
-#' @param LogPath,LogPath The Athena JDBC driver can (shockingly) provide a decent bit
68
-#'     of data in logs. Set this to a temporary directory or something log4j can use. For
69
-#'     `LogPath` use the names ("INFO", "DEBUG", "WARN", "ERROR", "ALL", "OFF", "FATAL", "TRACE") or
67
+#' @param LogLevel,LogPath The Athena JDBC driver can provide a decent bit
68
+#'     of data in logs. Set this to a temporary directory or something `log4j` can use. For
69
+#'     `LogPath` use the names ("`INFO`", "`DEBUG`", "`WARN`", "`ERROR`", "`ALL`", "`OFF`", "`FATAL`", "`TRACE`") or
70 70
 #'     their corresponding integer values 0-6.
71 71
 #' @param fetch_size Athena results fetch size
72 72
 #' @param ... passed on to the driver. See Details.
@@ -82,7 +82,10 @@ setMethod(
82 82
     drv,
83 83
     Schema = "default",
84 84
     AwsRegion = "us-east-1",
85
-    AwsCredentialsProviderClass = "com.simba.athena.amazonaws.auth.DefaultAWSCredentialsProviderChain",
85
+    AwsCredentialsProviderClass = paste0(c(
86
+      "com", "simba", "athena", "amazonaws","auth",
87
+      "DefaultAWSCredentialsProviderChain"
88
+    ), collapse = "."),
86 89
     S3OutputLocation = Sys.getenv("AWS_S3_STAGING_DIR", unset = ""),
87 90
     MaxErrorRetry = 10,
88 91
     ConnectTimeout = 10000,

+ 7
- 6
man/dbConnect-AthenaDriver-method.Rd View File

@@ -7,8 +7,9 @@
7 7
 \usage{
8 8
 \S4method{dbConnect}{AthenaDriver}(drv, Schema = "default",
9 9
   AwsRegion = "us-east-1",
10
-  AwsCredentialsProviderClass = "com.simba.athena.amazonaws.auth.DefaultAWSCredentialsProviderChain",
11
-  S3OutputLocation = Sys.getenv("AWS_S3_STAGING_DIR", unset = ""),
10
+  AwsCredentialsProviderClass = paste0(c("com", "simba", "athena",
11
+  "amazonaws", "auth", "DefaultAWSCredentialsProviderChain"), collapse =
12
+  "."), S3OutputLocation = Sys.getenv("AWS_S3_STAGING_DIR", unset = ""),
12 13
   MaxErrorRetry = 10, ConnectTimeout = 10000, SocketTimeout = 10000,
13 14
   LogPath = "", LogLevel = 0, fetch_size = 1000L, ...)
14 15
 }
@@ -30,9 +31,9 @@ comma-separated list of String arguments.}
30 31
 
31 32
 \item{MaxErrorRetry, ConnectTimeout, SocketTimeout}{technical connection info that you should only muck with if you know what you're doing.}
32 33
 
33
-\item{LogPath, LogPath}{The Athena JDBC driver can (shockingly) provide a decent bit
34
-of data in logs. Set this to a temporary directory or something log4j can use. For
35
-`LogPath` use the names ("INFO", "DEBUG", "WARN", "ERROR", "ALL", "OFF", "FATAL", "TRACE") or
34
+\item{LogLevel, LogPath}{The Athena JDBC driver can provide a decent bit
35
+of data in logs. Set this to a temporary directory or something `log4j` can use. For
36
+`LogPath` use the names ("`INFO`", "`DEBUG`", "`WARN`", "`ERROR`", "`ALL`", "`OFF`", "`FATAL`", "`TRACE`") or
36 37
 their corresponding integer values 0-6.}
37 38
 
38 39
 \item{fetch_size}{Athena results fetch size}
@@ -40,7 +41,7 @@ their corresponding integer values 0-6.}
40 41
 \item{...}{passed on to the driver. See Details.}
41 42
 }
42 43
 \description{
43
-Connect to Athena
44
+Connect to Athenadb
44 45
 }
45 46
 \details{
46 47
 Mandatory JDBC connection parameters are also named function

+ 1
- 1
vignettes/athena-connection-parameters.Rmd View File

@@ -12,7 +12,7 @@ vignette: >
12 12
 ```{r setup, include = FALSE}
13 13
 knitr::opts_chunk$set(
14 14
   collapse = TRUE,
15
-  comment = "#>"
15
+  comment = "##"
16 16
 )
17 17
 ```
18 18
 

Loading…
Cancel
Save