Skip to content

Commit d58e73e

Browse files
unidevelunidevel
committed
Fix more issues
1 parent 8cede0d commit d58e73e

File tree

6 files changed

+59
-63
lines changed

6 files changed

+59
-63
lines changed

‎presto-ui/src/components/LivePlan.jsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import ReactDOMServer from "react-dom/server";
1818
import * as dagreD3 from "dagre-d3-es";
1919
import * as d3 from "d3";
2020

21-
import {formatRows, getStageStateColor, truncateString} from "../utils";
21+
import {formatRows, getStageStateColor, truncateString, formatDataSize} from "../utils";
2222
import {initializeGraph, initializeSvg} from "../d3utils";
2323
import {QueryHeader} from "./QueryHeader";
2424

@@ -98,7 +98,7 @@ export class StageStatistics extends React.Component<StageStatisticsProps, Stage
9898
{stage.state}
9999
<hr/>
100100
CPU: {stats.totalCpuTime}<br />
101-
Buffered: {stats.bufferedDataSize}<br />
101+
Buffered: {formatDataSize(stats.bufferedDataSizeInBytes)}<br />
102102
{stats.fullyBlocked ?
103103
<div style={{color: '#ff0000'}}>Blocked: {stats.totalBlockedTime} </div> :
104104
<div>Blocked: {stats.totalBlockedTime} </div>
@@ -109,7 +109,7 @@ export class StageStatistics extends React.Component<StageStatisticsProps, Stage
109109
<br/>
110110
Lifespans: {stats.completedLifespans + " / " + stats.totalLifespans}
111111
<hr/>
112-
Input: {stats.rawInputDataSize + " / " + formatRows(stats.rawInputPositions)}
112+
Input: {formatDataSize(stats.rawInputDataSizeInBytes) + " / " + formatRows(stats.rawInputPositions)}
113113
</div>
114114
</div>
115115
);
@@ -251,7 +251,7 @@ export class LivePlan extends React.Component<LivePlanProps, LivePlanState> {
251251
class: "plan-edge",
252252
style: "stroke-width: 4px",
253253
arrowheadClass: "plan-arrowhead",
254-
label: sourceStats.outputDataSizeInBytes + " / " + formatRows(sourceStats.outputPositions),
254+
label: formatDataSize(sourceStats.outputDataSizeInBytes) + " / " + formatRows(sourceStats.outputPositions),
255255
labelStyle: "color: #fff; font-weight: bold; font-size: 24px;",
256256
labelType: "html",
257257
});

