querysub 0.458.0 → 0.459.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.458.0",
+  "version": "0.459.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/diagnostics/grossStats/GrossStatsPage.tsx

@@ -69,7 +69,7 @@ const renderChartPNG = cacheArgsEqual((
     height: number,
     nodeIds: readonly string[],
     bucketsArrays: readonly GrossStatsBucket[][],
-): string => {
+): { pngUrl: string; maxTotal: number } => {
     let canvas = document.createElement("canvas");
     canvas.width = width;
     canvas.height = height;
@@ -115,7 +115,7 @@ const renderChartPNG = cacheArgsEqual((
         }
     }
 
-    return canvas.toDataURL();
+    return { pngUrl: canvas.toDataURL(), maxTotal };
 }, 5);
 
 export class GrossStatsPage extends qreact.Component {
@@ -136,23 +136,31 @@ export class GrossStatsPage extends qreact.Component {
             <div className={css.hbox(6)}>
                 <span>Range:</span>
                 {TIME_RANGES.map(r =>
-                    <span
-                        className={css.button.pad2(4, 2) + (state.rangeMs === r.ms ? " " + css.hsl(210, 70, 60).hslcolor(0, 0, 100) : "")}
+                    <button
+                        className={css.pad2(8, 4) + (state.rangeMs === r.ms ? " " + css.hsl(210, 70, 60).hslcolor(0, 0, 100).bold : "")}
                         onClick={() => Querysub.commit(() => { state.rangeMs = r.ms; })}
-                    >{r.label}</span>
+                    >{r.label}</button>
                 )}
             </div>
             <div className={css.hbox(6).wrap}>
                 <span>Field:</span>
                 {GROSS_STATS_FIELDS.map(f =>
-                    <span
-                        className={css.button.pad2(4, 2) + (state.selectedField === f ? " " + css.hsl(140, 60, 50).hslcolor(0, 0, 100) : "")}
+                    <button
+                        className={css.pad2(8, 4) + (state.selectedField === f ? " " + css.hsl(140, 60, 50).hslcolor(0, 0, 100).bold : "")}
                         onClick={() => Querysub.commit(() => { state.selectedField = f; })}
-                    >{f}</span>
+                    >{f}</button>
                 )}
             </div>
             <div className={css.hbox(8).wrap}>
                 <span>Servers:</span>
+                <button
+                    className={css.pad2(8, 4)}
+                    onClick={() => Querysub.commit(() => { state.excludedNodes = new Set(); })}
+                >Select all</button>
+                <button
+                    className={css.pad2(8, 4)}
+                    onClick={() => Querysub.commit(() => { state.excludedNodes = new Set(nodeIds); })}
+                >Select none</button>
                 {nodeIds.map((nodeId, i) =>
                     <label className={css.hbox(4)}>
                         <input
@@ -198,6 +206,15 @@ export class GrossStatsPage extends qreact.Component {
             perNodeTotals.push(totals);
         }
 
+        let maxPerField = {} as Record<GrossStatsField, number>;
+        for (let f of GROSS_STATS_FIELDS) {
+            maxPerField[f] = 0;
+            for (let totals of perNodeTotals) {
+                if (totals[f] > maxPerField[f]) maxPerField[f] = totals[f];
+            }
+        }
+        let highlightStyle = css.hsl(60, 90, 75);
+
         return <table className={css.fillWidth}>
             <thead>
                 <tr>
@@ -215,9 +232,12 @@ export class GrossStatsPage extends qreact.Component {
                         <td className={css.pad2(4)} style={{ borderLeft: `4px solid ${colorForNode(i)}` }}>
                             {shortNodeId(nodeId)}
                         </td>
-                        {GROSS_STATS_FIELDS.map(f =>
-                            <td className={css.textAlign("right").pad2(4)}>{formatNumber(perNodeTotals[i][f])}</td>
-                        )}
+                        {GROSS_STATS_FIELDS.map(f => {
+                            let isMax = perNodeTotals[i][f] > 0 && perNodeTotals[i][f] === maxPerField[f];
+                            return <td className={css.textAlign("right").pad2(4) + (isMax ? " " + highlightStyle : "")}>
+                                {formatNumber(perNodeTotals[i][f])}
+                            </td>;
+                        })}
                     </tr>
                 )}
             </tbody>
@@ -234,7 +254,7 @@ export class GrossStatsPage extends qreact.Component {
         let bucketsArrays: GrossStatsBucket[][] = selectedNodeIds.map(n => bucketsByNode.get(n) ?? []);
         let anyLoading = !result;
 
-        let chartPNG = renderChartPNG(
+        let chart = renderChartPNG(
             state.selectedField,
             state.rangeMs,
             CHART_WIDTH,
@@ -242,18 +262,36 @@ export class GrossStatsPage extends qreact.Component {
             selectedNodeIds,
             bucketsArrays,
         );
+        let now = Date.now();
+        let windowStart = now - state.rangeMs;
 
         return <div className={css.vbox(8).pad2(8).fillWidth}>
             <h2>Cluster Stats</h2>
             {this.renderControls(allNodeIds)}
-            <img
-                src={chartPNG}
-                width={CHART_WIDTH}
-                height={CHART_HEIGHT}
-                className={css.hsl(0, 0, 100)}
-                style={anyLoading ? { opacity: 0.5 } : undefined}
-            />
+            <div className={css.vbox(4)}>
+                <div className={css.hbox(8).bold}>
+                    <span>peak: {formatNumber(chart.maxTotal)} {state.selectedField} / minute</span>
+                </div>
+                <img
+                    src={chart.pngUrl}
+                    width={CHART_WIDTH}
+                    height={CHART_HEIGHT}
+                    className={css.hsl(0, 0, 100)}
+                    style={anyLoading ? { opacity: 0.5 } : undefined}
+                />
+                <div className={css.hbox(0).fillWidth}>
+                    <span className={css.flexShrink0}>{formatLocalTime(windowStart)}</span>
+                    <span className={css.fillBoth}></span>
+                    <span className={css.flexShrink0}>{formatLocalTime(now)}</span>
+                </div>
+            </div>
             {this.renderTable(selectedNodeIds, bucketsArrays)}
         </div>;
     }
 }
+
+function formatLocalTime(ms: number): string {
+    let d = new Date(ms);
+    let pad = (n: number) => String(n).padStart(2, "0");
+    return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
+}

package/src/diagnostics/logs/IndexedLogs/BufferIndex.ts

@@ -393,7 +393,16 @@ export class BufferIndex {
                 const bufferStep = iterateForward ? 1 : -1;
 
                 for (let bufferIndex = bufferStartIdx; iterateForward ? bufferIndex < bufferEndIdx : bufferIndex > bufferEndIdx; bufferIndex += bufferStep) {
-                    if (matchCount >= params.limit || !config.keepIterating()) break;
+                    // No `matchCount >= params.limit` cap inside the block.
+                    // Buffer order within a block is not guaranteed to follow
+                    // the search direction (blocks are time-ordered, buffers
+                    // inside them are not), so stopping mid-block on a match
+                    // count would drop earlier-time buffers we haven't reached
+                    // yet. The block-level cap above is the only safe stop;
+                    // here we only honor cross-file `keepIterating` (which
+                    // applies to the whole file at once, so it's safe at any
+                    // granularity).
+                    if (!config.keepIterating()) break;
                     await config.results.limitGroup?.wait();
 
                     let buffer = buffers[bufferIndex];

package/src/diagnostics/logs/IndexedLogs/BufferUnitIndex.ts

@@ -580,7 +580,16 @@ export class BufferUnitIndex {
                     const step = iterateForward ? 1 : -1;
 
                     for (let i = startIdx; iterateForward ? i < endIdx : i > endIdx; i += step) {
-                        if (stopIterating()) break;
+                        // No matchCount-based cap inside the block. Buffer
+                        // order within a block is not guaranteed to follow the
+                        // search direction (blocks are time-ordered, buffers
+                        // inside them are not), so a mid-block stop on
+                        // `relevantCount >= limit` would drop earlier-time
+                        // buffers we haven't reached yet. Block-level
+                        // `stopIterating` is the safe granularity; here we
+                        // only honor cross-file `keepIterating`, which applies
+                        // to the whole file at once.
+                        if (!keepIterating()) break;
                         await results.limitGroup?.wait();
 
                         const buffer = await this.getBufferFromBlock(blockReader, i);