embulk-parser-msgpack 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02d42733c20beaa314ee728fca703acd275da949
-  data.tar.gz: 50f8a86fd2c6b0c9ca3d32bdab8c41af09b01f77
+  metadata.gz: 7852f340a79e6fa5ee4e84b60f0e70f2a1e634d0
+  data.tar.gz: ab593bc630bee5d34bb52c492dda9df450ea58c7
 SHA512:
-  metadata.gz: 89e4fb93b4e76029c963a0698dd3c5d3c251f5a9dc0f3b20310e2547ed1579b896514d68636919efe6cfa74ecb8532ee3b1f6bfbc4b97089d2742ca3ace7d6f8
-  data.tar.gz: 25935710a08fdeed77bc37fb2f6a4b1ddf30fc4884d897d48bef7f0114aec72df2d1459629956456078e193e19129903c7ae49188cb849c2002d71a8fbf3de21
+  metadata.gz: 210f1798c5be558170b1c56de7cff0b6ed7d33a3c0c6cddbff89ca8bcdc5486fff1702bcaa9a2a8868df779b896987181b4f1d837c7b7601617a5c7f1fb9386d
+  data.tar.gz: fa32cf2e37796712e68a57ad113dda7a154675c2714883c666d8d02360b8aa298f21e017739c0690244a15a5cbb55b92016dfb8260787ec1ff39f8eadd68147c

data/ChangeLog

@@ -1,7 +1,10 @@
-Release 0.1.2 - 2016-01-05
+Release 0.1.3 - 2016-01-05
 
-* Fixed memory leak of input buffers
 * Upgraded msgpack version to v0.8 which supports external buffer pools
+* Fixed memory leak of input buffers
+* Upgraded embulk version to v0.7.10
+
+Release 0.1.2 - 2016-01-05
 
 Release 0.1.1 - 2015-08-18
 

data/build.gradle

@@ -13,12 +13,12 @@ configurations {
     provided
 }
 
-version = "0.1.2"
+version = "0.1.3"
 
 dependencies {
-    compile  "org.embulk:embulk-core:0.6.22"
-    provided "org.embulk:embulk-core:0.6.22"
-    compile "org.msgpack:msgpack-core:0.7.0-M6"
+    compile  "org.embulk:embulk-core:0.7.10"
+    provided "org.embulk:embulk-core:0.7.10"
+    compile "org.msgpack:msgpack-core:0.8.0"
     testCompile "junit:junit:4.+"
 }
 

data/src/main/java/org/embulk/parser/msgpack/MsgpackParserPlugin.java

@@ -10,8 +10,10 @@ import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import org.msgpack.core.MessagePack;
 import org.msgpack.core.MessageFormat;
 import org.msgpack.core.MessageUnpacker;
+import org.msgpack.core.MessageInsufficientBufferException;
 import org.msgpack.core.buffer.MessageBuffer;
 import org.msgpack.core.buffer.MessageBufferInput;
 import org.msgpack.value.ValueType;
@@ -153,6 +155,7 @@ public class MsgpackParserPlugin
             implements MessageBufferInput
     {
         private final FileInput input;
+        private Buffer lastBuffer = null;
 
         public FileInputMessageBufferInput(FileInput input)
         {
@@ -163,28 +166,28 @@ public class MsgpackParserPlugin
         public MessageBuffer next()
         {
             Buffer b = input.poll();
+            if (lastBuffer != null) {
+                lastBuffer.release();
+            }
+            lastBuffer = b;
             if (b == null) {
-                throw new EndOfBufferException();
+                return null;
+            }
+            else {
+                return MessageBuffer.wrap(b.array()).slice(b.offset(), b.limit());
             }
-            return MessageBuffer.wrap(b.array()).slice(b.offset(), b.limit());
         }
 
         @Override
         public void close()
         {
+            if (lastBuffer != null) {
+                lastBuffer.release();
+            }
             input.close();
         }
     }
 
-    private static class EndOfBufferException
-            extends RuntimeException
-    {
-        public EndOfBufferException()
-        {
-            super("End of buffer");
-        }
-    }
-
     @Override
     public void transaction(ConfigSource config, ParserPlugin.Control control)
     {
@@ -202,7 +205,7 @@ public class MsgpackParserPlugin
         RowEncoding rowEncoding = task.getRowEncoding();
         FileEncoding fileEncoding = task.getFileEncoding();
 
-        try (MessageUnpacker unpacker = new MessageUnpacker(new FileInputMessageBufferInput(input));
+        try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new FileInputMessageBufferInput(input));
                 PageBuilder pageBuilder = new PageBuilder(task.getBufferAllocator(), schema, output)) {
 
             TimestampParser[] timestampParsers = Timestamps.newTimestampColumnParsers(task, task.getSchemaConfig());
@@ -365,7 +368,7 @@ public class MsgpackParserPlugin
             int n;
             try {
                 n = unpacker.unpackArrayHeader();
-            } catch (EndOfBufferException ex) {
+            } catch (MessageInsufficientBufferException ex) {
                 // TODO EOFException?
                 return false;
             }
@@ -398,7 +401,7 @@ public class MsgpackParserPlugin
             int n;
             try {
                 n = unpacker.unpackMapHeader();
-            } catch (EndOfBufferException ex) {
+            } catch (MessageInsufficientBufferException ex) {
                 // TODO EOFException?
                 return false;
             }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-parser-msgpack
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -58,8 +58,8 @@ files:
 - lib/embulk/parser/msgpack.rb
 - src/main/java/org/embulk/parser/msgpack/MsgpackParserPlugin.java
 - src/test/java/org/embulk/parser/TestMsgpackParserPlugin.java
-- classpath/embulk-parser-msgpack-0.1.2.jar
-- classpath/msgpack-core-0.7.0-M6.jar
+- classpath/embulk-parser-msgpack-0.1.3.jar
+- classpath/msgpack-core-0.8.0.jar
 homepage: https://github.com/frsyuki/embulk-parser-msgpack
 licenses:
 - Apache 2.0