Skip to content
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

Jump to bottom

Chunked encoding for _cat APIs #92022

Merged
merged 9 commits into from
Dec 6, 2022
Merged

Chunked encoding for _cat APIs #92022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
411707b
Chunked encoding for _cat APIs
DaveCTurner Nov 30, 2022
45b59ad
Fix test
DaveCTurner Nov 30, 2022
a03cc34
Merge branch 'main' into 2022-11-30-chunked-encoding-cat-apis
DaveCTurner Nov 30, 2022
3ef9ef7
Less cleanup on exception needed
DaveCTurner Nov 30, 2022
99782f7
Merge branch 'main' into 2022-11-30-chunked-encoding-cat-apis
elasticmachine Dec 1, 2022
164dadb
Merge branch 'main' into 2022-11-30-chunked-encoding-cat-apis
DaveCTurner Dec 2, 2022
1ab4ea8
Construct result before success
DaveCTurner Dec 2, 2022
4431531
Merge branch 'main' into 2022-11-30-chunked-encoding-cat-apis
DaveCTurner Dec 6, 2022
1243c23
Just use NON_RECYCLING_INSTANCE
DaveCTurner Dec 6, 2022
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
292 changes: 0 additions & 292 deletions server/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java
View file
Open in desktop

This file was deleted.

28 changes: 17 additions & 11 deletions server/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@
import org.elasticsearch.client.internal.node.NodeClient;
import org.elasticsearch.common.Table;
import org.elasticsearch.common.io.Streams;
import org.elasticsearch.common.io.UTF8StreamWriter;
import org.elasticsearch.common.io.stream.BytesStream;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.RestResponse;
import org.elasticsearch.rest.RestStatus;

import java.io.IOException;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
import java.util.Set;

import static org.elasticsearch.rest.action.cat.RestTable.buildHelpWidths;
Expand All @@ -39,17 +40,22 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
Table table = getTableWithHeader(request);
int[] width = buildHelpWidths(table, request);
BytesStream bytesOutput = Streams.flushOnCloseStream(channel.bytesOutput());
UTF8StreamWriter out = new UTF8StreamWriter().setOutput(bytesOutput);
for (Table.Cell cell : table.getHeaders()) {
// need to do left-align always, so create new cells
pad(new Table.Cell(cell.value), width[0], request, out);
out.append(" | ");
pad(new Table.Cell(cell.attr.containsKey("alias") ? cell.attr.get("alias") : ""), width[1], request, out);
out.append(" | ");
pad(new Table.Cell(cell.attr.containsKey("desc") ? cell.attr.get("desc") : "not available"), width[2], request, out);
out.append("\n");
try (var out = new OutputStreamWriter(bytesOutput, StandardCharsets.UTF_8)) {
for (Table.Cell cell : table.getHeaders()) {
// need to do left-align always, so create new cells
pad(new Table.Cell(cell.value), width[0], request, out);
out.append(" | ");
pad(new Table.Cell(cell.attr.containsKey("alias") ? cell.attr.get("alias") : ""), width[1], request, out);
out.append(" | ");
pad(
new Table.Cell(cell.attr.containsKey("desc") ? cell.attr.get("desc") : "not available"),
width[2],
request,
out
);
out.append("\n");
}
}
out.close();
channel.sendResponse(new RestResponse(RestStatus.OK, RestResponse.TEXT_CONTENT_TYPE, bytesOutput.bytes()));
};
} else {
Expand Down
Loading