embulk-filter-calcite 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea4ee3ab6303bec568a675a5be2854734b555aca
-  data.tar.gz: a9508c8f413308b9df668e95c74bcfd998e4b6b9
+  metadata.gz: c6676613c81d60cb8384827212e101894fa32b91
+  data.tar.gz: 6cca5546a143dd654b42433a70a9ec15099b8714
 SHA512:
-  metadata.gz: 132a5257822499c80b5e5b34480a1075e50e5dbc840a37d33238c8d14e22324e794843d7397f87dfd0d083a48f0b99ab9e3b4fdf80cd7effc363fa49457b1113
-  data.tar.gz: e54a39e9c088c4d861ba22427e9101b32e6bcc8be2685b4627850f2b30c3cdfb2b3625a390622a61b8129af034d65022f4d696f5c7cfc2b00edd0a5fccd8a3a8
+  metadata.gz: c4dafb13d6f15b29790c118669fc93254e7ba769c519a60f1de4c656a6f2381c3d2653361164ec021b63d506372445cc2a42366e9d06adf8c36413c7e88484af
+  data.tar.gz: d259c8c92690dade9e49caa83543f34e0e59defd33502c7dc39f80e830b51dcd6ac13fde7b3d2fa9d78e03113277d6a9f0e8e57bd0b1f69eef0a99d353f28c27

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.1.3 - 2017-05-18
+
+* [maintenance] Use PreparedStatement to improve the performance. [#23]
+
+* [maintenance] Deduplicate redundant logging to fix #24. [#25]
+
+* [maintenance] Add settings.gradle. [#26]
+
 ## 0.1.2 - 2017-05-15
 
 * [new feature] Add warning to change default of case sensitive. [#18]

data/build.gradle

@@ -17,7 +17,7 @@ configurations {
     provided
 }
 
-version = "0.1.2"
+version = "0.1.3"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

data/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'embulk-filter-calcite'

data/src/main/java/org/embulk/filter/calcite/CalciteFilterPlugin.java

@@ -6,6 +6,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.inject.Inject;
 import java.sql.Connection;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
@@ -55,7 +56,7 @@ public class CalciteFilterPlugin implements FilterPlugin {
     public void transaction(ConfigSource config, Schema inputSchema, FilterPlugin.Control control) {
         PluginTask task = config.loadConfig(PluginTask.class);
         Properties props = System.getProperties(); // TODO should be configured as config option
-        setupProperties(task, props);
+        setupPropertiesFromTransaction(task, props);
 
         // Set input schema in PageSchema
         PageSchema.schema = inputSchema;
@@ -81,14 +82,19 @@ public class CalciteFilterPlugin implements FilterPlugin {
         }
     }
 
-    private void setupProperties(PluginTask task, Properties props) {
-        // @see https://calcite.apache.org/docs/adapter.html#jdbc-connect-string-parameters
+    private void setupPropertiesFromTransaction(PluginTask task, Properties props) {
         final ToStringMap options = task.getOptions();
         if (!options.containsKey("caseSensitive")) {
             log.warn("JDBC parameter 'caseSensitive' is implicitly set to false as default in");
             log.warn("embulk-filter-calcite 0.1 but, it's scheduled to change default with true");
             log.warn("in 0.2. Please use 'options' option to set 'caseSensitive' to false.");
         }
+        setupProperties(task, props);
+    }
+
+    private void setupProperties(PluginTask task, Properties props) {
+        // @see https://calcite.apache.org/docs/adapter.html#jdbc-connect-string-parameters
+        final ToStringMap options = task.getOptions();
         props.setProperty("caseSensitive", "false"); // Relax case-sensitive
         props.setProperty("timeZone", task.getDefaultTimeZone().getID());
 
@@ -110,6 +116,14 @@ public class CalciteFilterPlugin implements FilterPlugin {
         }
     }
 
+    private PreparedStatement createPreparedStatement(Connection conn, String query) {
+        try {
+            return conn.prepareStatement(query);
+        } catch (SQLException e) {
+            throw Throwables.propagate(e);
+        }
+    }
+
     private String buildJdbcUrl() {
         // build a json model to apply Page storage adaptor
         // @see https://github.com/apache/calcite/blob/master/example/csv/src/test/resources/model.json
@@ -214,12 +228,13 @@ public class CalciteFilterPlugin implements FilterPlugin {
         List<ColumnGetter> getters = newColumnGetters(factory, task.getQuerySchema());
         Properties props = System.getProperties(); // TODO should be configured as config option
         setupProperties(task, props);
+        final Connection conn = newConnection(buildJdbcUrl(), props);
+        final PreparedStatement preparedStatement = createPreparedStatement(conn, task.getQuery());
         return new FilterPageOutput(outputSchema,
-                task.getQuery(),
                 pageBuilder,
                 pageConverter,
                 getters,
-                props);
+                preparedStatement); // Transfer ownership of preparedStatement to FilterPageOutput
     }
 
     public interface PluginTask
@@ -251,21 +266,21 @@ public class CalciteFilterPlugin implements FilterPlugin {
             implements PageOutput {
 
         private final Schema outputSchema;
-        private final String query;
         private final PageBuilder pageBuilder;
         private final PageConverter pageConverter;
         private final List<ColumnGetter> getters;
-        private final Properties props;
+        private final PreparedStatement preparedStatement;
 
-        private FilterPageOutput(Schema outputSchema, String query, PageBuilder pageBuilder,
+        private FilterPageOutput(Schema outputSchema,
+                                 PageBuilder pageBuilder,
                                  PageConverter pageConverter,
-                                 List<ColumnGetter> getters, Properties props) {
+                                 List<ColumnGetter> getters,
+                                 PreparedStatement preparedStatement) {
             this.outputSchema = outputSchema;
-            this.query = query;
             this.pageBuilder = pageBuilder;
             this.pageConverter = pageConverter;
             this.getters = getters;
-            this.props = props;
+            this.preparedStatement = preparedStatement;
         }
 
         @Override
@@ -276,10 +291,8 @@ public class CalciteFilterPlugin implements FilterPlugin {
             // Set page as TLS variable in PageTable
             PageTable.page.set(page);
 
-            try (Connection conn = newConnection(buildJdbcUrl(), props);
-                 Statement stat = conn.createStatement();
-                 ResultSet result = executeQuery(stat, query)) {
 
+            try (ResultSet result = preparedStatement.executeQuery()) {
                 while (result.next()) {
                     for (int i = 0; i < getters.size(); i++) {
                         int index = i + 1; // JDBC column index begins from 1
@@ -303,6 +316,11 @@ public class CalciteFilterPlugin implements FilterPlugin {
         @Override
         public void close() {
             pageBuilder.close();
+            try {
+                preparedStatement.close();
+            } catch (SQLException e) {
+                throw Throwables.propagate(e);
+            }
         }
     }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-calcite
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Muga Nishizawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +59,7 @@ files:
 - gradlew
 - gradlew.bat
 - lib/embulk/filter/calcite.rb
+- settings.gradle
 - src/main/java/org/embulk/filter/calcite/CalciteFilterPlugin.java
 - src/main/java/org/embulk/filter/calcite/PageConverter.java
 - src/main/java/org/embulk/filter/calcite/adapter/page/PageEnumerator.java
@@ -105,7 +106,7 @@ files:
 - classpath/commons-lang3-3.2.jar
 - classpath/commons-logging-1.2.jar
 - classpath/commons-pool-1.5.4.jar
-- classpath/embulk-filter-calcite-0.1.2.jar
+- classpath/embulk-filter-calcite-0.1.3.jar
 - classpath/embulk-input-jdbc-0.8.2.jar
 - classpath/guava-19.0.jar
 - classpath/httpclient-4.5.2.jar