ESQL: Merge more code into esql-proper (#110432)

This removes the `Graphviz` class which we don't currently use and
merges the `LoggingUtils` class into it's single caller,
`EsqlResponseListener`.

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/util/Graphviz.java

@@ -1,313 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-package org.elasticsearch.xpack.esql.core.util;
-
-import org.elasticsearch.xpack.esql.core.tree.Node;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.atomic.AtomicInteger;
-
-// use the awesome http://mdaines.github.io/viz.js/ to visualize and play around with the various options
-public abstract class Graphviz {
-
-    private static final int NODE_LABEL_INDENT = 12;
-    private static final int CLUSTER_INDENT = 2;
-    private static final int INDENT = 1;
-
-    public static String dot(String name, Node<?> root) {
-        StringBuilder sb = new StringBuilder();
-        // name
-        sb.append(String.format(Locale.ROOT, """
-            digraph G { rankdir=BT;
-              label="%s";
-              node[shape=plaintext, color=azure1];
-              edge[color=black,arrowsize=0.5];
-            """, name));
-        handleNode(sb, root, new AtomicInteger(0), INDENT, true);
-        sb.append("}");
-        return sb.toString();
-    }
-
-    public static String dot(Map<String, ? extends Node<?>> clusters, boolean drawSubTrees) {
-        AtomicInteger nodeCounter = new AtomicInteger(0);
-
-        StringBuilder sb = new StringBuilder();
-        // name
-        sb.append("""
-            digraph G { rankdir=BT;
-             node[shape=plaintext, color=azure1];
-             edge[color=black];
-             graph[compound=true];
-
-            """);
-
-        int clusterNodeStart = 1;
-        int clusterId = 0;
-
-        StringBuilder clusterEdges = new StringBuilder();
-
-        for (Entry<String, ? extends Node<?>> entry : clusters.entrySet()) {
-            indent(sb, INDENT);
-            // draw cluster
-            sb.append("subgraph cluster");
-            sb.append(++clusterId);
-            sb.append(" {\n");
-            indent(sb, CLUSTER_INDENT);
-            sb.append("color=blue;\n");
-            indent(sb, CLUSTER_INDENT);
-            sb.append("label=");
-            sb.append(quoteGraphviz(entry.getKey()));
-            sb.append(";\n\n");
-
-            /* to help align the clusters, add an invisible node (that could
-             * otherwise be used for labeling but it consumes too much space)
-             * used for alignment */
-            indent(sb, CLUSTER_INDENT);
-            sb.append("c" + clusterId);
-            sb.append("[style=invis]\n");
-            // add edge to the first node in the cluster
-            indent(sb, CLUSTER_INDENT);
-            sb.append("node" + (nodeCounter.get() + 1));
-            sb.append(" -> ");
-            sb.append("c" + clusterId);
-            sb.append(" [style=invis];\n");
-
-            handleNode(sb, entry.getValue(), nodeCounter, CLUSTER_INDENT, drawSubTrees);
-
-            int clusterNodeStop = nodeCounter.get();
-
-            indent(sb, INDENT);
-            sb.append("}\n");
-
-            // connect cluster only if there are at least two
-            if (clusterId > 1) {
-                indent(clusterEdges, INDENT);
-                clusterEdges.append("node" + clusterNodeStart);
-                clusterEdges.append(" -> ");
-                clusterEdges.append("node" + clusterNodeStop);
-                clusterEdges.append("[ltail=cluster");
-                clusterEdges.append(clusterId - 1);
-                clusterEdges.append(" lhead=cluster");
-                clusterEdges.append(clusterId);
-                clusterEdges.append("];\n");
-            }
-            clusterNodeStart = clusterNodeStop;
-        }
-
-        sb.append("\n");
-
-        // connecting the clusters arranges them in a weird position
-        // so don't
-        // sb.append(clusterEdges.toString());
-
-        // align the cluster by requiring the invisible nodes in each cluster to be of the same rank
-        indent(sb, INDENT);
-        sb.append("{ rank=same");
-        for (int i = 1; i <= clusterId; i++) {
-            sb.append(" c" + i);
-        }
-        sb.append(" };\n}");
-
-        return sb.toString();
-    }
-
-    private static void handleNode(StringBuilder output, Node<?> n, AtomicInteger nodeId, int currentIndent, boolean drawSubTrees) {
-        // each node has its own id
-        int thisId = nodeId.incrementAndGet();
-
-        // first determine node info
-        StringBuilder nodeInfo = new StringBuilder();
-        nodeInfo.append("\n");
-        indent(nodeInfo, currentIndent + NODE_LABEL_INDENT);
-        nodeInfo.append("""
-            <table border="0" cellborder="1" cellspacing="0">
-            """);
-        indent(nodeInfo, currentIndent + NODE_LABEL_INDENT);
-        nodeInfo.append(String.format(Locale.ROOT, """
-            <th><td border="0" colspan="2" align="center"><b>%s</b></td></th>
-            """, n.nodeName()));
-        indent(nodeInfo, currentIndent + NODE_LABEL_INDENT);
-
-        List<Object> props = n.nodeProperties();
-        List<String> parsed = new ArrayList<>(props.size());
-        List<Node<?>> subTrees = new ArrayList<>();
-
-        for (Object v : props) {
-            // skip null values, children and location
-            if (v != null && n.children().contains(v) == false) {
-                if (v instanceof Collection<?> c) {
-                    StringBuilder colS = new StringBuilder();
-                    for (Object o : c) {
-                        if (drawSubTrees && isAnotherTree(o)) {
-                            subTrees.add((Node<?>) o);
-                        } else {
-                            colS.append(o);
-                            colS.append("\n");
-                        }
-                    }
-                    if (colS.length() > 0) {
-                        parsed.add(colS.toString());
-                    }
-                } else {
-                    if (drawSubTrees && isAnotherTree(v)) {
-                        subTrees.add((Node<?>) v);
-                    } else {
-                        parsed.add(v.toString());
-                    }
-                }
-            }
-        }
-
-        for (String line : parsed) {
-            nodeInfo.append("<tr><td align=\"left\" bgcolor=\"azure2\">");
-            nodeInfo.append(escapeHtml(line));
-            nodeInfo.append("</td></tr>\n");
-            indent(nodeInfo, currentIndent + NODE_LABEL_INDENT);
-        }
-
-        nodeInfo.append("</table>\n");
-
-        // check any subtrees
-        if (subTrees.isEmpty() == false) {
-            // write nested trees
-            output.append(String.format(Locale.ROOT, """
-                subgraph cluster_%s{
-                style=filled; color=white; fillcolor=azure2; label="";
-                """, thisId));
-        }
-
-        // write node info
-        indent(output, currentIndent);
-        output.append("node");
-        output.append(thisId);
-        output.append("[label=");
-        output.append(quoteGraphviz(nodeInfo.toString()));
-        output.append("];\n");
-
-        if (subTrees.isEmpty() == false) {
-            indent(output, currentIndent + INDENT);
-            output.append("node[shape=ellipse, color=black]\n");
-
-            for (Node<?> node : subTrees) {
-                indent(output, currentIndent + INDENT);
-                drawNodeTree(output, node, "st_" + thisId + "_", 0);
-            }
-
-            output.append("\n}\n");
-        }
-
-        indent(output, currentIndent + 1);
-        // output.append("{ rankdir=LR; rank=same; \n");
-        int prevId = -1;
-        // handle children
-        for (Node<?> c : n.children()) {
-            // the child will always have the next id
-            int childId = nodeId.get() + 1;
-            handleNode(output, c, nodeId, currentIndent + INDENT, drawSubTrees);
-            indent(output, currentIndent + 1);
-            output.append("node");
-            output.append(childId);
-            output.append(" -> ");
-            output.append("node");
-            output.append(thisId);
-            output.append(";\n");
-
-            // add invisible connection between children for ordering
-            if (prevId != -1) {
-                indent(output, currentIndent + 1);
-                output.append("node");
-                output.append(prevId);
-                output.append(" -> ");
-                output.append("node");
-                output.append(childId);
-                output.append(";\n");
-            }
-            prevId = childId;
-        }
-        indent(output, currentIndent);
-        // output.append("}\n");
-    }
-
-    private static void drawNodeTree(StringBuilder sb, Node<?> node, String prefix, int counter) {
-        String nodeName = prefix + counter;
-        prefix = nodeName;
-
-        // draw node
-        drawNode(sb, node, nodeName);
-        // then draw all children nodes and connections between them to be on the same level
-        sb.append("{ rankdir=LR; rank=same;\n");
-        int prevId = -1;
-        int saveId = counter;
-        for (Node<?> child : node.children()) {
-            int currId = ++counter;
-            drawNode(sb, child, prefix + currId);
-            if (prevId > -1) {
-                sb.append(prefix + prevId + " -> " + prefix + currId + " [style=invis];\n");
-            }
-            prevId = currId;
-        }
-        sb.append("}\n");
-
-        // now draw connections to the parent
-        for (int i = saveId; i < counter; i++) {
-            sb.append(prefix + (i + 1) + " -> " + nodeName + ";\n");
-        }
-
-        // draw the child
-        counter = saveId;
-        for (Node<?> child : node.children()) {
-            drawNodeTree(sb, child, prefix, ++counter);
-        }
-    }
-
-    private static void drawNode(StringBuilder sb, Node<?> node, String nodeName) {
-        if (node.children().isEmpty()) {
-            sb.append(nodeName + " [label=\"" + node.toString() + "\"];\n");
-        } else {
-            sb.append(nodeName + " [label=\"" + node.nodeName() + "\"];\n");
-        }
-    }
-
-    private static boolean isAnotherTree(Object value) {
-        if (value instanceof Node<?> n) {
-            // create a subgraph
-            if (n.children().size() > 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static String escapeHtml(Object value) {
-        return String.valueOf(value)
-            .replace("&", "&#38;")
-            .replace("\"", "&#34;")
-            .replace("'", "&#39;")
-            .replace("<", "&#60;")
-            .replace(">", "&#62;")
-            .replace("\n", "<br align=\"left\"/>");
-    }
-
-    private static String quoteGraphviz(String value) {
-        if (value.contains("<")) {
-            return "<" + value + ">";
-        }
-
-        return "\"" + value + "\"";
-    }
-
-    private static void indent(StringBuilder sb, int indent) {
-        for (int i = 0; i < indent; i++) {
-            sb.append(" ");
-        }
-    }
-}

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/util/LoggingUtils.java

@@ -1,24 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-package org.elasticsearch.xpack.esql.core.util;
-
-import org.elasticsearch.ExceptionsHelper;
-import org.elasticsearch.logging.Level;
-import org.elasticsearch.logging.Logger;
-import org.elasticsearch.rest.RestStatus;
-
-public final class LoggingUtils {
-
-    private LoggingUtils() {}
-
-    public static void logOnFailure(Logger logger, Throwable throwable) {
-        RestStatus status = ExceptionsHelper.status(throwable);
-        logger.log(status.getStatus() >= 500 ? Level.WARN : Level.DEBUG, () -> "Request failed with status [" + status + "]: ", throwable);
-    }
-
-}

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlResponseListener.java

@@ -7,10 +7,12 @@
 
 package org.elasticsearch.xpack.esql.action;
 
+import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.core.Releasable;
 import org.elasticsearch.core.Releasables;
 import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.logging.Level;
 import org.elasticsearch.logging.LogManager;
 import org.elasticsearch.logging.Logger;
 import org.elasticsearch.rest.ChunkedRestResponseBodyPart;
@@ -29,7 +31,6 @@ import java.io.IOException;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
-import static org.elasticsearch.xpack.esql.core.util.LoggingUtils.logOnFailure;
 import static org.elasticsearch.xpack.esql.formatter.TextFormat.CSV;
 import static org.elasticsearch.xpack.esql.formatter.TextFormat.URL_PARAM_DELIMITER;
 
@@ -168,7 +169,7 @@ public final class EsqlResponseListener extends RestRefCountedChunkedToXContentL
      */
     public ActionListener<EsqlQueryResponse> wrapWithLogging() {
         ActionListener<EsqlQueryResponse> listener = ActionListener.wrap(this::onResponse, ex -> {
-            logOnFailure(LOGGER, ex);
+            logOnFailure(ex);
             onFailure(ex);
         });
         if (LOGGER.isDebugEnabled() == false) {
@@ -190,4 +191,8 @@ public final class EsqlResponseListener extends RestRefCountedChunkedToXContentL
         });
     }
 
+    static void logOnFailure(Throwable throwable) {
+        RestStatus status = ExceptionsHelper.status(throwable);
+        LOGGER.log(status.getStatus() >= 500 ? Level.WARN : Level.DEBUG, () -> "Request failed with status [" + status + "]: ", throwable);
+    }
 }