embulk-input-athena 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df05f5540bab30f61316b799b7cb80b849da32d6
-  data.tar.gz: 0a854b7fc362bdff91f8423bd788a119426a4ff0
+  metadata.gz: d0bfb1c9d3ca30be4dce909eb2506f57a82f1999
+  data.tar.gz: 6dc9ba9cc468b447d50cbe67402a75a0eb9348bf
 SHA512:
-  metadata.gz: b84f7b31683d9d239bd41bde61d35ee9d003fe5d0537b96b9f06310ac9123a752288197b671d7d11d335a215bb9334a4589013d9ac65d7cddef3cd033d53371f
-  data.tar.gz: c6ea2231c7e1dc107f89b4d0fdf3ba1ee7e495b1be14de86e3c75782fb2219b0818fa094e3d14ac23a492748b7acc5a5781e4ed798ed2a41115b8a783c3f1ca6
+  metadata.gz: 19f71b35de22b9a46838ac7e91b804383f41923a3ab0ef58fc8198aacf267e9288b68577c767cb2fa442c5cf0672f17541f123f7c4a7c9ef6482878d9e51f985
+  data.tar.gz: 11d62ec863d623ab40d5b10fb1e7d1ebcf8fbccc8dcb7a06f7296ee1d5a405dd6446594a8e9274b242adf2c1b290f5671c1d2a27678c1251bea9fda319ef65ab

data/Dockerfile

@@ -1,8 +1,6 @@
 FROM openjdk:8-jdk
 
-# ENV EMBULK_VERSION 0.9.3
-ENV EMBULK_VERSION 0.8.39
+ENV EMBULK_VERSION 0.9.23
 
-RUN curl --create-dirs -o ~/.embulk/bin/embulk -L "https://dl.bintray.com/embulk/maven/embulk-${EMBULK_VERSION}.jar" &&\
-    chmod +x ~/.embulk/bin/embulk &&\
-    echo 'export PATH="$HOME/.embulk/bin:$PATH"' >> ~/.bashrc
+RUN curl --create-dirs -o /usr/local/bin/embulk -L "https://dl.embulk.org/embulk-${EMBULK_VERSION}.jar" &&\
+    chmod +x /usr/local/bin/embulk

data/README.md

@@ -14,7 +14,7 @@ Athena input plugin for Embulk loads records from Athena(AWS).
 
 ## Configuration
 
-* **driver_path**: path to the jar file of the Athena JDBC driver. If not set, the bundled JDBC driver(AthenaJDBC41-1.1.0.jar) will be used. (string)
+* **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)
 * **database**: database name (string, required)
 * **athena_url**: Athena url (string, required)
 * **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:
 $ docker-compose up -d
 $ docker-compose exec embulk bash
 embulk>$ ./gradlew gem  # -t to watch change of files and rebuild continuously
