embulk-filter-speedometer 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b34d1dc9dc74d1b823018a0b69e4f31465df617
-  data.tar.gz: efb4575ac811267c0bf70101252293e6ce061cb5
+  metadata.gz: 958b4d942aed7b7887b9e1ef551eff708fc6c772
+  data.tar.gz: 494333e5bdf90fe38a4b4cb2bfe51d3fd4243ae7
 SHA512:
-  metadata.gz: 27b149f6be1961a37ef6120aa892b605dc1a99790bab45f40c03b7ca43bdb4acda4790b0a2eb218f3ab523ed0e32cd3584c4918690268c2d570b41dad1f26224
-  data.tar.gz: 65c229df6124ddba77c84b65be36cbf1b67cc701f17e333f8c03180cdf762bbf349fe4bf41e6a1fa734812a618529ff38dd16d069c5ec6257b04818715f505d2
+  metadata.gz: a079f858ae03565450f89bfcb549da32cdc4ee0decbb132ae711a9a48e99b8a084f92ad22f02843d57324879ba17863ebb5db643acd681d626f610ebc9385716
+  data.tar.gz: 61c318a6d621d39f54a4493e7113d94dd273c7bb417a01bcd91e91945cdad10f54fddbdbe40fafaac1c3aece860fe6ecd7c7fdbe084fcf5be8dd335815dd6e7c

data/.travis.yml

@@ -1,3 +1,3 @@
 language: java
-script: ./gradlew -DenableIntegrationTest=true gem
-
+script: ./gradlew --info -DenableIntegrationTest=true gem
+after_failure: "ls -al /home/travis/build/hata/embulk-filter-speedometer/build/tmp/integrationTest/embulk/; cat /home/travis/build/hata/embulk-filter-speedometer/build/tmp/integrationTest/embulk/config_big.yml.run.log"

data/build.gradle

@@ -18,7 +18,7 @@ configurations {
     provided
 }
 
-version = "0.3.1"
+version = "0.3.2"
 
 dependencies {
     compile  "org.embulk:embulk-core:0.6.17+"

data/src/integration-test/java/org/embulk/filter/TestSingleRun.java

@@ -5,6 +5,7 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FilenameFilter;
 import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.InputStreamReader;
@@ -29,12 +30,12 @@ public class TestSingleRun {
 
     @Test
     public void testValidateMinOutputFile() throws Exception {
-        validateResultFiles("min_01.csv.gz", "result_min_000.00.csv", "result_min_001.00.csv");
+        validateResultFiles("min_01.csv.gz", "result_min_");
     }
 
     @Test
     public void testValidateBigOutputFile() throws Exception {
-        validateResultFiles("big_01.csv.gz", "result_big_000.00.csv", "result_big_001.00.csv");
+        validateResultFiles("big_01.csv.gz", "result_big_");
     }
 
     @Test
@@ -62,7 +63,7 @@ public class TestSingleRun {
         assertTrue("Verify there are speedometer log lines.", found);
     }
 
-    private void validateResultFiles(String gzipSrcFile, String... resultFiles) throws Exception {
+    private void validateResultFiles(String gzipSrcFile, final String prefix) throws Exception {
         ArrayList inList = new ArrayList();
         ArrayList outList = new ArrayList();
 
@@ -76,6 +77,14 @@ public class TestSingleRun {
             }
         }
 
+        // In travis env, there are many cpus and it may be different from
+        // my local environment. From this, list all files using File.list method.
+        String[] resultFiles = new File(TEST_DIR).list(new FilenameFilter() {
+            public boolean accept(File dir, String name) {
+                return name.startsWith(prefix) && name.endsWith(".csv");
+            }
+        });
+
         for (String resultFile : resultFiles) {
             try (BufferedReader reader = new BufferedReader(new FileReader(getTestFile(resultFile)))) {
                 String line = reader.readLine(); // Discard a header line
@@ -90,6 +99,7 @@ public class TestSingleRun {
         Collections.sort(inList);
         Collections.sort(outList);
 
-        assertEquals("Verify input and output lines are identical.", inList, outList);
+        assertEquals("Verify input and output lines are identical. in:" +
+            inList.size() + ", out:" + outList.size(), inList.toString(), outList.toString());
     }
 }

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

@@ -89,7 +89,6 @@ public class SpeedometerFilterPlugin
         private final SpeedometerSpeedController controller;
         private final Schema schema;
         private final TimestampFormatter[] timestampFormatters;
-        private final PageOutput pageOutput;
         private final PageReader pageReader;
         private final BufferAllocator allocator;
         private final int delimiterLength;
@@ -99,7 +98,6 @@ public class SpeedometerFilterPlugin
         SpeedControlPageOutput(PluginTask task, Schema schema, PageOutput pageOutput) {
             this.controller = new SpeedometerSpeedController(task, SpeedometerSpeedAggregator.getInstance());
             this.schema = schema;
-            this.pageOutput = pageOutput;
             this.allocator = task.getBufferAllocator();
             this.delimiterLength = task.getDelimiter().length();
             this.recordPaddingSize = task.getRecordPaddingSize();
@@ -130,7 +128,6 @@ public class SpeedometerFilterPlugin
             controller.stop();
             pageBuilder.close();
             pageReader.close();
-            pageOutput.close();
         }
 
         class ColumnVisitorImpl implements ColumnVisitor {

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

@@ -109,7 +109,6 @@ public class TestSpeedometerFilterPlugin
             taskSource.loadTask(PluginTask.class); times = 1;
             builder.close(); times = 1;
             reader.close(); times = 1;
-            inPageOutput.close(); times = 1;
         }};
     }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-speedometer
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - hata
@@ -68,7 +68,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.3.1.jar
+- classpath/embulk-filter-speedometer-0.3.2.jar
 homepage: https://github.com/hata/embulk-filter-speedometer
 licenses:
 - MIT