Skip to content

http: stream WebSocket rows instead of buffering #35394

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

Merged
antiguru merged 1 commit into from
Mar 10, 2026
Merged

http: stream WebSocket rows instead of buffering #35394

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
14 changes: 11 additions & 3 deletions src/environmentd/src/http/sql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,9 +948,17 @@ impl ResultSender for WebSocket {
desc,
notices,
}) => {
let mut msgs = vec![WebSocketResponse::Rows(desc)];
msgs.extend(rows.into_iter().map(WebSocketResponse::Row));
msgs.push(WebSocketResponse::CommandComplete(tag));
// Stream rows directly to avoid buffering all rows as
// WebSocketResponse, which inflates memory due to enum sizing.
if let Err(e) = send_ws_response(self, WebSocketResponse::Rows(desc)).await {
return (Err(e), None);
}
for row in rows {
if let Err(e) = send_ws_response(self, WebSocketResponse::Row(row)).await {
return (Err(e), None);
}
}
let mut msgs = vec![WebSocketResponse::CommandComplete(tag)];
msgs.extend(notices.into_iter().map(WebSocketResponse::Notice));
(false, msgs, None)
}
Expand Down
Loading