-
-embulk>$ embulk preview -I lib sample.yml
-embulk>$ embulk preview -L . sample.yml
-
-curl -u shinji19 https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials
-embulk>$ ./gradlew gemPush
 ```

data/build.gradle

@@ -9,14 +9,12 @@ plugins {
 import com.github.jrubygradle.JRubyExec
 repositories {
     mavenCentral()
-    jcenter()
-    maven { url "https://dl.bintray.com/embulk-input-jdbc/maven" }
 }
 configurations {
     provided
 }
 
-version = "0.1.6"
+version = "0.1.7"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -25,15 +23,15 @@ dependencies {
     compile  "org.embulk:embulk-core:0.8.39"
     provided "org.embulk:embulk-core:0.8.39"
     // TODO: maven...
-    compile files ('build/AthenaJDBC41-1.1.0.jar')
+    compile files ('build/AthenaJDBC41.jar')
     compile group: 'com.amazonaws', name: 'aws-java-sdk', version: '1.11.301'
     // compile group: 'com.amazonaws', name: 'aws-java-sdk-athena', version: '1.11.301'
-    compile 'org.embulk.input.jdbc:embulk-input-jdbc:0.9.1'
+    compile 'org.embulk:embulk-input-jdbc:0.12.2'
     testCompile "junit:junit:4.+"
 }
 
 task downloadFile(type: Download) {
-    src 'https://s3.amazonaws.com/athena-downloads/drivers/AthenaJDBC41-1.1.0.jar'
+    src 'https://s3.amazonaws.com/athena-downloads/drivers/JDBC/SimbaAthenaJDBC-2.0.23.1000/AthenaJDBC41.jar'
     dest buildDir
     onlyIfModified true
 }
@@ -41,7 +39,7 @@ task downloadFile(type: Download) {
 task classpath(type: Copy, dependsOn: ["downloadFile", "jar"]) {
     doFirst { file("classpath").deleteDir() }
     from (configurations.runtime - configurations.provided + files(jar.archivePath))
-    from ("build/AthenaJDBC41-1.1.0.jar'")
+    from ("build/AthenaJDBC41.jar")
     into "classpath"
 }
 clean { delete "classpath" }

data/docker-compose.yml

@@ -7,10 +7,4 @@ services:
     working_dir: /root/embulk-input-athena
     volumes:
       - ./:/root/embulk-input-athena
-    tty: true
-  postgres:
-    image: postgres
-    ports:
-      - 5432:5432
-    environment:
-      - POSTGRES_PASSWORD=postgres
+    command: tail -f /dev/null

data/src/main/java/org/embulk/input/athena/AthenaInputPlugin.java

@@ -259,11 +259,12 @@ public class AthenaInputPlugin implements InputPlugin
 
     protected Connection getAthenaConnection(PluginTask task) throws ClassNotFoundException, SQLException
     {
-        loadDriver("com.amazonaws.athena.jdbc.AthenaDriver", task.getDriverPath());
+        loadDriver("com.simba.athena.jdbc.Driver", task.getDriverPath());
         Properties properties = new Properties();
         properties.put("s3_staging_dir", task.getS3StagingDir());
         properties.put("user", task.getAccessKey());
         properties.put("password", task.getSecretKey());
+        properties.put("schema", task.getDatabase());
         properties.putAll(task.getOptions());
 
         return DriverManager.getConnection(task.getAthenaUrl(), properties);

data/src/main/resources/log4j.properties

@@ -1,4 +1,4 @@
 log4j.rootLogger=INFO, ROOT
 
-log4j.appender.ROOT=org.apache.log4j.varia.NullAppender
-log4j.appender.ROOT.layout=org.apache.log4j.PatternLayout
+log4j.appender.ROOT=com.simba.athena.shaded.apache.log4j.varia.NullAppender
+log4j.appender.ROOT.layout=com.simba.athena.shaded.apache.log4j.PatternLayout

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-athena
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - shinji19
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ files:
 - LICENSE
 - README.md
 - build.gradle
-- classpath/AthenaJDBC41-1.1.0.jar
+- classpath/AthenaJDBC41.jar
 - classpath/aws-java-sdk-1.11.301.jar
 - classpath/aws-java-sdk-acm-1.11.301.jar
 - classpath/aws-java-sdk-alexaforbusiness-1.11.301.jar
@@ -180,13 +180,18 @@ files:
 - classpath/aws-java-sdk-xray-1.11.301.jar
 - classpath/commons-codec-1.10.jar
 - classpath/commons-logging-1.2.jar
-- classpath/embulk-input-athena-0.1.6.jar
-- classpath/embulk-input-jdbc-0.9.1.jar
+- classpath/embulk-input-athena-0.1.7.jar
+- classpath/embulk-input-jdbc-0.12.2.jar
+- classpath/embulk-util-config-0.3.0.jar
+- classpath/embulk-util-json-0.1.1.jar
+- classpath/embulk-util-rubytime-0.3.2.jar
+- classpath/embulk-util-timestamp-0.2.1.jar
 - classpath/httpclient-4.5.5.jar
 - classpath/httpcore-4.4.9.jar
 - classpath/ion-java-1.0.2.jar
 - classpath/jackson-databind-2.6.7.1.jar
 - classpath/jackson-dataformat-cbor-2.6.7.jar
+- classpath/jackson-datatype-jdk8-2.6.7.jar
 - classpath/jmespath-java-1.11.301.jar
 - classpath/netty-buffer-4.1.17.Final.jar
 - classpath/netty-codec-4.1.17.Final.jar