embulk-input-athena 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7deb74a8401b375ad2a48e2e0400d34334e0984f
-  data.tar.gz: ab085cbbd9db5902183e979df7fd88a5111696db
+  metadata.gz: d0bfb1c9d3ca30be4dce909eb2506f57a82f1999
+  data.tar.gz: 6dc9ba9cc468b447d50cbe67402a75a0eb9348bf
 SHA512:
-  metadata.gz: 1c048ae148d4c2758986a1705776537646e423b32f26e7c0c07f4de6568403b43108f627e7c530961983a9492d974c6cb2e1d4048d4470c99c20fcdc6f25e592
-  data.tar.gz: a2f42184c6ac26cc0e9f8d253de0ef7071c017aa45e6654524b5cd0f1c69b020c7ceed3a8685f1cfb868e68ec07bd8af29988c9b7cfb86411bc116105c9c2640
+  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

@@ -1,5 +1,8 @@
 # Athena input plugin for Embulk
 
+[![Gem Version](https://badge.fury.io/rb/embulk-input-athena.svg)](https://badge.fury.io/rb/embulk-input-athena)
+[![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE)
+
 Athena input plugin for Embulk loads records from Athena(AWS).
 
 ## Overview
@@ -11,15 +14,16 @@ 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)
-* **database**: description (string, required)
-* **athena_url**: description (string, required)
+* **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)
-* **access_key**: description (string, required)
-* **secret_key**: description (string, required)
-* **query**: description (string, required)
-* **columns**: description (string, required)
-* **options**: description (string, default: {})
+* **access_key**: AWS access key (string, required)
+* **secret_key**: AWS secret key (string, required)
+* **query**: SQL to run (string, required)
+* **columns**: columns (string, required)
+* **options**: extra JDBC properties (string, default: {})
+* **null_to_zero**: if true, convert long, double and boolean value from null to zero (boolean, default: false)
 
 ## Example
 
@@ -36,6 +40,7 @@ in:
   columns:
     - {name: uid, type: string}
     - {name: created_at, type: timestamp}
+  null_to_zero: true
 ```
 
 ## Build

data/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "com.jfrog.bintray" version "1.1"
-    id "com.github.jruby-gradle.base" version "0.1.5"
+    id "com.github.jruby-gradle.base" version "1.5.0"
     id "java"
     id "checkstyle"
     // for task download
@@ -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.2"
+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" }
@@ -64,14 +62,16 @@ task checkstyle(type: Checkstyle) {
 }
 
 task gem(type: JRubyExec, dependsOn: ["gemspec", "classpath"]) {
-    jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "build"
-    script "${project.name}.gemspec"
+    jrubyArgs "-S"
+    script "gem"
+    scriptArgs "build", "${project.name}.gemspec"
     doLast { ant.move(file: "${project.name}-${project.version}.gem", todir: "pkg") }
 }
 
 task gemPush(type: JRubyExec, dependsOn: ["gem"]) {
-    jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "push"
-    script "pkg/${project.name}-${project.version}.gem"
+    jrubyArgs "-S"
+    script "gem"
+    scriptArgs "push", "pkg/${project.name}-${project.version}.gem"
 }
 
 task "package"(dependsOn: ["gemspec", "classpath"]) {

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

@@ -1,3 +1,4 @@
+/*
 package org.embulk.input.athena;
 
 import java.util.List;
@@ -48,3 +49,4 @@ public class AthenaInputConnection
         return new SingleSelect(stmt);
     }
 }
+*/

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

@@ -1,5 +1,7 @@
 package org.embulk.input.athena;
 
+import com.google.common.base.Optional;
+
 import java.io.File;
 import java.io.FileFilter;
 import java.net.MalformedURLException;
@@ -10,14 +12,11 @@ import java.nio.file.Paths;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.List;
 import java.util.Properties;
 
-import com.google.common.base.Optional;
-
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.ConfigDiff;
@@ -41,15 +40,16 @@ import org.embulk.spi.SchemaConfig;
 import org.embulk.spi.time.Timestamp;
 import org.slf4j.Logger;
 
-public class AthenaInputPlugin implements InputPlugin {
-
+public class AthenaInputPlugin implements InputPlugin
+{
     protected final Logger logger = Exec.getLogger(getClass());
 
-    public interface PluginTask extends Task {
+    public interface PluginTask extends Task
+    {
         @Config("driver_path")
         @ConfigDefault("null")
-        public Optional <String> getDriverPath();
-        
+        public Optional<String> getDriverPath();
+
         // database (required string)
         @Config("database")
         public String getDatabase();
@@ -82,12 +82,17 @@ public class AthenaInputPlugin implements InputPlugin {
         @ConfigDefault("{}")
         public ToStringMap getOptions();
 
+        @Config("null_to_zero")
+        @ConfigDefault("false")
+        public boolean getNullToZero();
+
         @ConfigInject
         BufferAllocator getBufferAllocator();
     }
 
     @Override
-    public ConfigDiff transaction(ConfigSource config, InputPlugin.Control control) {
+    public ConfigDiff transaction(ConfigSource config, InputPlugin.Control control)
+    {
         PluginTask task = config.loadConfig(PluginTask.class);
 
         Schema schema = task.getColumns().toSchema();
@@ -97,17 +102,20 @@ public class AthenaInputPlugin implements InputPlugin {
     }
 
     @Override
-    public ConfigDiff resume(TaskSource taskSource, Schema schema, int taskCount, InputPlugin.Control control) {
+    public ConfigDiff resume(TaskSource taskSource, Schema schema, int taskCount, InputPlugin.Control control)
+    {
         control.run(taskSource, schema, taskCount);
         return Exec.newConfigDiff();
     }
 
     @Override
-    public void cleanup(TaskSource taskSource, Schema schema, int taskCount, List<TaskReport> successTaskReports) {
+    public void cleanup(TaskSource taskSource, Schema schema, int taskCount, List<TaskReport> successTaskReports)
+    {
     }
 
     @Override
-    public TaskReport run(TaskSource taskSource, Schema schema, int taskIndex, PageOutput output) {
+    public TaskReport run(TaskSource taskSource, Schema schema, int taskIndex, PageOutput output)
+    {
         PluginTask task = taskSource.loadTask(PluginTask.class);
         BufferAllocator allocator = task.getBufferAllocator();
         PageBuilder pageBuilder = new PageBuilder(allocator, schema, output);
@@ -120,58 +128,93 @@ public class AthenaInputPlugin implements InputPlugin {
             connection = getAthenaConnection(task);
             statement = connection.createStatement();
             ResultSet resultSet = statement.executeQuery(task.getQuery());
+            boolean nullToZero = task.getNullToZero();
 
-            ResultSetMetaData m = resultSet.getMetaData();
             while (resultSet.next()) {
-                schema.visitColumns(new ColumnVisitor() {
+                schema.visitColumns(new ColumnVisitor()
+                {
                     @Override
-                    public void timestampColumn(Column column) {
+                    public void timestampColumn(Column column)
+                    {
                         try {
                             java.sql.Timestamp t = resultSet.getTimestamp(column.getName());
                             pageBuilder.setTimestamp(column, Timestamp.ofEpochMilli(t.getTime()));
-                        } catch (SQLException e) {
+                        }
+                        catch (SQLException e) {
                             e.printStackTrace();
+                            throw new RuntimeException(e);
                         }
                     }
 
                     @Override
-                    public void stringColumn(Column column) {
+                    public void stringColumn(Column column)
+                    {
                         try {
                             pageBuilder.setString(column, resultSet.getString(column.getName()));
-                        } catch (SQLException e) {
+                        }
+                        catch (SQLException e) {
                             e.printStackTrace();
+                            throw new RuntimeException(e);
                         }
                     }
 
                     @Override
-                    public void longColumn(Column column) {
+                    public void longColumn(Column column)
+                    {
                         try {
-                            pageBuilder.setLong(column, resultSet.getLong(column.getName()));
-                        } catch (SQLException e) {
+                            long ret = resultSet.getLong(column.getName());
+                            if (resultSet.wasNull() && !nullToZero){
+                                pageBuilder.setNull(column);
+                            }
+                            else {
+                                pageBuilder.setLong(column, ret);
+                            }
+                        }
+                        catch (SQLException e) {
                             e.printStackTrace();
+                            throw new RuntimeException(e);
                         }
                     }
 
                     @Override
-                    public void doubleColumn(Column column) {
+                    public void doubleColumn(Column column)
+                    {
                         try {
-                            pageBuilder.setDouble(column, resultSet.getDouble(column.getName()));
-                        } catch (SQLException e) {
+                            double ret = resultSet.getDouble(column.getName());
+                            if (resultSet.wasNull() && !nullToZero){
+                                pageBuilder.setNull(column);
+                            }
+                            else {
+                                pageBuilder.setDouble(column, ret);
+                            }
+                        }
+                        catch (SQLException e) {
                             e.printStackTrace();
+                            throw new RuntimeException(e);
                         }
                     }
 
                     @Override
-                    public void booleanColumn(Column column) {
+                    public void booleanColumn(Column column)
+                    {
                         try {
-                            pageBuilder.setBoolean(column, resultSet.getBoolean(column.getName()));
-                        } catch (SQLException e) {
+                            boolean ret = resultSet.getBoolean(column.getName());
+                            if (resultSet.wasNull() && !nullToZero){
+                                pageBuilder.setNull(column);
+                            }
+                            else {
+                                pageBuilder.setBoolean(column, ret);
+                            }
+                        }
+                        catch (SQLException e) {
                             e.printStackTrace();
+                            throw new RuntimeException(e);
                         }
                     }
 
                     @Override
-                    public void jsonColumn(Column column) {
+                    public void jsonColumn(Column column)
+                    {
                         // TODO:
                     }
                 });
@@ -183,19 +226,24 @@ public class AthenaInputPlugin implements InputPlugin {
             pageBuilder.close();
             resultSet.close();
             connection.close();
-        } catch (Exception e) {
+        }
+        catch (Exception e) {
             e.printStackTrace();
-        } finally {
+            throw new RuntimeException(e);
+        }
+        finally {
             try {
-                if (statement != null)
+                if (statement != null) {
                     statement.close();
-            } catch (Exception ex) {
-
+                }
             }
+            catch (Exception ex) { }
             try {
-                if (connection != null)
+                if (connection != null) {
                     connection.close();
-            } catch (Exception ex) {
+                }
+            }
+            catch (Exception ex) {
                 ex.printStackTrace();
             }
         }
@@ -204,16 +252,19 @@ public class AthenaInputPlugin implements InputPlugin {
     }
 
     @Override
-    public ConfigDiff guess(ConfigSource config) {
+    public ConfigDiff guess(ConfigSource config)
+    {
         return Exec.newConfigDiff();
     }
 
-    protected Connection getAthenaConnection(PluginTask task) throws ClassNotFoundException, SQLException {
-        loadDriver("com.amazonaws.athena.jdbc.AthenaDriver", task.getDriverPath());
+    protected Connection getAthenaConnection(PluginTask task) throws ClassNotFoundException, SQLException
+    {
+        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);
@@ -227,23 +278,26 @@ public class AthenaInputPlugin implements InputPlugin {
     {
         if (driverPath.isPresent()) {
             addDriverJarToClasspath(driverPath.get());
-        } else {
+        }
+        else {
             try {
                 // Gradle test task will add JDBC driver to classpath
                 Class.forName(className);
-
-            } catch (ClassNotFoundException ex) {
+            }
+            catch (ClassNotFoundException ex) {
                 File root = findPluginRoot();
                 File driverLib = new File(root, "default_jdbc_driver");
                 File[] files = driverLib.listFiles(new FileFilter() {
                     @Override
-                    public boolean accept(File file) {
+                    public boolean accept(File file)
+                    {
                         return file.isFile() && file.getName().endsWith(".jar");
                     }
                 });
                 if (files == null || files.length == 0) {
                     throw new RuntimeException("Cannot find JDBC driver in '" + root.getAbsolutePath() + "'.");
-                } else {
+                }
+                else {
                     for (File file : files) {
                         logger.info("JDBC Driver = " + file.getAbsolutePath());
                         addDriverJarToClasspath(file.getAbsolutePath());
@@ -255,7 +309,8 @@ public class AthenaInputPlugin implements InputPlugin {
         // Load JDBC Driver
         try {
             Class.forName(className);
-        } catch (ClassNotFoundException ex) {
+        }
+        catch (ClassNotFoundException ex) {
             throw new RuntimeException(ex);
         }
     }
@@ -289,7 +344,8 @@ public class AthenaInputPlugin implements InputPlugin {
                     return folder;
                 }
             }
-        } catch (MalformedURLException | URISyntaxException e) {
+        }
+        catch (MalformedURLException | URISyntaxException e) {
             throw new RuntimeException(e);
         }
     }

data/src/main/resources/log4j.properties

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

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-athena
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.7
 platform: ruby
 authors:
 - shinji19
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-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
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   name: bundler
@@ -21,13 +21,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   name: rake
@@ -35,7 +35,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Loads records from Athena.
@@ -45,24 +45,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Dockerfile
 - LICENSE
 - README.md
 - build.gradle
-- config/checkstyle/checkstyle.xml
-- config/checkstyle/default.xml
-- docker-compose.yml
-- gradle/wrapper/gradle-wrapper.jar
-- gradle/wrapper/gradle-wrapper.properties
-- gradlew
-- gradlew.bat
-- lib/embulk/input/athena.rb
-- src/main/java/org/embulk/input/athena/AthenaInputConnection.java
-- src/main/java/org/embulk/input/athena/AthenaInputPlugin.java
-- src/main/java/org/embulk/input/athena/AthenaInputPlugin.java.tmp1
-- src/test/java/org/embulk/input/athena/TestAthenaInputPlugin.java
-- 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
@@ -192,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.2.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
@@ -207,6 +200,18 @@ files:
 - classpath/netty-handler-4.1.17.Final.jar
 - classpath/netty-resolver-4.1.17.Final.jar
 - classpath/netty-transport-4.1.17.Final.jar
+- config/checkstyle/checkstyle.xml
+- config/checkstyle/default.xml
+- docker-compose.yml
+- gradle/wrapper/gradle-wrapper.jar
+- gradle/wrapper/gradle-wrapper.properties
+- gradlew
+- gradlew.bat
+- lib/embulk/input/athena.rb
+- src/main/java/org/embulk/input/athena/AthenaInputConnection.java
+- src/main/java/org/embulk/input/athena/AthenaInputPlugin.java
+- src/main/resources/log4j.properties
+- src/test/java/org/embulk/input/athena/TestAthenaInputPlugin.java
 homepage: https://github.com/shinji19/embulk-input-athena
 licenses:
 - MIT
@@ -217,17 +222,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.6.8
 signing_key:
 specification_version: 4
 summary: Athena input plugin for Embulk

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

@@ -1,192 +0,0 @@
-package org.embulk.input.athena;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.List;
-import java.util.Properties;
-
-import com.google.common.base.Optional;
-
-import org.embulk.config.Config;
-import org.embulk.config.ConfigDefault;
-import org.embulk.config.ConfigDiff;
-import org.embulk.config.ConfigSource;
-import org.embulk.config.Task;
-import org.embulk.config.TaskReport;
-import org.embulk.config.TaskSource;
-import org.embulk.input.jdbc.AbstractJdbcInputPlugin;
-import org.embulk.input.jdbc.JdbcInputConnection;
-import org.embulk.spi.Exec;
-import org.embulk.spi.InputPlugin;
-import org.embulk.spi.PageOutput;
-import org.embulk.spi.Schema;
-import org.embulk.spi.SchemaConfig;
-
-public class AthenaInputPlugin
-        extends AbstractJdbcInputPlugin
-{
-    public interface AthenaPluginTask
-            extends AbstractJdbcInputPlugin.PluginTask
-    {
-        @Config("driver_path")
-        @ConfigDefault("null")
-        public Optional<String> getDriverPath();
-
-        // athena_url (required string)
-        @Config("athena_url")
-        public String getAthenaUrl();
-
-        // s3_staging_dir (required string)
-        @Config("s3_staging_dir")
-        public String getS3StagingDir();
-
-        // access_key (required string)
-        @Config("access_key")
-        public String getAccessKey();        
-
-        // secret_key (required string)
-        @Config("secret_key")
-        public String getSecretKey();
-
-        // configuration option 2 (optional string, null is not allowed)
-        // @Config("option2")
-        // @ConfigDefault("\"myvalue\"")
-        // public String getOption2();
-
-        // configuration option 3 (optional string, null is allowed)
-        // @Config("option3")
-        // @ConfigDefault("null")
-        // public Optional<String> getOption3();
-
-        // if you get schema from config
-        // @Config("columns")
-        // public SchemaConfig getColumns();
-    }
-
-    @Override
-    protected Class<? extends PluginTask> getTaskClass() {
-        return AthenaPluginTask.class;
-    }
-
-    @Override
-    protected AthenaInputConnection newConnection(PluginTask pluginTask) throws SQLException {
-        AthenaPluginTask task = (AthenaPluginTask) pluginTask;
-        loadDriver("com.amazonaws.athena.jdbc.AthenaDriver", task.getDriverPath());
-        //Class.forName("com.amazonaws.athena.jdbc.AthenaDriver");
-        Properties properties = new Properties();
-        properties.put("s3_staging_dir", task.getS3StagingDir());
-        properties.put("user", task.getAccessKey());
-        properties.put("password", task.getSecretKey());
-        properties.putAll(task.getOptions());
-
-        Connection connection = DriverManager.getConnection(task.getAthenaUrl(), properties);
-        try {
-            AthenaInputConnection c = new AthenaInputConnection(connection);
-            connection = null;
-            return c;
-        } finally {
-            if (connection != null) {
-                connection.close();
-            }
-        }
-    }
-
-/*
-    @Override
-    public ConfigDiff transaction(ConfigSource config,
-            InputPlugin.Control control)
-    {
-        PluginTask task = config.loadConfig(PluginTask.class);
-
-        // Schema schema = task.getColumns().toSchema();
-        Schema schema = Schema.builder().build();
-        int taskCount = 1;  // number of run() method calls
-
-        return resume(task.dump(), schema, taskCount, control);
-    }
-
-    @Override
-    public ConfigDiff resume(TaskSource taskSource,
-            Schema schema, int taskCount,
-            InputPlugin.Control control)
-    {
-        control.run(taskSource, schema, taskCount);
-        return Exec.newConfigDiff();
-    }
-
-    @Override
-    public void cleanup(TaskSource taskSource,
-            Schema schema, int taskCount,
-            List<TaskReport> successTaskReports)
-    {
-    }
-
-    @Override
-    public TaskReport run(TaskSource taskSource,
-            Schema schema, int taskIndex,
-            PageOutput output)
-    {
-        PluginTask task = taskSource.loadTask(PluginTask.class);
-        
-        // Write your code here :)
-
-        Connection connection = null;
-        Statement statement = null;
-        try {
-            connection = getAthenaConnection(task);
-            statement = connection.createStatement();
-            ResultSet resultSet = statement.executeQuery("select * from default.sample");
-
-            while(resultSet.next()){
-                String statusCode = resultSet.getString("created_at");
-                System.out.println("st code" + statusCode);
-            }
-            resultSet.close();
-            connection.close();
-        } catch (Exception e){
-            e.printStackTrace();
-        } finally {
-            try {
-                if (statement != null)
-                    statement.close();
-            } catch (Exception ex) {
-   
-            }
-            try {
-                if (connection != null)
-                    connection.close();
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            }
-        }
-
-        return Exec.newTaskReport();
-    }
-
-    @Override
-    public ConfigDiff guess(ConfigSource config)
-    {
-        return Exec.newConfigDiff();
-    }
-*/
-/*
-    protected Connection getAthenaConnection(PluginTask task) throws ClassNotFoundException, SQLException{
-        Class.forName("com.amazonaws.athena.jdbc.AthenaDriver");
-        Properties properties = new Properties();
-        properties.put("s3_staging_dir", task.getS3StagingDir());
-        properties.put("user", task.getAccessKey());
-        properties.put("password", task.getSecretKey());
-        if (task.getLogPath() != null){
-            properties.put("log_path", task.getLogPath());
-        }
-        if (task.getLogLevel() != null){
-            properties.put("log_level", task.getLogLevel());
-        }
-
-        return DriverManager.getConnection(task.getAthenaUrl(), properties);
-    }
-    */
-}