Skip to content

refactor: Convert router components from class to ES6 function components #25666

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

Merged
yhwang merged 17 commits into from
Oct 25, 2025
Merged

refactor: Convert router components from class to ES6 function components #25666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3fd3cd8
Refactor ClusterHUD router component into ES6 function component
cmatzenbach Jul 31, 2025
b629667
Refactor PageTitle router component to ES6 function component
cmatzenbach Jul 31, 2025
c8c9d20
Refactor QueryList and sub-components into ES6 function components
cmatzenbach Jul 31, 2025
7a5285d
Fix setState calls; add deps array to update sparkline with data
cmatzenbach Aug 2, 2025
2cc3d02
Fix setState calls; fix bug with filter state getting reset
cmatzenbach Aug 2, 2025
29396bc
Fix setState call
cmatzenbach Aug 2, 2025
610df35
Add nullish coalescing operator check
cmatzenbach Aug 4, 2025
294f6e4
Refactor func, destructure props refs, remove unused arg
cmatzenbach Aug 4, 2025
39947ae
Fix flow errors - remove unused prop, allow numeric timeoutid
cmatzenbach Aug 4, 2025
8b1e53f
Fix flow errors
cmatzenbach Sep 2, 2025
af25cc6
Add back in check, needed for running queries
cmatzenbach Sep 3, 2025
40bc0fc
Fix state reference
cmatzenbach Oct 24, 2025
e6f3164
Remove unnecessary logic
cmatzenbach Oct 24, 2025
13c8764
Prefer destructuring
cmatzenbach Oct 24, 2025
e0cfe1e
Remove unnecessary logic controlling polling cycle
cmatzenbach Oct 24, 2025
3d59ec9
Refactor sortAndLimitQueries to avoid argument mutation
cmatzenbach Oct 24, 2025
3e76ab2
Merge branch 'master' into function_component_conversion
cmatzenbach Oct 24, 2025
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
208 changes: 110 additions & 98 deletions presto-ui/src/router/ClusterHUD.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* limitations under the License.
*/

import React from "react";
import React, { useState, useEffect, useRef } from "react";

