Skip to content

Fix buffer leak in LimitBatchScanner #3003

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

Open
fresh-borzoni wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −4
Open

Fix buffer leak in LimitBatchScanner #3003

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
20 changes: 16 additions & 4 deletions ...s-client/src/main/java/org/apache/fluss/client/table/scanner/batch/LimitBatchScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.apache.fluss.rpc.gateway.TabletServerGateway;
import org.apache.fluss.rpc.messages.LimitScanRequest;
import org.apache.fluss.rpc.messages.LimitScanResponse;
import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
import org.apache.fluss.types.RowType;
import org.apache.fluss.utils.CloseableIterator;
import org.apache.fluss.utils.SchemaUtil;
Expand Down Expand Up @@ -124,17 +125,28 @@ public CloseableIterator<InternalRow> pollBatch(Duration timeout) throws IOExcep
if (endOfInput) {
return null;
}
LimitScanResponse response;
try {
LimitScanResponse response = scanFuture.get(timeout.toMillis(), TimeUnit.MILLISECONDS);
List<InternalRow> scanRows = parseLimitScanResponse(response);
endOfInput = true;
return CloseableIterator.wrap(scanRows.iterator());
response = scanFuture.get(timeout.toMillis(), TimeUnit.MILLISECONDS);
} catch (TimeoutException e) {
// poll next time
return CloseableIterator.emptyIterator();
} catch (Exception e) {
throw new IOException(e);
}

ByteBuf parsedByteBuf = response.getParsedByteBuf();
try {
List<InternalRow> scanRows = parseLimitScanResponse(response);
endOfInput = true;
return CloseableIterator.wrap(scanRows.iterator());
} catch (Exception e) {
throw new IOException(e);
} finally {
if (parsedByteBuf != null) {
parsedByteBuf.release();
}
}
}

private List<InternalRow> parseLimitScanResponse(LimitScanResponse limitScanResponse) {
Expand Down