embulk-filter-speedometer 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1863aa945ac60beaa9405eb474afa72e7c1a6db5
-  data.tar.gz: b6b07c39b231515584ee029c516461f5848ce1d0
+  metadata.gz: 525cd955adc5782203cdf6b18247a06bb735b85b
+  data.tar.gz: 2cac362870f2fd022ce61a1b564ffef59ac2762a
 SHA512:
-  metadata.gz: ae0a2f4e7130ec2a0d05a63943e015f28c6e7fb745b0139deacaa8edd57f9a46db555b6aacd6bdfd32ca56deb85f6b8e7fcb48090fa1a2d05e5ff65d697dd95b
-  data.tar.gz: 2fbf9bdad05e59ca7001acaa6ced9352c76537a439e5b5dc271388c13d538ca1f6fabf7a6be7d5725a18d243796bd5cfcd9b738919f1b4caaddd7bb557ec4c9c
+  metadata.gz: 526d22cc15e2be5f2732852b9519f6a0647553e03b73da7e2d9d984613dc98410ac33135a95044d263583eabf1db8f2cefe61ca6a36ea615a3e25d193777c095
+  data.tar.gz: e4b9921f9b9573022bce814128fc0b436a9736639acfc4b1318cfad66ce53a900b73836a16a97a6c992f5adaf56d8226d16efd2d1cfa0fcde21a62a996e9748d

data/README.md

@@ -72,6 +72,6 @@ $ ./gradlew gem
 
 ## Note
 
-The shown data is caled based on text data size while using this filter plugin. So, the data is not the same data as read bytes and write bytes n input and output plugins.
+The shown data is caled based on text data size while using this filter plugin. So, the data is not the same data as read bytes and write bytes n input and output plugins. And this plugin has a little overhead to measure the bytes.
 
 

data/build.gradle

@@ -16,7 +16,7 @@ configurations {
     provided
 }
 
-version = "0.2.1"
+version = "0.2.2"
 
 dependencies {
     compile  "org.embulk:embulk-core:0.5.0+"
@@ -39,13 +39,23 @@ task gem(type: JRubyExec, dependsOn: ["build", "gemspec", "classpath"]) {
     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"
+}
+
+task "package"(dependsOn: ["gemspec", "classpath"]) << {
+    println "> Build succeeded."
+    println "> You can run embulk with '-L ${file(".").absolutePath}' argument."
+}
+
 task gemspec << { file("build/gemspec").write($/
 Gem::Specification.new do |spec|
   spec.name          = "${project.name}"
   spec.version       = "${project.version}"
-  spec.authors       = ["Hiroki Ata"]
+  spec.authors       = ["hata"]
   spec.summary       = %[Speedometer filter plugin for Embulk]
-  spec.description   = %["Write log message of processed bytes and throughput periodically."]
+  spec.description   = %[Write log message of processed bytes and throughput periodically.]
   spec.email         = ["hiroki.ata@gmail.com"]
   spec.licenses      = ["MIT"]
   spec.homepage      = "https://github.com/hata/embulk-filter-speedometer"

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

@@ -256,7 +256,7 @@ public class SpeedometerFilterPlugin
 
             private long speedMonitor(Column column, long l) {
                 speedMonitorForDelimiter(column);
-                controller.checkSpeedLimit(startRecordTime, String.valueOf(l).length());
+                controller.checkSpeedLimit(startRecordTime, SpeedometerUtil.toDigitsTextLength(l));
                 return l;
             }
 

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

@@ -1,6 +1,7 @@
 package org.embulk.filter;
 
 public class SpeedometerUtil {
+    private static final int MIN_LENGTH = String.valueOf(Long.MIN_VALUE).length();
 
     public static String toNumberText(long originalNum) {
         long baseNum = 1000;
@@ -60,4 +61,16 @@ public class SpeedometerUtil {
 
         return String.format("%1d days", num);
     }
+
+    public static int toDigitsTextLength(long num) {
+        if (num == 0) {
+            return 1;
+        } else if (num == Long.MIN_VALUE) {
+            return MIN_LENGTH;
+        } else if (num < 0) {
+            return 2 + (int)Math.log10(Math.abs(num)); // Note: minus(-) is added.
+        } else {
+            return 1 + (int)Math.log10(num);
+        }
+    }
 }

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

@@ -38,4 +38,25 @@ public class TestSpeedometerUtil {
         assertEquals("Verify 100 days", "100 days", SpeedometerUtil.toTimeText(60L * 60 * 24 * 1000 * 100));
     }
 
+    @Test
+    public void testToNumberLengthForZero() {
+        assertEquals("Verify toNumberText to zero", 1, SpeedometerUtil.toDigitsTextLength(0));
+    }
+
+    @Test
+    public void testToNumberLengthForMax() {
+        assertEquals("Verify toNumberText to max", String.valueOf(Long.MAX_VALUE).length(), SpeedometerUtil.toDigitsTextLength(Long.MAX_VALUE));
+    }
+
+    @Test
+    public void testToNumberLengthForMin() {
+        assertEquals("Verify toNumberText to min", String.valueOf(Long.MIN_VALUE).length(), SpeedometerUtil.toDigitsTextLength(Long.MIN_VALUE));
+    }
+
+    @Test
+    public void testToNumberLengthForSeveralValues() {
+        for (int i = -1024;i < 1024;i++) {
+            assertEquals("Verify toNumberText to " + i, String.valueOf(i).length(), SpeedometerUtil.toDigitsTextLength(i));
+        }
+    }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-speedometer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
-- Hiroki Ata
+- hata
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,7 +38,7 @@ dependencies:
         version: '10.0'
   prerelease: false
   type: :development
-description: '"Write log message of processed bytes and throughput periodically."'
+description: Write log message of processed bytes and throughput periodically.
 email:
 - hiroki.ata@gmail.com
 executables: []
@@ -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.1.jar
+- classpath/embulk-filter-speedometer-0.2.2.jar
 homepage: https://github.com/hata/embulk-filter-speedometer
 licenses:
 - MIT