embulk-input-s3 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c12721e3646d935cb83dd17b9200134cab108b1e
-  data.tar.gz: 0237d9c3e8e7952f52143893a101e3a3e08cc80e
+  metadata.gz: f03ab171561f7cca3ff6fe8e17c63b73f31e2db3
+  data.tar.gz: a636f66a873c449741f09c51a7b415f550517d26
 SHA512:
-  metadata.gz: edb9e5d400d0de2c741e7aecd4654695976a856ecaedf87592b4cd65b25c5682b3b677bfd40aebc1e5e0f771e61d6f863768120edc971a9e1f2255ad2f947c3f
-  data.tar.gz: 223d01c003770e0c78ba646f7cd9d5c24d3ba26ffd1ba710ff62b88efbdffaa892c43857b2d95c0d1b3400d2f68e77678e75c8738bdd2c40b2880ff1bdd9a29d
+  metadata.gz: 24baf759d3956a23317ed73f5878d9ec8d66bc493ba344131a16b325fb3558dd5fbab332dacfcac2f7abc89ecd3518cec89f4c232c7d17135159fa95fb444fac
+  data.tar.gz: c83e6f98d5d03e45f83641d879a80c41be41d292d999a1b90ab783ab02f296faa77a3a2276b447804e78dd2908a8b1f7cc026105688eff34fea0fdbbde92130b

data/src/main/java/org/embulk/input/s3/AbstractS3FileInputPlugin.java

@@ -6,6 +6,8 @@ import java.util.Collections;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.io.InputStream;
+
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
@@ -212,7 +214,8 @@ public abstract class AbstractS3FileInputPlugin
         return new S3FileInput(task, taskIndex);
     }
 
