embulk-filter-speedometer 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25a84966e8bb8be6e69b29e014ee10b6569c645d
-  data.tar.gz: 6e0073adb00e1fa9076898177602155c4382e67e
+  metadata.gz: 412ffe6e6afcc9ad7adcc2c3bf115ff69b46e068
+  data.tar.gz: 26edc64ab161aed9f413778eefb4de6e2e61fca2
 SHA512:
-  metadata.gz: e6b580ef514a8cca77bed243f05ebf02f41887cf5b33d602959fcdfa9171395f3329f063ff7b6333c4dff932ffcbd70c7e06a595642971693d3e1e305d84bb59
-  data.tar.gz: 43a7d51da77945c8245c9276da9f9d04694e5a87d2ac76ac5d875a7350c18f00d349c452b57c692ef027d2e72aa42c5509e0014ecc5fc32d058f733629c9682c
+  metadata.gz: 49cc5903582acc3e75f80e6f4a1eeddcb6b43b9751dadbd3fa51c8367c9c47adbdc56483ad0cf0b514d3446e6984a3abe299a73d28b140197f42d8d758f8ebad
+  data.tar.gz: a4a89b2f63c83e0e2c222e775058aa9176f92ad7487936aa2fbf4752e74c324e1e9603a75c212df057d2f6da0fc13f73c22fdae6d1020e588f038906548436e8

data/README.md

@@ -1,6 +1,7 @@
 # Speedometer Filter Plugin for Embulk
 
 Write log message of processed bytes and throughput periodically.
+This plugin works with embulk:0.6.17 or later versions because of removing deprecated APIs.
 
 ## Overview
 
@@ -12,6 +13,7 @@ Write log message of processed bytes and throughput periodically.
 - **speed_limit**: Set maximum processing size per second. If 0 is set, then no limit. (integer, optional, default: 0)
 - **delimiter**: Delimiter text to calculate delimiter length. (string, optional, default: ",")
 - **record_padding_size**: Additional byte size for each record like a return code length. (integer, optional, default: 1)
+- **column_options**: A map whose keys are name of columns like csv formatter plugin (hash, optional, default: {})
 
 ## Example of Configuration
 
@@ -50,19 +52,32 @@ filters:
     record_padding_size: 0
 ```
 
+- Set timestamp format to change default format for timestamp columns. The following **column_options** set %Y-%m-%d %H:%M:%S for time column and %Y%m%d for purchase column. If this option is not set, then a default embulk timestamp format is used.
+
+```yaml
+filters:
+  - type: speedometer
+    speed_limit: 250000
+    column_options:
+      time: {format: '%Y-%m-%d %H:%M:%S'}
+      purchase: {format: '%Y%m%d'}
+```
+
+
 ## Sample Log Message
 
 ```
