Skip to content

Commit 291cf8a

Browse files
gaborgsomogyigaborgsomogyi
committed
Review fix
1 parent 3d11793 commit 291cf8a

File tree

1 file changed

+17
-18
lines changed

1 file changed

+17
-18
lines changed

‎sql/core/src/main/scala/org/apache/spark/sql/streaming/ui/StreamingQueryStatisticsPage.scala‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,7 @@ private[ui] class StreamingQueryStatisticsPage(parent: StreamingQueryTab)
130130
query: StreamingQueryUIData,
131131
minBatchTime: Long,
132132
maxBatchTime: Long,
133-
jsCollector: JsCollector
134-
): NodeBuffer = {
133+
jsCollector: JsCollector): NodeBuffer = {
135134
// This is made sure on caller side but put it here to be defensive
136135
require(query.lastProgress != null)
137136
if (query.lastProgress.stateOperators.nonEmpty) {
@@ -154,8 +153,8 @@ private[ui] class StreamingQueryStatisticsPage(parent: StreamingQueryTab)
154153

155154
val graphUIDataForNumberTotalRows =
156155
new GraphUIData(
157-
"aggregated-num-total-rows-timeline",
158-
"aggregated-num-total-rows-histogram",
156+
"aggregated-num-total-state-rows-timeline",
157+
"aggregated-num-total-state-rows-histogram",
159158
numRowsTotalData,
160159
minBatchTime,
161160
maxBatchTime,
@@ -166,8 +165,8 @@ private[ui] class StreamingQueryStatisticsPage(parent: StreamingQueryTab)
166165

167166
val graphUIDataForNumberUpdatedRows =
168167
new GraphUIData(
169-
"aggregated-num-updated-rows-timeline",
170-
"aggregated-num-updated-rows-histogram",
168+
"aggregated-num-updated-state-rows-timeline",
169+
"aggregated-num-updated-state-rows-histogram",
171170
numRowsUpdatedData,
172171
minBatchTime,
173172
maxBatchTime,
@@ -178,8 +177,8 @@ private[ui] class StreamingQueryStatisticsPage(parent: StreamingQueryTab)
178177

179178
val graphUIDataForMemoryUsedBytes =
180179
new GraphUIData(
181-
"aggregated-memory-used-bytes-timeline",
182-
"aggregated-memory-used-bytes-histogram",
180+
"aggregated-state-memory-used-bytes-timeline",
181+
"aggregated-state-memory-used-bytes-histogram",
183182
memoryUsedBytesData,
184183
minBatchTime,
185184
maxBatchTime,
@@ -190,8 +189,8 @@ private[ui] class StreamingQueryStatisticsPage(parent: StreamingQueryTab)
190189

191190
val graphUIDataForNumRowsDroppedByWatermark =
192191
new GraphUIData(
193-
"aggregated-num-rows-dropped-by-watermark-timeline",
194-
"aggregated-num-rows-dropped-by-watermark-histogram",
192+
"aggregated-num-state-rows-dropped-by-watermark-timeline",
193+
"aggregated-num-state-rows-dropped-by-watermark-histogram",
195194
numRowsDroppedByWatermarkData,
196195
minBatchTime,
197196
maxBatchTime,
@@ -207,35 +206,35 @@ private[ui] class StreamingQueryStatisticsPage(parent: StreamingQueryTab)
207206
<div><strong>Aggregated Number Of Total State Rows {SparkUIUtils.tooltip("Aggregated number of total state rows.", "right")}</strong></div>
208207
</div>
209208
</td>
210-
<td class={"aggregated-num-total-rows-timeline"}>{graphUIDataForNumberTotalRows.generateTimelineHtml(jsCollector)}</td>
211-
<td class={"aggregated-num-total-rows-histogram"}>{graphUIDataForNumberTotalRows.generateHistogramHtml(jsCollector)}</td>
209+
<td class={"aggregated-num-total-state-rows-timeline"}>{graphUIDataForNumberTotalRows.generateTimelineHtml(jsCollector)}</td>
210+
<td class={"aggregated-num-total-state-rows-histogram"}>{graphUIDataForNumberTotalRows.generateHistogramHtml(jsCollector)}</td>
212211
</tr>
213212
<tr>
214213
<td style="vertical-align: middle;">
215214
<div style="width: 160px;">
216215
<div><strong>Aggregated Number Of Updated State Rows {SparkUIUtils.tooltip("Aggregated number of updated state rows.", "right")}</strong></div>
217216
</div>
218217
</td>
219-
<td class={"aggregated-num-updated-rows-timeline"}>{graphUIDataForNumberUpdatedRows.generateTimelineHtml(jsCollector)}</td>
220-
<td class={"aggregated-num-updated-rows-histogram"}>{graphUIDataForNumberUpdatedRows.generateHistogramHtml(jsCollector)}</td>
218+
<td class={"aggregated-num-updated-state-rows-timeline"}>{graphUIDataForNumberUpdatedRows.generateTimelineHtml(jsCollector)}</td>
219+
<td class={"aggregated-num-updated-state-rows-histogram"}>{graphUIDataForNumberUpdatedRows.generateHistogramHtml(jsCollector)}</td>
221220
</tr>
222221
<tr>
223222
<td style="vertical-align: middle;">
224223
<div style="width: 160px;">
225224
<div><strong>Aggregated State Memory Used In Bytes {SparkUIUtils.tooltip("Aggregated state memory used in bytes.", "right")}</strong></div>
226225
</div>
227226
</td>
228-
<td class={"aggregated-memory-used-bytes-timeline"}>{graphUIDataForMemoryUsedBytes.generateTimelineHtml(jsCollector)}</td>
229-
<td class={"aggregated-memory-used-bytes-histogram"}>{graphUIDataForMemoryUsedBytes.generateHistogramHtml(jsCollector)}</td>
227+
<td class={"aggregated-state-memory-used-bytes-timeline"}>{graphUIDataForMemoryUsedBytes.generateTimelineHtml(jsCollector)}</td>
228+
<td class={"aggregated-state-memory-used-bytes-histogram"}>{graphUIDataForMemoryUsedBytes.generateHistogramHtml(jsCollector)}</td>
230229
</tr>
231230
<tr>
232231
<td style="vertical-align: middle;">
233232
<div style="width: 160px;">
234233
<div><strong>Aggregated Number Of State Rows Dropped By Watermark {SparkUIUtils.tooltip("Aggregated number of state rows dropped by watermark.", "right")}</strong></div>
235234
</div>
236235
</td>
237-
<td class={"aggregated-num-rows-dropped-by-watermark-timeline"}>{graphUIDataForNumRowsDroppedByWatermark.generateTimelineHtml(jsCollector)}</td>
238-
<td class={"aggregated-num-rows-dropped-by-watermark-histogram"}>{graphUIDataForNumRowsDroppedByWatermark.generateHistogramHtml(jsCollector)}</td>
236+
<td class={"aggregated-num-state-rows-dropped-by-watermark-timeline"}>{graphUIDataForNumRowsDroppedByWatermark.generateTimelineHtml(jsCollector)}</td>
237+
<td class={"aggregated-num-state-rows-dropped-by-watermark-histogram"}>{graphUIDataForNumRowsDroppedByWatermark.generateHistogramHtml(jsCollector)}</td>
239238
</tr>
240239
// scalastyle:on
241240
} else {

0 commit comments

Comments
 (0)