-    private static class S3InputStreamReopener
+    @VisibleForTesting
+    static class S3InputStreamReopener
             implements ResumableInputStream.Reopener
     {
         private final Logger log = Exec.getLogger(S3InputStreamReopener.class);

data/src/test/java/org/embulk/input/s3/TestS3FileInputPlugin.java

@@ -1,42 +1,221 @@
 package org.embulk.input.s3;
 
-import static org.junit.Assert.*;
-import java.util.List;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableList;
 import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.model.GetObjectRequest;
 import com.amazonaws.services.s3.model.ListObjectsRequest;
 import com.amazonaws.services.s3.model.ObjectListing;
+import com.amazonaws.services.s3.model.ObjectMetadata;
+import com.amazonaws.services.s3.model.S3Object;
+import com.amazonaws.services.s3.model.S3ObjectInputStream;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableList;
+import org.embulk.EmbulkTestRuntime;
+import org.embulk.config.ConfigDiff;
+import org.embulk.config.ConfigSource;
+import org.embulk.config.TaskReport;
+import org.embulk.config.TaskSource;
+import org.embulk.input.s3.AbstractS3FileInputPlugin.PluginTask;
+import org.embulk.input.s3.AbstractS3FileInputPlugin.S3FileInput;
+import org.embulk.input.s3.S3FileInputPlugin.S3PluginTask;
+import org.embulk.spi.Exec;
+import org.embulk.spi.FileInputPlugin;
+import org.embulk.spi.util.LineDecoder;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 
 public class TestS3FileInputPlugin
 {
+    @Rule
+    public EmbulkTestRuntime runtime = new EmbulkTestRuntime();
+
+    private ConfigSource config;
+    private S3FileInputPlugin plugin;
+    private AmazonS3Client client;
+
+    @Before
+    public void createResources()
+    {
+        config = config();
+        plugin = spy(runtime.getInstance(S3FileInputPlugin.class));
+        client = mock(AmazonS3Client.class);
+    }
+
+    @Test
+    public void checkS3ClientCreatedSuccessfully()
+    {
+        PluginTask task = config().loadConfig(plugin.getTaskClass());
+        plugin.newS3Client(task);
+    }
+
     @Test
     public void listS3FilesByPrefix()
     {
         // AWSS3Client returns list1 for the first iteration and list2 next.
-        List<S3ObjectSummary> list1 = ImmutableList.<S3ObjectSummary> of(bucket("in/", 0), bucket("in/file/", 0),
-                bucket("in/file/sample.csv.gz", 12345));
-        List<S3ObjectSummary> list2 = ImmutableList.<S3ObjectSummary> of(bucket("sample2.csv.gz", 0));
-        ObjectListing ol = Mockito.mock(ObjectListing.class);
+        List<S3ObjectSummary> list1 = s3objects("in/", 0L, "in/file/", 0L, "in/file/sample.csv.gz", 12345L);
+        List<S3ObjectSummary> list2 = s3objects("sample2.csv.gz", 0L);
+        ObjectListing ol = mock(ObjectListing.class);
 
-        Mockito.doReturn(list1).doReturn(list2).when(ol).getObjectSummaries();
-        AmazonS3Client client = Mockito.mock(AmazonS3Client.class);
-        Mockito.doReturn(ol).when(client).listObjects(Mockito.any(ListObjectsRequest.class));
-        Mockito.doReturn("in/file/").doReturn(null).when(ol).getNextMarker();
+        doReturn(list1).doReturn(list2).when(ol).getObjectSummaries();
+        doReturn(ol).when(client).listObjects(any(ListObjectsRequest.class));
+        doReturn("in/file/").doReturn(null).when(ol).getNextMarker();
 
         // It counts only size != 0 files.
         assertEquals(1, S3FileInputPlugin.listS3FilesByPrefix(client, "bucketName", "prefix", Optional.<String>absent()).size());
     }
 
-    private S3ObjectSummary bucket(String key, long size)
+    @Test
+    public void checkLastPath()
+    {
+        doReturn(null).when(client).listObjects(any(ListObjectsRequest.class));
+        doReturn(client).when(plugin).newS3Client(any(PluginTask.class));
+
+        { // set a last file to last_path
+            ObjectListing listing = listing("in/aa", 0L, "in/aa/a", 3L, "in/aa/b", 2L, "in/aa/c", 1L);
+            doReturn(listing).when(client).listObjects(any(ListObjectsRequest.class));
+
+            ConfigDiff configDiff = plugin.transaction(config, new FileInputPlugin.Control() {
+                @Override
+                public List<TaskReport> run(TaskSource taskSource, int taskCount)
+                {
+                    assertEquals(3, taskCount);
+                    List<String> files = taskSource.loadTask(S3PluginTask.class).getFiles();
+                    assertArrayEquals(new String[]{"in/aa/a", "in/aa/b", "in/aa/c"}, files.toArray(new String[files.size()]));
+                    return emptyTaskReports(taskCount);
+                }
+            });
+
+            assertEquals("in/aa/c", configDiff.get(String.class, "last_path"));
+        }
+
+        { // if files are empty and last_path is not specified, last_path is not set.
+            ObjectListing listing = listing("in/aa", 0L);
+            doReturn(listing).when(client).listObjects(any(ListObjectsRequest.class));
+
+            ConfigDiff configDiff = plugin.transaction(config, new FileInputPlugin.Control() {
+                @Override
+                public List<TaskReport> run(TaskSource taskSource, int taskCount)
+                {
+                    assertEquals(0, taskCount);
+                    assertTrue(taskSource.loadTask(S3PluginTask.class).getFiles().isEmpty());
+                    return emptyTaskReports(taskCount);
+                }
+            });
+
+            assertFalse(configDiff.has("last_path"));
+        }
+
+        { // if files are empty, keep the previous last_path.
+            config.set("last_path", "in/bb");
+
+            ObjectListing listing = listing("in/aa", 0L);
+            doReturn(listing).when(client).listObjects(any(ListObjectsRequest.class));
+
+            ConfigDiff configDiff = plugin.transaction(config, new FileInputPlugin.Control() {
+                @Override
+                public List<TaskReport> run(TaskSource taskSource, int taskCount) {
+                    assertEquals(0, taskCount);
+                    assertTrue(taskSource.loadTask(S3PluginTask.class).getFiles().isEmpty());
+                    return emptyTaskReports(taskCount);
+                }
+            });
+
+            assertEquals("in/bb", configDiff.get(String.class, "last_path"));
+        }
+    }
+
+    @Test
+    public void checkS3FileInputByOpen()
+            throws Exception
+    {
+        doReturn(s3object("in/aa/a", "aa")).when(client).getObject(any(GetObjectRequest.class));
+        doReturn(client).when(plugin).newS3Client(any(PluginTask.class));
+
+        PluginTask task = config.loadConfig(plugin.getTaskClass());
+        task.setFiles(Arrays.asList(new String[]{"in/aa/a"}));
+
+        StringBuilder sbuf = new StringBuilder();
+        try (S3FileInput input = (S3FileInput) plugin.open(task.dump(), 0)) {
+            LineDecoder d = new LineDecoder(input, config.loadConfig(LineDecoder.DecoderTask.class));
+            while (d.nextFile()) {
+                sbuf.append(d.poll());
+            }
+        }
+        assertEquals("aa", sbuf.toString());
+    }
+
+    public static ConfigSource config()
+    {
+        return Exec.newConfigSource()
+                .set("bucket", "my_bucket")
+                .set("path_prefix", "my_path_prefix")
+                .set("access_key_id", "my_access_key_id")
+                .set("secret_access_key", "my_secret_access_key");
+    }
+
+    static ObjectListing listing(Object... keySizes)
+    {
+        ObjectListing listing = mock(ObjectListing.class);
+        if (keySizes == null) {
+            return listing;
+        }
+
+        List<S3ObjectSummary> s3objects = s3objects(keySizes);
+        doReturn(s3objects).when(listing).getObjectSummaries();
+        doReturn(null).when(listing).getNextMarker();
+        return listing;
+    }
+
+    static List<S3ObjectSummary> s3objects(Object... keySizes)
+    {
+        ImmutableList.Builder<S3ObjectSummary> builder = new ImmutableList.Builder<>();
+        if (keySizes == null) {
+            return builder.build();
+        }
+
+        for (int i = 0; i < keySizes.length; i += 2) {
+            String key = (String) keySizes[i];
+            long size = (Long) keySizes[i + 1];
+            builder.add(s3object(key, size));
+        }
+        return builder.build();
+    }
+
+    static S3ObjectSummary s3object(String key, long size)
+    {
+        S3ObjectSummary o = new S3ObjectSummary();
+        o.setKey(key);
+        o.setSize(size);
+        return o;
+    }
+
+    static S3Object s3object(String key, String value)
+    {
+        S3Object o = new S3Object();
+        o.setObjectContent(new S3ObjectInputStream(new ByteArrayInputStream(value.getBytes()), null));
+        ObjectMetadata om = new ObjectMetadata();
+        om.setContentLength(value.length());
+        o.setObjectMetadata(om);
+        return o;
+    }
+
+    static List<TaskReport> emptyTaskReports(int taskCount)
     {
-        S3ObjectSummary bucket = new S3ObjectSummary();
-        bucket.setKey(key);
-        bucket.setSize(size);
-        return bucket;
+        ImmutableList.Builder<TaskReport> reports = new ImmutableList.Builder<>();
+        for (int i = 0; i < taskCount; i++) {
+            reports.add(Exec.newTaskReport());
+        }
+        return reports.build();
     }
 }

data/src/test/java/org/embulk/input/s3/TestS3InputStreamReopener.java

@@ -0,0 +1,63 @@
+package org.embulk.input.s3;
+
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.model.GetObjectRequest;
+import org.embulk.EmbulkTestRuntime;
+import org.embulk.input.s3.AbstractS3FileInputPlugin.S3InputStreamReopener;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import static org.junit.Assert.assertEquals;
+import static org.embulk.input.s3.TestS3FileInputPlugin.s3object;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+
+public class TestS3InputStreamReopener
+{
+    @Rule
+    public EmbulkTestRuntime runtime = new EmbulkTestRuntime();
+
+    private AmazonS3Client client;
+
+    @Before
+    public void createResources()
+    {
+        client = mock(AmazonS3Client.class);
+    }
+
+    @Test
+    public void reopenS3FileByReopener()
+            throws Exception
+    {
+        String content = "value";
+
+        { // not retry
+            doReturn(s3object("in/aa/a", content)).when(client).getObject(any(GetObjectRequest.class));
+
+            S3InputStreamReopener opener = new S3InputStreamReopener(client, new GetObjectRequest("my_bucket", "in/aa/a"), content.length());
+
+            try (InputStream in = opener.reopen(0, new RuntimeException())) {
+                BufferedReader r = new BufferedReader(new InputStreamReader(in));
+                assertEquals("value", r.readLine());
+            }
+        }
+
+        { // retry once
+            doThrow(new RuntimeException()).doReturn(s3object("in/aa/a", content)).when(client).getObject(any(GetObjectRequest.class));
+
+            S3InputStreamReopener opener = new S3InputStreamReopener(client, new GetObjectRequest("my_bucket", "in/aa/a"), content.length());
+
+            try (InputStream in = opener.reopen(0, new RuntimeException())) {
+                BufferedReader r = new BufferedReader(new InputStreamReader(in));
+                assertEquals("value", r.readLine());
+            }
+        }
+    }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-s3
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -50,14 +50,15 @@ files:
 - src/main/java/org/embulk/input/s3/AbstractS3FileInputPlugin.java
 - src/main/java/org/embulk/input/s3/S3FileInputPlugin.java
 - src/test/java/org/embulk/input/s3/TestS3FileInputPlugin.java
+- src/test/java/org/embulk/input/s3/TestS3InputStreamReopener.java
 - classpath/aws-java-sdk-core-1.9.22.jar
 - classpath/aws-java-sdk-kms-1.9.22.jar
 - classpath/aws-java-sdk-s3-1.9.22.jar
 - classpath/commons-codec-1.6.jar
-- classpath/commons-logging-1.1.3.jar
-- classpath/embulk-input-s3-0.2.2.jar
+- classpath/embulk-input-s3-0.2.3.jar
 - classpath/httpclient-4.3.4.jar
 - classpath/httpcore-4.3.2.jar
+- classpath/jcl-over-slf4j-1.7.12.jar
 - classpath/joda-time-2.8.2.jar
 homepage: https://github.com/embulk/embulk-input-s3
 licenses: