[bugfix] Allow previously collected Performance Stats to be serialized

Author: adamretter

exist-core/src/main/java/org/exist/xquery/PerformanceStatsImpl.java

@@ -385,48 +385,47 @@ private FunctionStats[] sort() {
 
     @Override
     public void serialize(final MemTreeBuilder builder) {
-        builder.startElement(new QName(XML_ELEMENT_CALLS, XML_NAMESPACE, XML_PREFIX), null);
-        if (isEnabled()) {
-            final AttributesImpl attrs = new AttributesImpl();
-            for (final QueryStats stats : queries.values()) {
-                attrs.clear();
+        final AttributesImpl attrs = new AttributesImpl();
+        attrs.addAttribute("", "tracing-enabled", "tracing-enabled", "CDATA", Boolean.toString(isEnabled()));
+        builder.startElement(new QName(XML_ELEMENT_CALLS, XML_NAMESPACE, XML_PREFIX), attrs);
+        for (final QueryStats stats : queries.values()) {
+            attrs.clear();
+            attrs.addAttribute("", "source", "source", "CDATA", stats.source);
+            attrs.addAttribute("", "elapsed", "elapsed", "CDATA", Double.toString(stats.executionTime / 1000.0));
+            attrs.addAttribute("", "calls", "calls", "CDATA", Integer.toString(stats.callCount));
+            builder.startElement(new QName("query", XML_NAMESPACE, XML_PREFIX), attrs);
+            builder.endElement();
+        }
+        for (final FunctionStats stats : functions.values()) {
+            attrs.clear();
+            attrs.addAttribute("", "name", "name", "CDATA", stats.qname.getStringValue());
+            attrs.addAttribute("", "elapsed", "elapsed", "CDATA", Double.toString(stats.executionTime / 1000.0));
+            attrs.addAttribute("", "calls", "calls", "CDATA", Integer.toString(stats.callCount));
+            if (stats.source != null) {
                 attrs.addAttribute("", "source", "source", "CDATA", stats.source);
-                attrs.addAttribute("", "elapsed", "elapsed", "CDATA", Double.toString(stats.executionTime / 1000.0));
-                attrs.addAttribute("", "calls", "calls", "CDATA", Integer.toString(stats.callCount));
-                builder.startElement(new QName("query", XML_NAMESPACE, XML_PREFIX), attrs);
-                builder.endElement();
             }
-            for (final FunctionStats stats : functions.values()) {
-                attrs.clear();
-                attrs.addAttribute("", "name", "name", "CDATA", stats.qname.getStringValue());
-                attrs.addAttribute("", "elapsed", "elapsed", "CDATA", Double.toString(stats.executionTime / 1000.0));
-                attrs.addAttribute("", "calls", "calls", "CDATA", Integer.toString(stats.callCount));
-                if (stats.source != null) {
-                    attrs.addAttribute("", "source", "source", "CDATA", stats.source);
-                }
-                builder.startElement(new QName("function", XML_NAMESPACE, XML_PREFIX), attrs);
-                builder.endElement();
-            }
-            for (final IndexStats stats : indexStats.values()) {
-                attrs.clear();
-                attrs.addAttribute("", "type", "type", "CDATA", stats.indexType);
-                attrs.addAttribute("", "source", "source", "CDATA", stats.source + " [" + stats.line + ":" +
-                        stats.column + "]");
-                attrs.addAttribute("", "elapsed", "elapsed", "CDATA", Double.toString(stats.executionTime / 1000.0));
-                attrs.addAttribute("", "calls", "calls", "CDATA", Integer.toString(stats.usageCount));
-                attrs.addAttribute("", "optimization-level", "optimization", "CDATA", stats.indexOptimizationLevel.name());
-                builder.startElement(new QName("index", XML_NAMESPACE, XML_PREFIX), attrs);
-                builder.endElement();
-            }
-            for (final OptimizationStats stats : optimizations) {
-                attrs.clear();
-                attrs.addAttribute("", "type", "type", "CDATA", stats.type.toString());
-                if (stats.source != null) {
-                    attrs.addAttribute("", "source", "source", "CDATA", stats.source + " [" + stats.line + ":" + stats.column + "]");
-                }
-                builder.startElement(new QName("optimization", XML_NAMESPACE, XML_PREFIX), attrs);
-                builder.endElement();
+            builder.startElement(new QName("function", XML_NAMESPACE, XML_PREFIX), attrs);
+            builder.endElement();
+        }
+        for (final IndexStats stats : indexStats.values()) {
+            attrs.clear();
+            attrs.addAttribute("", "type", "type", "CDATA", stats.indexType);
+            attrs.addAttribute("", "source", "source", "CDATA", stats.source + " [" + stats.line + ":" +
+                    stats.column + "]");
+            attrs.addAttribute("", "elapsed", "elapsed", "CDATA", Double.toString(stats.executionTime / 1000.0));
+            attrs.addAttribute("", "calls", "calls", "CDATA", Integer.toString(stats.usageCount));
+            attrs.addAttribute("", "optimization-level", "optimization", "CDATA", stats.indexOptimizationLevel.name());
+            builder.startElement(new QName("index", XML_NAMESPACE, XML_PREFIX), attrs);
+            builder.endElement();
+        }
+        for (final OptimizationStats stats : optimizations) {
+            attrs.clear();
+            attrs.addAttribute("", "type", "type", "CDATA", stats.type.toString());
+            if (stats.source != null) {
+                attrs.addAttribute("", "source", "source", "CDATA", stats.source + " [" + stats.line + ":" + stats.column + "]");
             }
+            builder.startElement(new QName("optimization", XML_NAMESPACE, XML_PREFIX), attrs);
+            builder.endElement();
         }
         builder.endElement();
     }