embulk-filter-join_file 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c930b9f8d2efac6c196e72071268d25e0596f107
-  data.tar.gz: 2a5b3b96c7a8c34c53045a72038634ed06072ab7
+  metadata.gz: c5f9a086691645351c64c10d5ae574b8c4a52d05
+  data.tar.gz: c70bffc4d85ce981518b4bbf63704330502d5a21
 SHA512:
-  metadata.gz: ebce654eaa2b20d892d64d9ceebe0d7f914b762bae4a09fcbafe52b8bea406a5a552aad5a0ad38a9699a40a8763d5043e75ecd5bad0200ad5d50e34bfbf2a20e
-  data.tar.gz: f53a115e19a1e96a760fc7c65f19479d93f42a36ff31c6473ee4a37959fbc9ec125f82d3a6f89fda2c7fb47dfb8b484fd76e577e6fd40491c221429c135547f9
+  metadata.gz: 60ad2a0158a482f0c51582afcbd55ee31c757a4c20879b4b032ef4b7dcc1888e07bbbfa34bb3c1a48538dc122803c0a4a22340c7f26e4a322c67ace06de32fa9
+  data.tar.gz: 35b8ef8dae9788fd29d34870dc0e1b6033330f1ed8583a50fbc26228020df648e79b7eaf1d62f99eccf003be8760911aa389cc13f6c62fa5e80cf1b52e00534a

data/README.md

@@ -19,7 +19,7 @@ This plugin combine rows from file having data format like a table, based on a c
 - **joined_column_prefix**: prefix added to joined data columns (string, default: `"_joined_by_embulk_"`)
 - **file_path**: path of file (string, required)
 - **file_format**: file format (string, required, supported: `csv`, `tsv`, `yaml`, `json`)
-- **columns**: required columns of json table (array of hash, required)
+- **columns**: required columns of data from the file (array of hash, required)
   - **name**: name of the column
   - **type**: type of the column (see below)
   - **format**: format of the timestamp if type is timestamp

data/build.gradle

@@ -12,7 +12,7 @@ configurations {
     provided
 }
 
-version = "0.0.1"
+version = "0.0.2"
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 

data/src/main/java/org/embulk/filter/join_file/FilteredPageOutput.java

@@ -22,9 +22,7 @@ public class FilteredPageOutput
 {
     private final org.slf4j.Logger logger = Exec.getLogger(FilteredPageOutput.class);
     private final PageReader pageReader;
-    private final PageOutput pageOutput;
-    private final Schema inputSchema;
-    private final Schema outputSchema;
+    private final PageBuilder pageBuilder;
     private final Column joinBaseColumn;
     private final HashMap<String, HashMap<String, String>> table;
     private final List<Column> joinColumns;
@@ -41,9 +39,7 @@ public class FilteredPageOutput
             )
     {
         this.pageReader = new PageReader(inputSchema);
-        this.pageOutput = pageOutput;
-        this.inputSchema = inputSchema;
-        this.outputSchema = outputSchema;
+        this.pageBuilder = new PageBuilder(Exec.getBufferAllocator(), outputSchema, pageOutput);
         this.joinBaseColumn = joinBaseColumn;
         this.table = table;
         this.joinColumns = joinColumns;
@@ -54,33 +50,30 @@ public class FilteredPageOutput
     @Override
     public void add(Page page)
     {
-        try (final PageBuilder pageBuilder = new PageBuilder(Exec.getBufferAllocator(), outputSchema, pageOutput)) {
-            pageReader.setPage(page);
+        pageReader.setPage(page);
 
-            while (pageReader.nextRecord()) {
-                setInputValues(pageBuilder);
-                setJoinedValues(pageBuilder);
-                pageBuilder.addRecord();
-            }
-            pageBuilder.finish();
+        while (pageReader.nextRecord()) {
+            setInputValues(pageBuilder);
+            setJoinedValues(pageBuilder);
+            pageBuilder.addRecord();
         }
     }
 
     @Override
     public void finish()
     {
-        pageOutput.finish();
+        pageBuilder.finish();
     }
 
     @Override
     public void close()
     {
         pageReader.close();
-        pageOutput.close();
+        pageBuilder.close();
     }
 
     private void setInputValues(PageBuilder pageBuilder) {
-        for (Column inputColumn: inputSchema.getColumns()) {
+        for (Column inputColumn: pageReader.getSchema().getColumns()) {
             if (pageReader.isNull(inputColumn)) {
                 pageBuilder.setNull(inputColumn);
                 continue;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-join_file
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Civitaspo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2015-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,7 +61,7 @@ files:
 - src/main/java/org/embulk/filter/join_file/JoinFileFilterPlugin.java
 - src/main/java/org/embulk/filter/join_file/TableBuilder.java
 - src/test/java/org/embulk/filter/join_file/TestJoinFileFilterPlugin.java
-- classpath/embulk-filter-join_file-0.0.1.jar
+- classpath/embulk-filter-join_file-0.0.2.jar
 homepage: https://github.com/civitaspo/embulk-filter-join_file
 licenses:
 - MIT