embulk-filter-speedometer 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 525cd955adc5782203cdf6b18247a06bb735b85b
-  data.tar.gz: 2cac362870f2fd022ce61a1b564ffef59ac2762a
+  metadata.gz: 25a84966e8bb8be6e69b29e014ee10b6569c645d
+  data.tar.gz: 6e0073adb00e1fa9076898177602155c4382e67e
 SHA512:
-  metadata.gz: 526d22cc15e2be5f2732852b9519f6a0647553e03b73da7e2d9d984613dc98410ac33135a95044d263583eabf1db8f2cefe61ca6a36ea615a3e25d193777c095
-  data.tar.gz: e4b9921f9b9573022bce814128fc0b436a9736639acfc4b1318cfad66ce53a900b73836a16a97a6c992f5adaf56d8226d16efd2d1cfa0fcde21a62a996e9748d
+  metadata.gz: e6b580ef514a8cca77bed243f05ebf02f41887cf5b33d602959fcdfa9171395f3329f063ff7b6333c4dff932ffcbd70c7e06a595642971693d3e1e305d84bb59
+  data.tar.gz: 43a7d51da77945c8245c9276da9f9d04694e5a87d2ac76ac5d875a7350c18f00d349c452b57c692ef027d2e72aa42c5509e0014ecc5fc32d058f733629c9682c

data/build.gradle

@@ -16,7 +16,7 @@ configurations {
     provided
 }
 
-version = "0.2.2"
+version = "0.2.3"
 
 dependencies {
     compile  "org.embulk:embulk-core:0.5.0+"

data/src/main/java/org/embulk/filter/SpeedometerFilterPlugin.java

@@ -82,47 +82,46 @@ public class SpeedometerFilterPlugin
         private final Schema schema;
         private final ImmutableMap<Column, TimestampFormatter> timestampMap;
         private final PageOutput pageOutput;
-        private final PageOutput addOnlyPageOutput;
         private final PageReader pageReader;
         private final BufferAllocator allocator;
         private final int delimiterLength;
         private final int recordPaddingSize;
+        private final PageBuilder pageBuilder;
 
         SpeedControlPageOutput(PluginTask task, Schema schema, PageOutput pageOutput) {
             this.controller = new SpeedometerSpeedController(task, SpeedometerSpeedAggregator.getInstance());
             this.schema = schema;
             this.pageOutput = pageOutput;
-            this.addOnlyPageOutput = new AddOnlyPageOutput(pageOutput);
             this.allocator = task.getBufferAllocator();
             this.delimiterLength = task.getDelimiter().length();
             this.recordPaddingSize = task.getRecordPaddingSize();
-            pageReader = new PageReader(schema);
-            timestampMap = buildTimestampFormatterMap(task, schema);
+            this.pageReader = new PageReader(schema);
+            this.timestampMap = buildTimestampFormatterMap(task, schema);
+            this.pageBuilder = new PageBuilder(allocator, schema, pageOutput);
         }
 
         @Override
         public void add(Page page) {
-            try (final PageBuilder pageBuilder = new PageBuilder(allocator, schema, addOnlyPageOutput)) {
-                ColumnVisitorImpl visitor = new ColumnVisitorImpl(pageBuilder);
-                pageReader.setPage(page);
-                while (pageReader.nextRecord()) {
-                    visitor.speedMonitorStartRecord();
-                    schema.visitColumns(visitor);
-                    visitor.speedMonitorEndRecord();
-                    pageBuilder.addRecord();
-                }
-                pageBuilder.finish();
+            ColumnVisitorImpl visitor = new ColumnVisitorImpl(pageBuilder);
+            pageReader.setPage(page);
+            while (pageReader.nextRecord()) {
+                visitor.speedMonitorStartRecord();
+                schema.visitColumns(visitor);
+                visitor.speedMonitorEndRecord();
+                pageBuilder.addRecord();
             }
         }
 
         @Override
         public void finish() {
+            pageBuilder.finish();
             pageOutput.finish();
         }
 
         @Override
         public void close() {
             controller.stop();
+            pageBuilder.close();
             pageReader.close();
             pageOutput.close();
         }
@@ -157,25 +156,6 @@ public class SpeedometerFilterPlugin
             return builder.build();
         }
 
-        // Ignore finish and close to avoid closing upper output stream.
-        static class AddOnlyPageOutput implements PageOutput {
-            protected final PageOutput output;
-
-            public AddOnlyPageOutput(PageOutput outptut) {
-                this.output = outptut;
-            }
-
-            @Override
-            public void add(Page page) {
-                output.add(page);
-            }
-
-            @Override
-            public void finish() { }
-
-            @Override
-            public void close() { }
-        }
 
         class ColumnVisitorImpl implements ColumnVisitor {
             private final PageBuilder pageBuilder;

data/src/test/java/org/embulk/filter/TestSpeedometerFilterPlugin.java

@@ -69,8 +69,8 @@ public class TestSpeedometerFilterPlugin
 
         new Verifications() {{
             taskSource.loadTask(PluginTask.class); times = 1;
-            builder.finish(); times = 1;
             builder.addRecord(); times = 1;
+            builder.finish(); times = 0;
             reader.nextRecord(); times = 2;
             reader.setPage(page); times = 1;
             schema.visitColumns(withInstanceOf(ColumnVisitor.class)); times = 2;
@@ -90,6 +90,7 @@ public class TestSpeedometerFilterPlugin
 
         new Verifications() {{
             taskSource.loadTask(PluginTask.class); times = 1;
+            builder.finish(); times = 1;
             inPageOutput.finish(); times = 1;
         }};
     }
@@ -107,6 +108,7 @@ public class TestSpeedometerFilterPlugin
 
         new Verifications() {{
             taskSource.loadTask(PluginTask.class); times = 1;
+            builder.close(); times = 1;
             reader.close(); times = 1;
             inPageOutput.close(); times = 1;
         }};

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-speedometer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - hata
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+  name: bundler
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
+  name: rake
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '10.0'
 description: Write log message of processed bytes and throughput periodically.
 email:
 - hiroki.ata@gmail.com
@@ -62,7 +62,7 @@ files:
 - src/test/java/org/embulk/filter/TestSpeedometerSpeedAggregator.java
 - src/test/java/org/embulk/filter/TestSpeedometerSpeedController.java
 - src/test/java/org/embulk/filter/TestSpeedometerUtil.java
-- classpath/embulk-filter-speedometer-0.2.2.jar
+- classpath/embulk-filter-speedometer-0.2.3.jar
 homepage: https://github.com/hata/embulk-filter-speedometer
 licenses:
 - MIT