-2015-03-07 18:28:51.208 -0800 [INFO] (task-0007): {speedometer: {active: 0, total: 0.0b, sec: 0.00, speed: 0.0b/s}}
-2015-03-07 18:28:51.397 -0800 [INFO] (task-0000): {speedometer: {active: 0, total: 144b, sec: 0.00, speed: 144kb/s}}
-2015-03-07 18:29:01.401 -0800 [INFO] (task-0002): {speedometer: {active: 5, total: 9.2mb, sec: 10.0, speed: 999kb/s}}
-2015-03-07 18:29:11.410 -0800 [INFO] (task-0008): {speedometer: {active: 5, total: 36.1mb, sec: 20.0, speed: 2.7mb/s}}
+2015-11-27 13:43:25.592 +0900 [INFO] (task-0006): {speedometer: {active: 4, total: 13.5mb, sec: 1:51, speed: 121kb/s, records: 269,748, record-speed: 2,435/s}}
+2015-11-27 13:43:35.642 +0900 [INFO] (task-0004): {speedometer: {active: 4, total: 14.9mb, sec: 2:01, speed: 141kb/s, records: 297,532, record-speed: 2,832/s}}
+2015-11-27 13:43:45.661 +0900 [INFO] (task-0005): {speedometer: {active: 3, total: 16.5mb, sec: 2:11, speed: 119kb/s, records: 329,484, record-speed: 2,395/s}}
 ```
 
 - **active**: running threads
 - **total**: processed bytes. This size is calculated based on text data like csv. For example, boolean value is 4 bytes(true) or 5 bytes(false). The default configuration set a byte for delimiter and a byte padding for each record.
 - **sec**: elapsed time.
 - **speed**: bytes per second.
+- **records**: total processed records.
+- **record-speed**: total processed records per second.
 
 ## Build
 

data/build.gradle

@@ -16,11 +16,11 @@ configurations {
     provided
 }
 
-version = "0.2.3"
+version = "0.3.0"
 
 dependencies {
-    compile  "org.embulk:embulk-core:0.5.0+"
-    provided "org.embulk:embulk-core:0.5.0+"
+    compile  "org.embulk:embulk-core:0.6.17+"
+    provided "org.embulk:embulk-core:0.6.17+"
     // compile "YOUR_JAR_DEPENDENCY_GROUP:YOUR_JAR_DEPENDENCY_MODULE:YOUR_JAR_DEPENDENCY_VERSION"
     testCompile "org.jmockit:jmockit:1.15+"
     testCompile "junit:junit:4.+"

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

@@ -1,5 +1,7 @@
 package org.embulk.filter;
 
+import java.util.Map;
+
 import javax.validation.constraints.Min;
 
 import org.embulk.config.Config;
@@ -19,9 +21,7 @@ import org.embulk.spi.PageReader;
 import org.embulk.spi.Schema;
 import org.embulk.spi.time.Timestamp;
 import org.embulk.spi.time.TimestampFormatter;
-import org.embulk.spi.type.TimestampType;
-
-import com.google.common.collect.ImmutableMap;
+import org.embulk.spi.util.Timestamps;
 
 public class SpeedometerFilterPlugin
         implements FilterPlugin
@@ -30,7 +30,7 @@ public class SpeedometerFilterPlugin
     private static final int FALSE_LENGTH = Boolean.toString(false).length();
 
     public interface PluginTask
-            extends Task,  TimestampFormatter.FormatterTask
+            extends Task,  TimestampFormatter.Task
     {
         @Config("speed_limit")
         @ConfigDefault("0")
@@ -55,10 +55,18 @@ public class SpeedometerFilterPlugin
         @Min(0)
         public int getLogIntervalSeconds();
 
+        @Config("column_options")
+        @ConfigDefault("{}")
+        Map<String, TimestampColumnOption> getColumnOptions();
+
         @ConfigInject
         public BufferAllocator getBufferAllocator();
     }
 
+    public interface TimestampColumnOption extends Task,
+    TimestampFormatter.TimestampColumnOption
+    { }
+
     @Override
     public void transaction(ConfigSource config, Schema inputSchema,
             FilterPlugin.Control control)
@@ -80,7 +88,7 @@ public class SpeedometerFilterPlugin
     static class SpeedControlPageOutput implements PageOutput {
         private final SpeedometerSpeedController controller;
         private final Schema schema;
-        private final ImmutableMap<Column, TimestampFormatter> timestampMap;
+        private final TimestampFormatter[] timestampFormatters;
         private final PageOutput pageOutput;
         private final PageReader pageReader;
         private final BufferAllocator allocator;
@@ -96,7 +104,7 @@ public class SpeedometerFilterPlugin
             this.delimiterLength = task.getDelimiter().length();
             this.recordPaddingSize = task.getRecordPaddingSize();
             this.pageReader = new PageReader(schema);
-            this.timestampMap = buildTimestampFormatterMap(task, schema);
+            this.timestampFormatters = Timestamps.newTimestampColumnFormatters(task, schema, task.getColumnOptions());
             this.pageBuilder = new PageBuilder(allocator, schema, pageOutput);
         }
 
@@ -126,37 +134,6 @@ public class SpeedometerFilterPlugin
             pageOutput.close();
         }
 
-        private ImmutableMap<Column, TimestampFormatter> buildTimestampFormatterMap(final PluginTask task, Schema schema) {
-            final ImmutableMap.Builder<Column, TimestampFormatter> builder = new ImmutableMap.Builder<>();
-
-            schema.visitColumns(new ColumnVisitor() {
-                @Override
-                public void booleanColumn(Column column) { }
-
-                @Override
-                public void longColumn(Column column) { }
-
-                @Override
-                public void doubleColumn(Column column) { }
-
-                @Override
-                public void stringColumn(Column column) { }
-
-                @Override
-                public void timestampColumn(Column column) {
-                    if (column.getType() instanceof TimestampType) {
-                        TimestampType tt = (TimestampType) column.getType();
-                        builder.put(column, new TimestampFormatter(tt.getFormat(), task));
-                    } else {
-                        throw new RuntimeException("Timestamp should be TimestampType.");
-                    }
-                }
-            });
-
-            return builder.build();
-        }
-
-
         class ColumnVisitorImpl implements ColumnVisitor {
             private final PageBuilder pageBuilder;
             private long startRecordTime;
@@ -220,7 +197,7 @@ public class SpeedometerFilterPlugin
             }
 
             private void speedMonitorEndRecord() {
-                controller.checkSpeedLimit(startRecordTime, recordPaddingSize);
+                controller.checkSpeedLimit(startRecordTime, recordPaddingSize, true);
             }
 
             // For null column
@@ -254,7 +231,7 @@ public class SpeedometerFilterPlugin
 
             private Timestamp speedMonitor(Column column, Timestamp t) {
                 speedMonitorForDelimiter(column);
-                TimestampFormatter formatter = timestampMap.get(column);
+                TimestampFormatter formatter = timestampFormatters[column.getIndex()];
                 controller.checkSpeedLimit(startRecordTime, formatter.format(t).length());
                 return t;
             }

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

@@ -18,6 +18,7 @@ class SpeedometerSpeedAggregator {
     private final AtomicInteger activeControllerCount = new AtomicInteger(0);
     private final AtomicLong globalStartTime = new AtomicLong(INITAL_START_TIME);
     private final AtomicLong globalTotalBytes = new AtomicLong(0);
+    private final AtomicLong globalTotalRecords = new AtomicLong(0);
     private final AtomicLong previousLogReportTimeMillisec = new AtomicLong(INITAL_START_TIME);
 
     // TODO: We can use google's library.
@@ -28,7 +29,7 @@ class SpeedometerSpeedAggregator {
     }
 
     public SpeedometerSpeedAggregator() {
-        showLogMessage(activeControllerCount.get(), 0, 0, 0);
+        showLogMessage(activeControllerCount.get(), 0, 0, 0, 0, 0);
     }
 
     public void startController(SpeedometerSpeedController controller, long nowTime) {
@@ -45,6 +46,7 @@ class SpeedometerSpeedAggregator {
         }
         long runningCount = activeControllerCount.decrementAndGet();
         globalTotalBytes.addAndGet(controller.getTotalBytes());
+        globalTotalRecords.addAndGet(controller.getTotalRecords());
 
         // NOTE: Sometimes, there is no running thread nevertheless there are remaining tasks.
         // So, this message may be output while running tasks.
@@ -92,6 +94,10 @@ class SpeedometerSpeedAggregator {
         return globalTotalBytes.get();
     }
 
+    long getGlobalTotalRecords() {
+        return globalTotalRecords.get();
+    }
+
     List<SpeedometerSpeedController> getControllerList() {
         List<SpeedometerSpeedController> copyList;
         synchronized (controllerList) {
@@ -109,33 +115,40 @@ class SpeedometerSpeedAggregator {
     private void showProgressMessage(long nowTime) {
         long currentTotalSize = globalTotalBytes.get();
         long currentBytesPerSec = 0;
+        long currentTotalRecords = globalTotalRecords.get();
+        long currentRecordsPerSec = 0;
         for (SpeedometerSpeedController controller : getControllerList()) {
             currentTotalSize += controller.getTotalBytes();
+            currentTotalRecords += controller.getTotalRecords();
             currentBytesPerSec += controller.getPeriodBytesPerSec(nowTime);
+            currentRecordsPerSec += controller.getPeriodRecordsPerSec(nowTime);
         }
 
         long timeDelta = nowTime - globalStartTime.get();
         timeDelta = timeDelta > 0 ? timeDelta : 1;
 
-        showLogMessage(activeControllerCount.get(), currentTotalSize, timeDelta, currentBytesPerSec);
+        showLogMessage(activeControllerCount.get(), currentTotalSize, timeDelta, currentBytesPerSec, currentTotalRecords, currentRecordsPerSec);
     }
 
     private void showOverallMessage() {
         long timeDelta = System.currentTimeMillis() - globalStartTime.get();
         timeDelta = timeDelta > 0 ? timeDelta : 1;
         long bytesPerSec = (globalTotalBytes.get() * 1000) / timeDelta;
+        long recordsPerSec = (globalTotalRecords.get() * 1000) / timeDelta;
 
-        showLogMessage(activeControllerCount.get(), globalTotalBytes.get(), timeDelta, bytesPerSec);
+        showLogMessage(activeControllerCount.get(), globalTotalBytes.get(), timeDelta, bytesPerSec, globalTotalRecords.get(), recordsPerSec);
     }
 
-    private void showLogMessage(int activeThreads, long totalBytes, long timeMilliSec, long bytesPerSec) {
+    private void showLogMessage(int activeThreads, long totalBytes, long timeMilliSec, long bytesPerSec, long totalRecords, long recordsPerSec) {
         Logger logger = getLogger();
         if (logger != null) {
-            logger.info(String.format("{speedometer: {active: %d, total: %s, sec: %s, speed: %s/s}}",
+            logger.info(String.format("{speedometer: {active: %d, total: %s, sec: %s, speed: %s/s, records: %s, record-speed: %s/s}}",
                     activeThreads,
-                    SpeedometerUtil.toNumberText(totalBytes),
+                    SpeedometerUtil.toByteText(totalBytes),
                     SpeedometerUtil.toTimeText(timeMilliSec),
-                    SpeedometerUtil.toNumberText(bytesPerSec)));
+                    SpeedometerUtil.toByteText(bytesPerSec),
+                    SpeedometerUtil.toDecimalText(totalRecords),
+                    SpeedometerUtil.toDecimalText(recordsPerSec)));
         }
     }
 }

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

@@ -14,6 +14,8 @@ class SpeedometerSpeedController {
     private volatile long periodStartTime;
     private volatile long periodTotalBytes;
     private volatile long threadTotalBytes;
+    private volatile long periodTotalRecords;
+    private volatile long threadTotalRecords;
     private volatile boolean renewFlag = true;
 
     SpeedometerSpeedController(PluginTask task, SpeedometerSpeedAggregator aggregator) {
@@ -43,16 +45,24 @@ class SpeedometerSpeedController {
     public long getTotalBytes() {
         return threadTotalBytes + periodTotalBytes;
     }
+    
+    public long getTotalRecords() {
+        return threadTotalRecords + periodTotalRecords;
+    }
 
     public long getPeriodBytesPerSec(long nowTime) {
-        long timeDeltaMillisec = nowTime - periodStartTime;
-        if (timeDeltaMillisec <= 0) {
-            timeDeltaMillisec = 1;
-        }
-        return (periodTotalBytes * 1000) / timeDeltaMillisec;
+        return (periodTotalBytes * 1000) / getTimeDeltaMillisec(nowTime);
+    }
+
+    public long getPeriodRecordsPerSec(long nowTime) {
+        return (periodTotalRecords * 1000) / getTimeDeltaMillisec(nowTime);
     }
 
     public void checkSpeedLimit(long nowTime, long newDataSize) {
+        checkSpeedLimit(nowTime, newDataSize, false);
+    }
+
+    public void checkSpeedLimit(long nowTime, long newDataSize, boolean endRecord) {
         if (startTime == 0) {
             startTime = nowTime;
             aggregator.startController(this, startTime);
@@ -64,6 +74,9 @@ class SpeedometerSpeedController {
         }
 
         periodTotalBytes += newDataSize;
+        if (endRecord) {
+            periodTotalRecords++;
+        }
         aggregator.checkProgress(nowTime, logIntervalMillisec);
 
         if (limitBytesPerSec <= 0) {
@@ -101,7 +114,14 @@ class SpeedometerSpeedController {
     private void startNewPeriod(long newPeriodTime) {
         threadTotalBytes += periodTotalBytes;
         periodTotalBytes = 0;
+        threadTotalRecords += periodTotalRecords;
+        periodTotalRecords = 0;
         periodStartTime = newPeriodTime;
     }
+
+    private long getTimeDeltaMillisec(long nowTime) {
+        long timeDeltaMillisec = nowTime - periodStartTime;
+        return timeDeltaMillisec <= 0 ? 1 : timeDeltaMillisec;
+    }
 }
 

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

@@ -1,9 +1,11 @@
 package org.embulk.filter;
 
+import java.text.NumberFormat;
+
 public class SpeedometerUtil {
     private static final int MIN_LENGTH = String.valueOf(Long.MIN_VALUE).length();
 
-    public static String toNumberText(long originalNum) {
+    public static String toByteText(long originalNum) {
         long baseNum = 1000;
         long remain = 0;
         float num = originalNum;
@@ -24,6 +26,10 @@ public class SpeedometerUtil {
         return String.valueOf(originalNum);
     }
 
+    public static String toDecimalText(long originalNum) {
+        return NumberFormat.getNumberInstance().format(originalNum);
+    }
+
     public static String toTimeText(long timeMillisecs) {
         long num = timeMillisecs;
 

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

@@ -73,7 +73,7 @@ public class TestSpeedometerFilterPlugin
             builder.finish(); times = 0;
             reader.nextRecord(); times = 2;
             reader.setPage(page); times = 1;
-            schema.visitColumns(withInstanceOf(ColumnVisitor.class)); times = 2;
+            schema.visitColumns(withInstanceOf(ColumnVisitor.class)); times = 1;
         }};
     }
 

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

@@ -42,6 +42,7 @@ public class TestSpeedometerSpeedAggregator {
     public void testStopController() {
         new NonStrictExpectations() {{
             controller.getTotalBytes(); result = 11;
+            controller.getTotalRecords(); result = 5;
         }};
 
         SpeedometerSpeedAggregator aggregator = new SpeedometerSpeedAggregator();
@@ -51,6 +52,7 @@ public class TestSpeedometerSpeedAggregator {
         assertEquals("Verify active controller count.", 0, aggregator.getActiveControllerCount());
         assertFalse("Verify there is a registered controller.", aggregator.getControllerList().contains(controller));
         assertEquals("Verify controller's total bytes are added to aggregator.", 11, aggregator.getGlobalTotalBytes());
+        assertEquals("Verify controller's total records are added to aggregator.", 5, aggregator.getGlobalTotalRecords());
     }
 
     @Test
@@ -98,7 +100,9 @@ public class TestSpeedometerSpeedAggregator {
         new Verifications() {{
             controller.renewPeriod(); times = 1;
             controller.getTotalBytes(); times = 1;
+            controller.getTotalRecords(); times = 1;
             controller.getPeriodBytesPerSec(startPeriodTime); times = 1;
+            controller.getPeriodRecordsPerSec(startPeriodTime); times = 1;
         }};
     }
 
@@ -114,7 +118,9 @@ public class TestSpeedometerSpeedAggregator {
         new Verifications() {{
             controller.renewPeriod(); times = 0;
             controller.getTotalBytes(); times = 0;
+            controller.getTotalRecords(); times = 0;
             controller.getPeriodBytesPerSec(startPeriodTime); times = 0;
+            controller.getPeriodRecordsPerSec(startPeriodTime); times = 0;
         }};
     }
 }

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

@@ -111,4 +111,41 @@ public class TestSpeedometerSpeedController {
         assertTrue("Verify renewPeriod flag is set.", controller.isRenewPeriodSet());
     }
 
+    @Test
+    public void testGetTotalRecords() {
+        new NonStrictExpectations() {{
+            task.getSpeedLimit(); result = 1L;
+            task.getMaxSleepMillisec(); result = 2;
+            task.getLogIntervalSeconds(); result = 3;
+            aggregator.getSpeedLimitForController((SpeedometerSpeedController)any); result = 10000;
+        }};
+        long nowTime = System.currentTimeMillis();
+        int newDataSize = 3;
+
+        controller = new SpeedometerSpeedController(task, aggregator);
+        assertEquals("Verify total records is zero.", 0, controller.getTotalRecords());
+        controller.checkSpeedLimit(nowTime, newDataSize);
+        assertEquals("Verify total records is zero for no new record.", 0, controller.getTotalRecords());
+        controller.checkSpeedLimit(nowTime + 1, newDataSize, true);
+        assertEquals("Verify total records", 1, controller.getTotalRecords());
+    }
+
+    @Test
+    public void testGetPeriodRecordsPerSec() {
+        new NonStrictExpectations() {{
+            task.getSpeedLimit(); result = 1L;
+            task.getMaxSleepMillisec(); result = 2;
+            task.getLogIntervalSeconds(); result = 3;
+            aggregator.getSpeedLimitForController((SpeedometerSpeedController)any); result = 10000;
+        }};
+        long nowTime = System.currentTimeMillis();
+        int newDataSize = 3;
+
+        controller = new SpeedometerSpeedController(task, aggregator);
+        assertEquals("Verify total records/s", 0, controller.getPeriodRecordsPerSec(System.currentTimeMillis()));
+        controller.checkSpeedLimit(nowTime, newDataSize);
+        assertEquals("Verify total records/s is not changed", 0, controller.getPeriodRecordsPerSec(System.currentTimeMillis()));
+        controller.checkSpeedLimit(nowTime, newDataSize, true);
+        assertTrue("Verify total records/s is changed", controller.getPeriodRecordsPerSec(System.currentTimeMillis()) > 0);
+    }
 }

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

@@ -7,20 +7,37 @@ import org.junit.Test;
 public class TestSpeedometerUtil {
 
     @Test
-    public void testToNumberText() {
-        assertEquals("Verify 0 bytes",  "0.0b", SpeedometerUtil.toNumberText(0));
-        assertEquals("Verify 0 bytes",  "100b", SpeedometerUtil.toNumberText(100));
-        assertEquals("Verify 0 bytes", "1.0kb", SpeedometerUtil.toNumberText(1000L));
-        assertEquals("Verify 0 bytes", "100kb", SpeedometerUtil.toNumberText(1000L * 100));
-        assertEquals("Verify 0 bytes", "1.0mb", SpeedometerUtil.toNumberText(1000L * 1000));
-        assertEquals("Verify 0 bytes", "100mb", SpeedometerUtil.toNumberText(1000L * 1000 * 100));
-        assertEquals("Verify 0 bytes", "1.0gb", SpeedometerUtil.toNumberText(1000L * 1000 * 1000));
-        assertEquals("Verify 0 bytes", "100gb", SpeedometerUtil.toNumberText(1000L * 1000 * 1000 * 100));
-        assertEquals("Verify 0 bytes", "1.0tb", SpeedometerUtil.toNumberText(1000L * 1000 * 1000 * 1000));
-        assertEquals("Verify 0 bytes", "100tb", SpeedometerUtil.toNumberText(1000L * 1000 * 1000 * 1000 * 100));
-        assertEquals("Verify 0 bytes", "1.0pb", SpeedometerUtil.toNumberText(1000L * 1000 * 1000 * 1000 * 1000));
-        assertEquals("Verify 0 bytes", "100pb", SpeedometerUtil.toNumberText(1000L * 1000 * 1000 * 1000 * 1000 * 100));
-        assertEquals("Verify 0 bytes", "1.0eb", SpeedometerUtil.toNumberText(1000L * 1000 * 1000 * 1000 * 1000 * 1000));
+    public void testToByteText() {
+        assertEquals("Verify 0 bytes",  "0.0b", SpeedometerUtil.toByteText(0));
+        assertEquals("Verify 0 bytes",  "100b", SpeedometerUtil.toByteText(100));
+        assertEquals("Verify 0 bytes", "1.0kb", SpeedometerUtil.toByteText(1000L));
+        assertEquals("Verify 0 bytes", "100kb", SpeedometerUtil.toByteText(1000L * 100));
+        assertEquals("Verify 0 bytes", "1.0mb", SpeedometerUtil.toByteText(1000L * 1000));
+        assertEquals("Verify 0 bytes", "100mb", SpeedometerUtil.toByteText(1000L * 1000 * 100));
+        assertEquals("Verify 0 bytes", "1.0gb", SpeedometerUtil.toByteText(1000L * 1000 * 1000));
+        assertEquals("Verify 0 bytes", "100gb", SpeedometerUtil.toByteText(1000L * 1000 * 1000 * 100));
+        assertEquals("Verify 0 bytes", "1.0tb", SpeedometerUtil.toByteText(1000L * 1000 * 1000 * 1000));
+        assertEquals("Verify 0 bytes", "100tb", SpeedometerUtil.toByteText(1000L * 1000 * 1000 * 1000 * 100));
+        assertEquals("Verify 0 bytes", "1.0pb", SpeedometerUtil.toByteText(1000L * 1000 * 1000 * 1000 * 1000));
+        assertEquals("Verify 0 bytes", "100pb", SpeedometerUtil.toByteText(1000L * 1000 * 1000 * 1000 * 1000 * 100));
+        assertEquals("Verify 0 bytes", "1.0eb", SpeedometerUtil.toByteText(1000L * 1000 * 1000 * 1000 * 1000 * 1000));
+    }
+
+    @Test
+    public void testToDecimalText() {
+        assertEquals("Verify 0 bytes", "0", SpeedometerUtil.toDecimalText(0));
+        assertEquals("Verify 0 bytes", "100", SpeedometerUtil.toDecimalText(100));
+        assertEquals("Verify 0 bytes", "1,000", SpeedometerUtil.toDecimalText(1000L));
+        assertEquals("Verify 0 bytes", "100,000", SpeedometerUtil.toDecimalText(1000L * 100));
+        assertEquals("Verify 0 bytes", "1,000,000", SpeedometerUtil.toDecimalText(1000L * 1000));
+        assertEquals("Verify 0 bytes", "100,000,000", SpeedometerUtil.toDecimalText(1000L * 1000 * 100));
+        assertEquals("Verify 0 bytes", "1,000,000,000", SpeedometerUtil.toDecimalText(1000L * 1000 * 1000));
+        assertEquals("Verify 0 bytes", "100,000,000,000", SpeedometerUtil.toDecimalText(1000L * 1000 * 1000 * 100));
+        assertEquals("Verify 0 bytes", "1,000,000,000,000", SpeedometerUtil.toDecimalText(1000L * 1000 * 1000 * 1000));
+        assertEquals("Verify 0 bytes", "100,000,000,000,000", SpeedometerUtil.toDecimalText(1000L * 1000 * 1000 * 1000 * 100));
+        assertEquals("Verify 0 bytes", "1,000,000,000,000,000", SpeedometerUtil.toDecimalText(1000L * 1000 * 1000 * 1000 * 1000));
+        assertEquals("Verify 0 bytes", "100,000,000,000,000,000", SpeedometerUtil.toDecimalText(1000L * 1000 * 1000 * 1000 * 1000 * 100));
+        assertEquals("Verify 0 bytes", "1,000,000,000,000,000,000", SpeedometerUtil.toDecimalText(1000L * 1000 * 1000 * 1000 * 1000 * 1000));
     }
 
     @Test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-speedometer
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - hata
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -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.3.jar
+- classpath/embulk-filter-speedometer-0.3.0.jar
 homepage: https://github.com/hata/embulk-filter-speedometer
 licenses:
 - MIT