‎presto-ui/src/components/QueryDetail.jsx‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import {
3232
getTaskIdSuffix,
3333
getTaskNumber,
3434
GLYPHICON_HIGHLIGHT,
35-
parseDataSize,
3635
parseDuration,
3736
precisionRound
3837
} from "../utils";
@@ -668,7 +667,7 @@ class StageSummary extends React.Component {
668667
Current
669668
</td>
670669
<td className="stage-table-stat-text">
671-
{stage.latestAttemptExecutionInfo.stats.userMemoryReservation}
670+
{formatDataSizeBytes(stage.latestAttemptExecutionInfo.stats.userMemoryReservationInBytes)}
672671
</td>
673672
</tr>
674673
<tr>
@@ -684,7 +683,7 @@ class StageSummary extends React.Component {
684683
Peak
685684
</td>
686685
<td className="stage-table-stat-text">
687-
{stage.latestAttemptExecutionInfo.stats.peakUserMemoryReservation}
686+
{formatDataSizeBytes(stage.latestAttemptExecutionInfo.stats.peakUserMemoryReservationInBytes)}
688687
</td>
689688
</tr>
690689
</tbody>
@@ -1018,7 +1017,7 @@ export class QueryDetail extends React.Component {
10181017
lastScheduledTime: parseDuration(query.queryStats.totalScheduledTime),
10191018
lastCpuTime: parseDuration(query.queryStats.totalCpuTime),
10201019
lastRowInput: query.queryStats.processedInputPositions,
1021-
lastByteInput: parseDataSize(query.queryStats.processedInputDataSize),
1020+
lastByteInput: query.queryStats.processedInputDataSizeInBytes,
10221021

10231022
initialized: true,
10241023
ended: query.finalQueryInfo,
@@ -1041,13 +1040,13 @@ export class QueryDetail extends React.Component {
10411040
const currentScheduledTimeRate = (parseDuration(query.queryStats.totalScheduledTime) - lastScheduledTime) / (elapsedSecsSinceLastRefresh * 1000);
10421041
const currentCpuTimeRate = (parseDuration(query.queryStats.totalCpuTime) - lastCpuTime) / (elapsedSecsSinceLastRefresh * 1000);
10431042
const currentRowInputRate = (query.queryStats.processedInputPositions - lastRowInput) / elapsedSecsSinceLastRefresh;
1044-
const currentByteInputRate = (parseDataSize(query.queryStats.processedInputDataSize) - lastByteInput) / elapsedSecsSinceLastRefresh;
1043+
const currentByteInputRate = (query.queryStats.processedInputDataSizeInBytes - lastByteInput) / elapsedSecsSinceLastRefresh;
10451044
this.setState({
10461045
scheduledTimeRate: addToHistory(currentScheduledTimeRate, this.state.scheduledTimeRate),
10471046
cpuTimeRate: addToHistory(currentCpuTimeRate, this.state.cpuTimeRate),
10481047
rowInputRate: addToHistory(currentRowInputRate, this.state.rowInputRate),
10491048
byteInputRate: addToHistory(currentByteInputRate, this.state.byteInputRate),
1050-
reservedMemory: addToHistory(parseDataSize(query.queryStats.userMemoryReservation), this.state.reservedMemory),
1049+
reservedMemory: addToHistory(query.queryStats.userMemoryReservationInBytes, this.state.reservedMemory),
10511050
});
10521051
}
10531052
this.resetTimer();
@@ -1552,7 +1551,7 @@ export class QueryDetail extends React.Component {
15521551
Input Data
15531552
</td>
15541553
<td className="info-text">
1555-
{query.queryStats.processedInputDataSize}
1554+
{formatDataSizeBytes(query.queryStats.processedInputDataSizeInBytes)}
15561555
</td>
15571556
</tr>
15581557
<tr>
@@ -1568,7 +1567,7 @@ export class QueryDetail extends React.Component {
15681567
Raw Input Data
15691568
</td>
15701569
<td className="info-text">
1571-
{query.queryStats.rawInputDataSize}
1570+
{formatDataSizeBytes(query.queryStats.rawInputDataSizeInBytes)}
15721571
</td>
15731572
</tr>
15741573
<tr>
@@ -1598,15 +1597,15 @@ export class QueryDetail extends React.Component {
15981597
Peak User Memory
15991598
</td>
16001599
<td className="info-text">
1601-
{query.queryStats.peakUserMemoryReservation}
1600+
{formatDataSizeBytes(query.queryStats.peakUserMemoryReservationInBytes)}
16021601
</td>
16031602
</tr>
16041603
<tr>
16051604
<td className="info-title">
16061605
Peak Total Memory
16071606
</td>
16081607
<td className="info-text">
1609-
{query.queryStats.peakTotalMemoryReservation}
1608+
{formatDataSizeBytes(query.queryStats.peakTotalMemoryReservationInBytes)}
16101609
</td>
16111610
</tr>
16121611
<tr>
@@ -1646,7 +1645,7 @@ export class QueryDetail extends React.Component {
16461645
Output Data
16471646
</td>
16481647
<td className="info-text">
1649-
{query.queryStats.outputDataSizeInBytes}
1648+
{formatDataSizeBytes(query.queryStats.outputDataSizeInBytes)}
16501649
</td>
16511650
</tr>
16521651
<tr>
@@ -1673,13 +1672,13 @@ export class QueryDetail extends React.Component {
16731672
{query.queryStats.writtenOutputPhysicalDataSize}
16741673
</td>
16751674
</tr>
1676-
{parseDataSize(query.queryStats.spilledDataSize) > 0 &&
1675+
{query.queryStats.spilledDataSizeInBytes > 0 &&
16771676
<tr>
16781677
<td className="info-title">
16791678
Spilled Data
16801679
</td>
16811680
<td className="info-text">
1682-
{query.queryStats.spilledDataSize}
1681+
{formatDataSizeBytes(query.queryStats.spilledDataSizeInBytes)}
16831682
</td>
16841683
</tr>
16851684
}

‎presto-ui/src/components/QueryOverview.jsx‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import {
3333
getTaskIdSuffix,
3434
getTaskNumber,
3535
GLYPHICON_HIGHLIGHT,
36-
parseDataSize,
3736
parseDuration,
3837
} from "../utils";
3938

@@ -121,8 +120,8 @@ type QueryStats = {
121120
totalCpuTime: string;
122121
cumulativeUserMemory: number;
123122
cumulativeTotalMemory: number;
124-
userMemoryReservation: string;
125-
peakUserMemoryReservation: string;
123+
userMemoryReservationInBytes: number;
124+
peakUserMemoryReservationInBytes: number;
126125
runtimeStats: RuntimeStats;
127126
elapsedTime: string;
128127
createTime: string;
@@ -132,18 +131,18 @@ type QueryStats = {
132131
totalPlanningTime: string;
133132
executionTime: string;
134133
processedInputPositions: number;
135-
processedInputDataSize: string;
134+
processedInputDataSizeInBytes: number;
136135
rawInputPositions: number;
137-
rawInputDataSize: string;
136+
rawInputDataSizeInBytes: string;
138137
shuffledPositions: number;
139138
shuffledDataSize: string;
140-
peakTotalMemoryReservation: string;
139+
peakTotalMemoryReservationInBytes: number;
141140
outputPositions: number;
142-
outputDataSizeInBytes: string;
141+
outputDataSizeInBytes: number;
143142
writtenOutputPositions: number;
144143
writtenOutputLogicalDataSize: string;
145144
writtenOutputPhysicalDataSize: string;
146-
spilledDataSize: string;
145+
spilledDataSizeInBytes: number;
147146
}
148147

149148
type FailureInfo = {
@@ -824,7 +823,7 @@ function StageSummary({ index, prestoStage }: { index: number, prestoStage: Outp
824823
Current
825824
</td>
826825
<td className="stage-table-stat-text">
827-
{prestoStage.latestAttemptExecutionInfo.stats.userMemoryReservation}
826+
{formatDataSize(prestoStage.latestAttemptExecutionInfo.stats.userMemoryReservationInBytes)}
828827
</td>
829828
</tr>
830829
<tr>
@@ -840,7 +839,7 @@ function StageSummary({ index, prestoStage }: { index: number, prestoStage: Outp
840839
Peak
841840
</td>
842841
<td className="stage-table-stat-text">
843-
{prestoStage.latestAttemptExecutionInfo.stats.peakUserMemoryReservation}
842+
{formatDataSize(prestoStage.latestAttemptExecutionInfo.stats.peakUserMemoryReservationInBytes)}
844843
</td>
845844
</tr>
846845
</tbody>
@@ -1518,7 +1517,7 @@ export default function QueryOverview({ data, show }: { data: QueryData, show: b
15181517
Input Data
15191518
</td>
15201519
<td className="info-text">
1521-
{data.queryStats.processedInputDataSize}
1520+
{formatDataSizeBytes(data.queryStats.processedInputDataSizeInBytes)}
15221521
</td>
15231522
</tr>
15241523
<tr>
@@ -1534,7 +1533,7 @@ export default function QueryOverview({ data, show }: { data: QueryData, show: b
15341533
Raw Input Data
15351534
</td>
15361535
<td className="info-text">
1537-
{data.queryStats.rawInputDataSize}
1536+
{formatDataSizeBytes(data.queryStats.rawInputDataSizeInBytes)}
15381537
</td>
15391538
</tr>
15401539
<tr>
@@ -1562,15 +1561,15 @@ export default function QueryOverview({ data, show }: { data: QueryData, show: b
15621561
Peak User Memory
15631562
</td>
15641563
<td className="info-text">
1565-
{data.queryStats.peakUserMemoryReservation}
1564+
{formatDataSizeBytes(data.queryStats.peakUserMemoryReservationInBytes)}
15661565
</td>
15671566
</tr>
15681567
<tr>
15691568
<td className="info-title">
15701569
Peak Total Memory
15711570
</td>
15721571
<td className="info-text">
1573-
{data.queryStats.peakTotalMemoryReservation}
1572+
{formatDataSizeBytes(data.queryStats.peakTotalMemoryReservationInBytes)}
15741573
</td>
15751574
</tr>
15761575
<tr>
@@ -1610,7 +1609,7 @@ export default function QueryOverview({ data, show }: { data: QueryData, show: b
16101609
Output Data
16111610
</td>
16121611
<td className="info-text">
1613-
{data.queryStats.outputDataSizeInBytes}
1612+
{formatDataSizeBytes(data.queryStats.outputDataSizeInBytes)}
16141613
</td>
16151614
</tr>
16161615
<tr>
@@ -1637,13 +1636,13 @@ export default function QueryOverview({ data, show }: { data: QueryData, show: b
16371636
{data.queryStats.writtenOutputPhysicalDataSize}
16381637
</td>
16391638
</tr>
1640-
{(parseDataSize(data.queryStats.spilledDataSize) || 0) > 0 &&
1639+
{(data.queryStats.spilledDataSizeInBytes || 0) > 0 &&
16411640
<tr>
16421641
<td className="info-title">
16431642
Spilled Data
16441643
</td>
16451644
<td className="info-text">
1646-
{data.queryStats.spilledDataSize}
1645+
{formatDataSizeBytes(data.queryStats.spilledDataSizeInBytes)}
16471646
</td>
16481647
</tr>
16491648
}
@@ -1692,7 +1691,7 @@ export default function QueryOverview({ data, show }: { data: QueryData, show: b
16921691
</tr>
16931692
<tr className="tr-noborder">
16941693
<td className="info-sparkline-text">
1695-
{formatDataSize((parseDataSize(data.queryStats.processedInputDataSize) || 0) / elapsedTime)}
1694+
{formatDataSize((data.queryStats.processedInputDataSizeInBytes || 0) / elapsedTime)}
16961695
</td>
16971696
</tr>
16981697
<tr>
@@ -1702,7 +1701,7 @@ export default function QueryOverview({ data, show }: { data: QueryData, show: b
17021701
</tr>
17031702
<tr className="tr-noborder">
17041703
<td className="info-sparkline-text">
1705-
{formatDataSize(parseDataSize(data.queryStats.userMemoryReservation) || 0)}
1704+
{formatDataSize(data.queryStats.userMemoryReservationInBytes || 0)}
17061705
</td>
17071706
</tr>
17081707
</tbody>

0 commit comments

Comments
 (0)