Chunked encoding for _cat APIs (#92022)

Some of these APIs scale as O(#indices) or O(#shards) so it seems worthwhile to use chunked encoding throughout. Relates #89838
elastic · Dec 6, 2022 · b3a272e · b3a272e
1 parent d94e695
commit b3a272e
Show file tree

Hide file tree

Showing 6 changed files with 342 additions and 351 deletions.
diff --git a/server/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java b/server/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java
diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java
@@ -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;
@@ -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 {