Changeset 2520

Timestamp:

Jun 25, 2014, 8:45:56 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #611: Create package for supporting external files via SFTP

Wrap remote stream in a BufferedInputStream for increased performance. Without the buffer a typical download speed was 0.5MB/s. With the buffer it went up to 10MB/s.

Location:

extensions/net.sf.basedb.xfiles/trunk/src/net/sf/basedb/xfiles

Files:

• XFiles.java (modified) (1 diff)
• sftp/SftpConnectionManager.java (modified) (2 diffs)

extensions/net.sf.basedb.xfiles/trunk/src/net/sf/basedb/xfiles/XFiles.java

@@ -39 +39 @@
   */
   public static final int DEFAULT_SSH_PORT = 22;
-  
+
+  /**
+    Default size of internal buffer when downloading files is 1MB.
+  */
+  public static final int DEFAULT_BUFFER_SIZE = 1024*1024;
 }

extensions/net.sf.basedb.xfiles/trunk/src/net/sf/basedb/xfiles/sftp/SftpConnectionManager.java

@@ -22 +22 @@
 package net.sf.basedb.xfiles.sftp;
 
+import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -87 +88 @@
       sftp = ssh.newSFTPClient();
       remote = sftp.open(uri.getPath(), EnumSet.of(OpenMode.READ));
-      stream = new CloseResourceInputStream(remote.new RemoteFileInputStream(), new MultiCloseable(remote, sftp, ssh));
+      stream = new CloseResourceInputStream(
+        new BufferedInputStream(remote.new RemoteFileInputStream(), XFiles.DEFAULT_BUFFER_SIZE), 
+        new MultiCloseable(remote, sftp, ssh));
     }
     finally