Use BufferedInputStream as it buffers and supports make/reset.

2 files changed, 7 insertions, 4 deletions

diff --git a/vespa_feed_perf/src/main/java/com/yahoo/vespa/feed/perf/FeederParams.java b/vespa_feed_perf/src/main/java/com/yahoo/vespa/feed/perf/FeederParams.java
index 1fcd5d72a00..9a5fbc50e2a 100644
--- a/vespa_feed_perf/src/main/java/com/yahoo/vespa/feed/perf/FeederParams.java
+++ b/vespa_feed_perf/src/main/java/com/yahoo/vespa/feed/perf/FeederParams.java
@@ -7,6 +7,7 @@ import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -22,7 +23,8 @@ import java.util.List;
  */
 class FeederParams {
 
-    enum DumpFormat {JSON, VESPA};
+    private static final int BUFFER_SIZE = 0x100000;
+    enum DumpFormat {JSON, VESPA}
     private PrintStream stdErr = System.err;
     private PrintStream stdOut = System.out;
     private Route route = Route.parse("default");
@@ -134,7 +136,7 @@ class FeederParams {
         if ( !cmd.getArgList().isEmpty()) {
             inputStreams.clear();
             for (String fileName : cmd.getArgList()) {
-                inputStreams.add(new FileInputStream(new File(fileName)));
+                inputStreams.add(new BufferedInputStream(new FileInputStream(new File(fileName)), BUFFER_SIZE));
             }
         }
 
diff --git a/vespa_feed_perf/src/test/java/com/yahoo/vespa/feed/perf/FeederParamsTest.java b/vespa_feed_perf/src/test/java/com/yahoo/vespa/feed/perf/FeederParamsTest.java
index 5cc5d0bc018..a1f84b02317 100644
--- a/vespa_feed_perf/src/test/java/com/yahoo/vespa/feed/perf/FeederParamsTest.java
+++ b/vespa_feed_perf/src/test/java/com/yahoo/vespa/feed/perf/FeederParamsTest.java
@@ -5,6 +5,7 @@ import com.yahoo.messagebus.routing.Route;
 import org.apache.commons.cli.ParseException;
 import org.junit.Test;
 
+import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -119,8 +120,8 @@ public class FeederParamsTest {
         p.parseArgs("-n", "3", TESTFILE_JSON, TESTFILE_VESPA);
         assertEquals(3, p.getNumDispatchThreads());
         assertEquals(2, p.getInputStreams().size());
-        assertTrue(p.getInputStreams().get(0) instanceof FileInputStream);
-        assertTrue(p.getInputStreams().get(1) instanceof FileInputStream);
+        assertTrue(p.getInputStreams().get(0) instanceof BufferedInputStream);
+        assertTrue(p.getInputStreams().get(1) instanceof BufferedInputStream);
         json.delete();
         vespa.delete();
     }