Skip to content

ARROW-6461: [Java] Prevent EchoServer from closing the client socket after writing #5288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
BryanCutler wants to merge 1 commit into from
Closed

ARROW-6461: [Java] Prevent EchoServer from closing the client socket after writing #5288

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions java/tools/src/main/java/org/apache/arrow/tools/EchoServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,17 @@ public int port() {
*/
public void run() throws IOException {
try {
Socket clientSocket = null;
ClientConnection client = null;
while (!closed) {
LOGGER.debug("Waiting to accept new client connection.");
Socket clientSocket = serverSocket.accept();
clientSocket = serverSocket.accept();
LOGGER.debug("Accepted new client connection.");
try (ClientConnection client = new ClientConnection(clientSocket)) {
try {
client.run();
} catch (IOException e) {
LOGGER.warn("Error handling client connection.", e);
}
client = new ClientConnection(clientSocket);
try {
client.run();
} catch (IOException e) {
LOGGER.warn("Error handling client connection.", e);
}
LOGGER.debug("Closed connection with client");
}
Expand Down Expand Up @@ -112,29 +113,28 @@ public ClientConnection(Socket socket) {
*/
public void run() throws IOException {
// Read the entire input stream and write it back
try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
ArrowStreamReader reader = new ArrowStreamReader(socket.getInputStream(), allocator)) {
try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE)) {
ArrowStreamReader reader = new ArrowStreamReader(socket.getInputStream(), allocator);
VectorSchemaRoot root = reader.getVectorSchemaRoot();
// load the first batch before instantiating the writer so that we have any dictionaries
reader.loadNextBatch();
try (ArrowStreamWriter writer = new ArrowStreamWriter(root, reader, socket
.getOutputStream())) {
writer.start();
int echoed = 0;
while (true) {
int rowCount = reader.getVectorSchemaRoot().getRowCount();
if (rowCount == 0) {
break;
} else {
writer.writeBatch();
echoed += rowCount;
reader.loadNextBatch();
}
ArrowStreamWriter writer = new ArrowStreamWriter(root, reader, socket.getOutputStream());
writer.start();
int echoed = 0;
while (true) {
int rowCount = reader.getVectorSchemaRoot().getRowCount();
if (rowCount == 0) {
break;
} else {
writer.writeBatch();
echoed += rowCount;
reader.loadNextBatch();
}
writer.end();
Preconditions.checkState(reader.bytesRead() == writer.bytesWritten());
LOGGER.debug(String.format("Echoed %d records", echoed));
}
writer.end();
Preconditions.checkState(reader.bytesRead() == writer.bytesWritten());
LOGGER.debug(String.format("Echoed %d records", echoed));
reader.close(false);
}
}

Expand Down