import {
addExponentiallyWeightedToHistory,
Expand All @@ -32,124 +32,136 @@ const SPARKLINE_PROPERTIES = {
disableHiddenCheck: true,
};

export class ClusterHUD extends React.Component {
constructor(props) {
super(props);
this.state = {
runningQueries: [],
queuedQueries: [],
blockedQueries: [],
activeWorkers: [],
runningDrivers: [],
reservedMemory: [],
rowInputRate: [],
byteInputRate: [],
perWorkerCpuTimeRate: [],
clusterCount: [],
export const ClusterHUD = () => {
const [state, setState] = useState({
runningQueries: [],
queuedQueries: [],
blockedQueries: [],
activeWorkers: [],
runningDrivers: [],
reservedMemory: [],
rowInputRate: [],
byteInputRate: [],
perWorkerCpuTimeRate: [],
clusterCount: [],

lastRender: null,
lastRefresh: null,
lastRender: null,
lastRefresh: null,

lastInputRows: null,
lastInputBytes: null,
lastCpuTime: null,
lastInputRows: null,
lastInputBytes: null,
lastCpuTime: null,

initialized: false,
};
initialized: false,
});

this.refreshLoop = this.refreshLoop.bind(this);
}
const timeoutId = useRef(null);

resetTimer() {
clearTimeout(this.timeoutId);
// stop refreshing when query finishes or fails
if (this.state.query === null || !this.state.ended) {
this.timeoutId = setTimeout(this.refreshLoop, 1000);
}
}
const resetTimer = () => {
Comment thread
sourcery-ai[bot] marked this conversation as resolved.
clearTimeout(timeoutId.current);
timeoutId.current = setTimeout(refreshLoop, 1000);
};

refreshLoop() {
clearTimeout(this.timeoutId); // to stop multiple series of refreshLoop from going on simultaneously
const refreshLoop = () => {
clearTimeout(timeoutId.current); // to stop multiple series of refreshLoop from going on simultaneously
$.get('/v1/cluster', function (clusterState) {
setState(prevState => {
let newRowInputRate = [];
let newByteInputRate = [];
let newPerWorkerCpuTimeRate = [];
if (prevState.lastRefresh !== null) {
const rowsInputSinceRefresh = clusterState.totalInputRows - prevState.lastInputRows;
const bytesInputSinceRefresh = clusterState.totalInputBytes - prevState.lastInputBytes;
const cpuTimeSinceRefresh = clusterState.totalCpuTimeSecs - prevState.lastCpuTime;
const secsSinceRefresh = (Date.now() - prevState.lastRefresh) / 1000.0;

let newRowInputRate = [];
let newByteInputRate = [];
let newPerWorkerCpuTimeRate = [];
if (this.state.lastRefresh !== null) {
const rowsInputSinceRefresh = clusterState.totalInputRows - this.state.lastInputRows;
const bytesInputSinceRefresh = clusterState.totalInputBytes - this.state.lastInputBytes;
const cpuTimeSinceRefresh = clusterState.totalCpuTimeSecs - this.state.lastCpuTime;
const secsSinceRefresh = (Date.now() - this.state.lastRefresh) / 1000.0;

newRowInputRate = addExponentiallyWeightedToHistory(rowsInputSinceRefresh / secsSinceRefresh, this.state.rowInputRate);
newByteInputRate = addExponentiallyWeightedToHistory(bytesInputSinceRefresh / secsSinceRefresh, this.state.byteInputRate);
newPerWorkerCpuTimeRate = addExponentiallyWeightedToHistory((cpuTimeSinceRefresh / clusterState.activeWorkers) / secsSinceRefresh, this.state.perWorkerCpuTimeRate);
}
newRowInputRate = addExponentiallyWeightedToHistory(rowsInputSinceRefresh / secsSinceRefresh, prevState.rowInputRate);
newByteInputRate = addExponentiallyWeightedToHistory(bytesInputSinceRefresh / secsSinceRefresh, prevState.byteInputRate);
newPerWorkerCpuTimeRate = addExponentiallyWeightedToHistory((cpuTimeSinceRefresh / clusterState.activeWorkers) / secsSinceRefresh, prevState.perWorkerCpuTimeRate);
}

this.setState({
// instantaneous stats
runningQueries: addToHistory(clusterState.runningQueries, this.state.runningQueries),
queuedQueries: addToHistory(clusterState.queuedQueries, this.state.queuedQueries),
blockedQueries: addToHistory(clusterState.blockedQueries, this.state.blockedQueries),
activeWorkers: addToHistory(clusterState.activeWorkers, this.state.activeWorkers),
clusterCount: addToHistory(clusterState.clusterCount, this.state.clusterCount),
return {
...prevState,
// instantaneous stats
runningQueries: addToHistory(clusterState.runningQueries, prevState.runningQueries),
queuedQueries: addToHistory(clusterState.queuedQueries, prevState.queuedQueries),
blockedQueries: addToHistory(clusterState.blockedQueries, prevState.blockedQueries),
activeWorkers: addToHistory(clusterState.activeWorkers, prevState.activeWorkers),
clusterCount: addToHistory(clusterState.clusterCount, prevState.clusterCount),

// moving averages
runningDrivers: addExponentiallyWeightedToHistory(clusterState.runningDrivers, this.state.runningDrivers),
reservedMemory: addExponentiallyWeightedToHistory(clusterState.reservedMemory, this.state.reservedMemory),
// moving averages
runningDrivers: addExponentiallyWeightedToHistory(clusterState.runningDrivers, prevState.runningDrivers),
reservedMemory: addExponentiallyWeightedToHistory(clusterState.reservedMemory, prevState.reservedMemory),

// moving averages for diffs
rowInputRate: newRowInputRate,
byteInputRate: newByteInputRate,
perWorkerCpuTimeRate: newPerWorkerCpuTimeRate,
// moving averages for diffs
rowInputRate: newRowInputRate,
byteInputRate: newByteInputRate,
perWorkerCpuTimeRate: newPerWorkerCpuTimeRate,

lastInputRows: clusterState.totalInputRows,
lastInputBytes: clusterState.totalInputBytes,
lastCpuTime: clusterState.totalCpuTimeSecs,
lastInputRows: clusterState.totalInputRows,
lastInputBytes: clusterState.totalInputBytes,
lastCpuTime: clusterState.totalCpuTimeSecs,

initialized: true,
initialized: true,

lastRefresh: Date.now()
lastRefresh: Date.now()
};
});
this.resetTimer();
}.bind(this))
resetTimer();
})
.fail(function () {
this.resetTimer();
}.bind(this));
}
resetTimer();
});
};

componentDidMount() {
this.refreshLoop();
}
useEffect(() => {
refreshLoop();

return () => {
clearTimeout(timeoutId.current);
};
}, []);

componentDidUpdate() {
useEffect(() => {
// prevent multiple calls to componentDidUpdate (resulting from calls to setState or otherwise) within the refresh interval from re-rendering sparklines/charts
if (this.state.lastRender === null || (Date.now() - this.state.lastRender) >= 1000) {
if (state.lastRender === null || (Date.now() - state.lastRender) >= 1000) {
const renderTimestamp = Date.now();
$('#running-queries-sparkline').sparkline(this.state.runningQueries, $.extend({}, SPARKLINE_PROPERTIES, {chartRangeMin: 0}));
$('#blocked-queries-sparkline').sparkline(this.state.blockedQueries, $.extend({}, SPARKLINE_PROPERTIES, {chartRangeMin: 0}));
$('#queued-queries-sparkline').sparkline(this.state.queuedQueries, $.extend({}, SPARKLINE_PROPERTIES, {chartRangeMin: 0}));
$('#running-queries-sparkline').sparkline(state.runningQueries, $.extend({}, SPARKLINE_PROPERTIES, {chartRangeMin: 0}));
$('#blocked-queries-sparkline').sparkline(state.blockedQueries, $.extend({}, SPARKLINE_PROPERTIES, {chartRangeMin: 0}));
$('#queued-queries-sparkline').sparkline(state.queuedQueries, $.extend({}, SPARKLINE_PROPERTIES, {chartRangeMin: 0}));

$('#active-workers-sparkline').sparkline(this.state.activeWorkers, $.extend({}, SPARKLINE_PROPERTIES, {chartRangeMin: 0}));
$('#cluster-count-sparkline').sparkline(this.state.clusterCount, $.extend({}, SPARKLINE_PROPERTIES, {chartRangeMin: 0}));
$('#active-workers-sparkline').sparkline(state.activeWorkers, $.extend({}, SPARKLINE_PROPERTIES, {chartRangeMin: 0}));
$('#cluster-count-sparkline').sparkline(state.clusterCount, $.extend({}, SPARKLINE_PROPERTIES, {chartRangeMin: 0}));

$('#running-drivers-sparkline').sparkline(this.state.runningDrivers, $.extend({}, SPARKLINE_PROPERTIES, {numberFormatter: precisionRound}));
$('#reserved-memory-sparkline').sparkline(this.state.reservedMemory, $.extend({}, SPARKLINE_PROPERTIES, {numberFormatter: formatDataSizeBytes}));
$('#running-drivers-sparkline').sparkline(state.runningDrivers, $.extend({}, SPARKLINE_PROPERTIES, {numberFormatter: precisionRound}));
$('#reserved-memory-sparkline').sparkline(state.reservedMemory, $.extend({}, SPARKLINE_PROPERTIES, {numberFormatter: formatDataSizeBytes}));

$('#row-input-rate-sparkline').sparkline(this.state.rowInputRate, $.extend({}, SPARKLINE_PROPERTIES, {numberFormatter: formatCount}));
$('#byte-input-rate-sparkline').sparkline(this.state.byteInputRate, $.extend({}, SPARKLINE_PROPERTIES, {numberFormatter: formatDataSizeBytes}));
$('#cpu-time-rate-sparkline').sparkline(this.state.perWorkerCpuTimeRate, $.extend({}, SPARKLINE_PROPERTIES, {numberFormatter: precisionRound}));
$('#row-input-rate-sparkline').sparkline(state.rowInputRate, $.extend({}, SPARKLINE_PROPERTIES, {numberFormatter: formatCount}));
$('#byte-input-rate-sparkline').sparkline(state.byteInputRate, $.extend({}, SPARKLINE_PROPERTIES, {numberFormatter: formatDataSizeBytes}));
$('#cpu-time-rate-sparkline').sparkline(state.perWorkerCpuTimeRate, $.extend({}, SPARKLINE_PROPERTIES, {numberFormatter: precisionRound}));

this.setState({
setState(prevState => ({
...prevState,
lastRender: renderTimestamp
});
}));
}

$('[data-bs-toggle="tooltip"]')?.tooltip?.();
}
}, [
state.runningQueries,
state.blockedQueries,
state.queuedQueries,
state.activeWorkers,
state.clusterCount,
state.runningDrivers,
state.reservedMemory,
state.rowInputRate,
state.byteInputRate,
state.perWorkerCpuTimeRate
]);

render() {
return (<div className="row">
return (
<div className="row">
<div className="col-12">
<div className="row">
<div className="col-6">
Expand All @@ -171,15 +183,15 @@ export class ClusterHUD extends React.Component {
<div className="col-6">
<div className="stat stat-large">
<span className="stat-text">
{this.state.runningQueries[this.state.runningQueries.length - 1]}
{state.runningQueries[state.runningQueries.length - 1]}
</span>
<span className="sparkline" id="running-queries-sparkline"><div className="loader">Loading ...</div></span>
</div>
</div>
<div className="col-6">
<div className="stat stat-large">
<span className="stat-text">
{this.state.clusterCount[this.state.clusterCount.length - 1]}
{state.clusterCount[state.clusterCount.length - 1]}
</span>
<span className="sparkline" id="cluster-count-sparkline"><div className="loader">Loading ...</div></span>
</div>
Expand All @@ -205,15 +217,15 @@ export class ClusterHUD extends React.Component {
<div className="col-6">
<div className="stat stat-large">
<span className="stat-text">
{this.state.queuedQueries[this.state.queuedQueries.length - 1]}
{state.queuedQueries[state.queuedQueries.length - 1]}
</span>
<span className="sparkline" id="queued-queries-sparkline"><div className="loader">Loading ...</div></span>
</div>
</div>
<div className="col-6">
<div className="stat stat-large">
<span className="stat-text">
{this.state.activeWorkers[this.state.activeWorkers.length - 1]}
{state.activeWorkers[state.activeWorkers.length - 1]}
</span>
<span className="sparkline" id="active-workers-sparkline"><div className="loader">Loading ...</div></span>
</div>
Expand All @@ -240,21 +252,21 @@ export class ClusterHUD extends React.Component {
<div className="col-6">
<div className="stat stat-large">
<span className="stat-text">
{this.state.blockedQueries[this.state.blockedQueries.length - 1]}
{state.blockedQueries[state.blockedQueries.length - 1]}
</span>
<span className="sparkline" id="blocked-queries-sparkline"><div className="loader">Loading ...</div></span>
</div>
</div>
<div className="col-6">
<div className="stat stat-large">
<span className="stat-text">
{formatCount(this.state.runningDrivers[this.state.runningDrivers.length - 1])}
{formatCount(state.runningDrivers[state.runningDrivers.length - 1])}
</span>
<span className="sparkline" id="running-drivers-sparkline"><div className="loader">Loading ...</div></span>
</div>
</div>
</div>
</div>
</div>);
}
</div>
);
}
Loading
Loading