Mirrors/sshj
1
0
Fork 0
mirror of https://github.com/hierynomus/sshj.git synced 2025-12-06 23:30:55 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Implement concurent write requests."

Browse Source 
This reverts commit 9acff6202c.
This commit is contained in:
Shikhar Bhushan
2013-02-23 16:00:53 -05:00
parent 3f195649fa
commit 77924fd0be
3 changed files with 3 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/net/schmizz/sshj/sftp/RemoteFile.java
View File

@@ -15,24 +15,15 @@
*/ */
package net.schmizz.sshj.sftp; package net.schmizz.sshj.sftp;
import net.schmizz.concurrent.Promise;
import net.schmizz.sshj.sftp.Response.StatusCode; import net.schmizz.sshj.sftp.Response.StatusCode;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.Queue;
import java.util.concurrent.LinkedBlockingQueue;
public class RemoteFile public class RemoteFile
extends RemoteResource { extends RemoteResource {
public static final int DEFAULT_CONCURRENT_REQUESTS = 10;
protected volatile int concurrentRequests = DEFAULT_CONCURRENT_REQUESTS;
private Queue<Promise<Response, SFTPException>> writeRequestsQueue = new LinkedBlockingQueue<Promise<Response, SFTPException>>();
public RemoteFile(Requester requester, String path, String handle) { public RemoteFile(Requester requester, String path, String handle) {
super(requester, path, handle); super(requester, path, handle);
} }
@@ -82,14 +73,11 @@ public class RemoteFile
public void write(long fileOffset, byte[] data, int off, int len) public void write(long fileOffset, byte[] data, int off, int len)
throws IOException { throws IOException {
Request request = newRequest(PacketType.WRITE) requester.doRequest(newRequest(PacketType.WRITE)
.putUInt64(fileOffset) .putUInt64(fileOffset)
.putUInt32(len - off) .putUInt32(len - off)
.putRawBytes(data, off, len); .putRawBytes(data, off, len)
writeRequestsQueue.add(requester.request(request)); ).ensureStatusPacketIsOK();
while (writeRequestsQueue.size() >= getConcurrentRequests()) {
requester.retrieve(writeRequestsQueue.remove());
}
} }
public void setAttributes(FileAttributes attrs) public void setAttributes(FileAttributes attrs)
@@ -198,23 +186,4 @@ public class RemoteFile
} }
} }
@Override
public void close() throws IOException {
try {
while(!writeRequestsQueue.isEmpty()) {
requester.retrieve(writeRequestsQueue.remove());
}
} finally {
super.close();
}
}
public void setConcurrentRequests(int concurrentRequests) {
this.concurrentRequests = concurrentRequests;
}
public int getConcurrentRequests() {
return concurrentRequests;
}
} }

8
src/main/java/net/schmizz/sshj/sftp/Requester.java
View File

@@ -15,8 +15,6 @@
*/ */
package net.schmizz.sshj.sftp; package net.schmizz.sshj.sftp;
import net.schmizz.concurrent.Promise;
import java.io.IOException; import java.io.IOException;
public interface Requester { public interface Requester {
@@ -28,10 +26,4 @@ public interface Requester {
Response doRequest(Request req) Response doRequest(Request req)
throws IOException; throws IOException;
Promise<Response, SFTPException> request(Request request)
throws IOException;
void retrieve(Promise<Response, SFTPException> response)
throws IOException;
} }

14
src/main/java/net/schmizz/sshj/sftp/SFTPEngine.java
View File

@@ -15,7 +15,6 @@
*/ */
package net.schmizz.sshj.sftp; package net.schmizz.sshj.sftp;
import net.schmizz.concurrent.Promise;
import net.schmizz.sshj.common.SSHException; import net.schmizz.sshj.common.SSHException;
import net.schmizz.sshj.connection.channel.direct.Session.Subsystem; import net.schmizz.sshj.connection.channel.direct.Session.Subsystem;
import net.schmizz.sshj.connection.channel.direct.SessionFactory; import net.schmizz.sshj.connection.channel.direct.SessionFactory;
@@ -269,17 +268,4 @@ public class SFTPEngine
out.flush(); out.flush();
} }
@Override
public Promise<Response, SFTPException> request(Request req) throws IOException {
reader.expectResponseTo(req);
log.debug("Sending {}", req);
transmit(req);
return req.getResponsePromise();
}
@Override
public void retrieve(Promise<Response, SFTPException> request)
throws IOException {
request.retrieve(timeout, TimeUnit.SECONDS).ensureStatusPacketIsOK();
}
} }