embulk-input-athena 0.1.6 → 0.1.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Dockerfile +3 -5
- data/README.md +1 -7
- data/build.gradle +5 -7
- data/classpath/{AthenaJDBC41-1.1.0.jar → AthenaJDBC41.jar} +0 -0
- data/classpath/embulk-input-athena-0.1.7.jar +0 -0
- data/classpath/embulk-input-jdbc-0.12.2.jar +0 -0
- data/classpath/embulk-util-config-0.3.0.jar +0 -0
- data/classpath/embulk-util-json-0.1.1.jar +0 -0
- data/classpath/embulk-util-rubytime-0.3.2.jar +0 -0
- data/classpath/embulk-util-timestamp-0.2.1.jar +0 -0
- data/classpath/jackson-datatype-jdk8-2.6.7.jar +0 -0
- data/docker-compose.yml +1 -7
- data/src/main/java/org/embulk/input/athena/AthenaInputPlugin.java +2 -1
- data/src/main/resources/log4j.properties +2 -2
- metadata +10 -5
- data/classpath/embulk-input-athena-0.1.6.jar +0 -0
- data/classpath/embulk-input-jdbc-0.9.1.jar +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d0bfb1c9d3ca30be4dce909eb2506f57a82f1999
|
4
|
+
data.tar.gz: 6dc9ba9cc468b447d50cbe67402a75a0eb9348bf
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 19f71b35de22b9a46838ac7e91b804383f41923a3ab0ef58fc8198aacf267e9288b68577c767cb2fa442c5cf0672f17541f123f7c4a7c9ef6482878d9e51f985
|
7
|
+
data.tar.gz: 11d62ec863d623ab40d5b10fb1e7d1ebcf8fbccc8dcb7a06f7296ee1d5a405dd6446594a8e9274b242adf2c1b290f5671c1d2a27678c1251bea9fda319ef65ab
|
data/Dockerfile
CHANGED
@@ -1,8 +1,6 @@
|
|
1
1
|
FROM openjdk:8-jdk
|
2
2
|
|
3
|
-
|
4
|
-
ENV EMBULK_VERSION 0.8.39
|
3
|
+
ENV EMBULK_VERSION 0.9.23
|
5
4
|
|
6
|
-
RUN curl --create-dirs -o
|
7
|
-
chmod +x
|
8
|
-
echo 'export PATH="$HOME/.embulk/bin:$PATH"' >> ~/.bashrc
|
5
|
+
RUN curl --create-dirs -o /usr/local/bin/embulk -L "https://dl.embulk.org/embulk-${EMBULK_VERSION}.jar" &&\
|
6
|
+
chmod +x /usr/local/bin/embulk
|
data/README.md
CHANGED
@@ -14,7 +14,7 @@ Athena input plugin for Embulk loads records from Athena(AWS).
|
|
14
14
|
|
15
15
|
## Configuration
|
16
16
|
|
17
|
-
* **driver_path**: path to the jar file of the Athena JDBC driver. If not set, the bundled JDBC driver(AthenaJDBC41
|
17
|
+
* **driver_path**: path to the jar file of the Athena JDBC driver. If not set, the bundled JDBC driver(AthenaJDBC41.jar) will be used. (string)
|
18
18
|
* **database**: database name (string, required)
|
19
19
|
* **athena_url**: Athena url (string, required)
|
20
20
|
* **s3_staging_dir**: The S3 location to which your query output is written, for example s3://query-results-bucket/folder/. (string, required)
|
@@ -49,10 +49,4 @@ in:
|
|
49
49
|
$ docker-compose up -d
|
50
50
|
$ docker-compose exec embulk bash
|
51
51
|
embulk>$ ./gradlew gem # -t to watch change of files and rebuild continuously
|
52
|
-
|
53
|
-
embulk>$ embulk preview -I lib sample.yml
|
54
|
-
embulk>$ embulk preview -L . sample.yml
|
55
|
-
|
56
|
-
curl -u shinji19 https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials
|
57
|
-
embulk>$ ./gradlew gemPush
|
58
52
|
```
|
data/build.gradle
CHANGED
@@ -9,14 +9,12 @@ plugins {
|
|
9
9
|
import com.github.jrubygradle.JRubyExec
|
10
10
|
repositories {
|
11
11
|
mavenCentral()
|
12
|
-
jcenter()
|
13
|
-
maven { url "https://dl.bintray.com/embulk-input-jdbc/maven" }
|
14
12
|
}
|
15
13
|
configurations {
|
16
14
|
provided
|
17
15
|
}
|
18
16
|
|
19
|
-
version = "0.1.
|
17
|
+
version = "0.1.7"
|
20
18
|
|
21
19
|
sourceCompatibility = 1.8
|
22
20
|
targetCompatibility = 1.8
|
@@ -25,15 +23,15 @@ dependencies {
|
|
25
23
|
compile "org.embulk:embulk-core:0.8.39"
|
26
24
|
provided "org.embulk:embulk-core:0.8.39"
|
27
25
|
// TODO: maven...
|
28
|
-
compile files ('build/AthenaJDBC41
|
26
|
+
compile files ('build/AthenaJDBC41.jar')
|
29
27
|
compile group: 'com.amazonaws', name: 'aws-java-sdk', version: '1.11.301'
|
30
28
|
// compile group: 'com.amazonaws', name: 'aws-java-sdk-athena', version: '1.11.301'
|
31
|
-
compile 'org.embulk
|
29
|
+
compile 'org.embulk:embulk-input-jdbc:0.12.2'
|
32
30
|
testCompile "junit:junit:4.+"
|
33
31
|
}
|
34
32
|
|
35
33
|
task downloadFile(type: Download) {
|
36
|
-
src 'https://s3.amazonaws.com/athena-downloads/drivers/
|
34
|
+
src 'https://s3.amazonaws.com/athena-downloads/drivers/JDBC/SimbaAthenaJDBC-2.0.23.1000/AthenaJDBC41.jar'
|
37
35
|
dest buildDir
|
38
36
|
onlyIfModified true
|
39
37
|
}
|
@@ -41,7 +39,7 @@ task downloadFile(type: Download) {
|
|
41
39
|
task classpath(type: Copy, dependsOn: ["downloadFile", "jar"]) {
|
42
40
|
doFirst { file("classpath").deleteDir() }
|
43
41
|
from (configurations.runtime - configurations.provided + files(jar.archivePath))
|
44
|
-
from ("build/AthenaJDBC41
|
42
|
+
from ("build/AthenaJDBC41.jar")
|
45
43
|
into "classpath"
|
46
44
|
}
|
47
45
|
clean { delete "classpath" }
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
data/docker-compose.yml
CHANGED
@@ -259,11 +259,12 @@ public class AthenaInputPlugin implements InputPlugin
|
|
259
259
|
|
260
260
|
protected Connection getAthenaConnection(PluginTask task) throws ClassNotFoundException, SQLException
|
261
261
|
{
|
262
|
-
loadDriver("com.
|
262
|
+
loadDriver("com.simba.athena.jdbc.Driver", task.getDriverPath());
|
263
263
|
Properties properties = new Properties();
|
264
264
|
properties.put("s3_staging_dir", task.getS3StagingDir());
|
265
265
|
properties.put("user", task.getAccessKey());
|
266
266
|
properties.put("password", task.getSecretKey());
|
267
|
+
properties.put("schema", task.getDatabase());
|
267
268
|
properties.putAll(task.getOptions());
|
268
269
|
|
269
270
|
return DriverManager.getConnection(task.getAthenaUrl(), properties);
|
@@ -1,4 +1,4 @@
|
|
1
1
|
log4j.rootLogger=INFO, ROOT
|
2
2
|
|
3
|
-
log4j.appender.ROOT=
|
4
|
-
log4j.appender.ROOT.layout=
|
3
|
+
log4j.appender.ROOT=com.simba.athena.shaded.apache.log4j.varia.NullAppender
|
4
|
+
log4j.appender.ROOT.layout=com.simba.athena.shaded.apache.log4j.PatternLayout
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: embulk-input-athena
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.7
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- shinji19
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-07-24 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
@@ -50,7 +50,7 @@ files:
|
|
50
50
|
- LICENSE
|
51
51
|
- README.md
|
52
52
|
- build.gradle
|
53
|
-
- classpath/AthenaJDBC41
|
53
|
+
- classpath/AthenaJDBC41.jar
|
54
54
|
- classpath/aws-java-sdk-1.11.301.jar
|
55
55
|
- classpath/aws-java-sdk-acm-1.11.301.jar
|
56
56
|
- classpath/aws-java-sdk-alexaforbusiness-1.11.301.jar
|
@@ -180,13 +180,18 @@ files:
|
|
180
180
|
- classpath/aws-java-sdk-xray-1.11.301.jar
|
181
181
|
- classpath/commons-codec-1.10.jar
|
182
182
|
- classpath/commons-logging-1.2.jar
|
183
|
-
- classpath/embulk-input-athena-0.1.
|
184
|
-
- classpath/embulk-input-jdbc-0.
|
183
|
+
- classpath/embulk-input-athena-0.1.7.jar
|
184
|
+
- classpath/embulk-input-jdbc-0.12.2.jar
|
185
|
+
- classpath/embulk-util-config-0.3.0.jar
|
186
|
+
- classpath/embulk-util-json-0.1.1.jar
|
187
|
+
- classpath/embulk-util-rubytime-0.3.2.jar
|
188
|
+
- classpath/embulk-util-timestamp-0.2.1.jar
|
185
189
|
- classpath/httpclient-4.5.5.jar
|
186
190
|
- classpath/httpcore-4.4.9.jar
|
187
191
|
- classpath/ion-java-1.0.2.jar
|
188
192
|
- classpath/jackson-databind-2.6.7.1.jar
|
189
193
|
- classpath/jackson-dataformat-cbor-2.6.7.jar
|
194
|
+
- classpath/jackson-datatype-jdk8-2.6.7.jar
|
190
195
|
- classpath/jmespath-java-1.11.301.jar
|
191
196
|
- classpath/netty-buffer-4.1.17.Final.jar
|
192
197
|
- classpath/netty-codec-4.1.17.Final.jar
|
Binary file
|
Binary file
|